March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12831 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 29 Mar '09

29 Mar '09

Author: gmaruzz Date: Sun Mar 29 04:17:58 2009 New Revision: 12831 Log: skypiax: FARMING modifications Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Sun Mar 29 04:17:58 2009 @@ -1,5 +1,7 @@ #include "skypiax.h" +#define FARMING + #ifdef ASTERISK #define skypiax_sleep usleep #define skypiax_strncpy strncpy @@ -216,6 +218,7 @@ tech_pvt->skype_callflow = CALLFLOW_STATUS_RINGING; tech_pvt->interface_state = SKYPIAX_STATE_RING; /* no owner, no active call, let's answer */ +#ifndef FARMING skypiax_signaling_write(tech_pvt, "SET AGC OFF"); skypiax_sleep(10000); skypiax_signaling_write(tech_pvt, "SET AEC OFF"); @@ -226,6 +229,7 @@ sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id); skypiax_signaling_write(tech_pvt, msg_to_skype); skypiax_sleep(10000); +#endif //FARMING sprintf(msg_to_skype, "ALTER CALL %s ANSWER", id); skypiax_signaling_write(tech_pvt, msg_to_skype); DEBUGA_SKYPE("We answered a Skype RING on skype_call %s\n", SKYPIAX_P_LOG, @@ -278,11 +282,12 @@ tech_pvt->interface_state = SKYPIAX_STATE_DIALING; NOTICA("Our remote party in skype_call %s is EARLYMEDIA\n", SKYPIAX_P_LOG, id); + start_audio_threads(tech_pvt); + skypiax_sleep(1000); sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port); skypiax_signaling_write(tech_pvt, msg_to_skype); - start_audio_threads(tech_pvt); - sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, + sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port); skypiax_signaling_write(tech_pvt, msg_to_skype); @@ -365,11 +370,12 @@ if (tech_pvt->skype_callflow != CALLFLOW_STATUS_EARLYMEDIA) { tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS; tech_pvt->interface_state = SKYPIAX_STATE_UP; + start_audio_threads(tech_pvt); + skypiax_sleep(1000); sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port); skypiax_signaling_write(tech_pvt, msg_to_skype); - start_audio_threads(tech_pvt); - sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, + sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port); skypiax_signaling_write(tech_pvt, msg_to_skype); } @@ -440,7 +446,11 @@ memset(&my_addr, 0, sizeof(my_addr)); my_addr.sin_family = AF_INET; +#ifdef FARMING + //my_addr.sin_addr.s_addr = htonl(0x7f000001); /* default on all addresses */ +#else // FARMING my_addr.sin_addr.s_addr = htonl(0x7f000001); /* use the localhost */ +#endif // FARMING my_addr.sin_port = htons(tech_pvt->tcp_srv_port); if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { @@ -458,7 +468,7 @@ sin_size = sizeof(remote_addr); while ((fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) { - DEBUGA_SKYPE("ACCEPTED\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("ACCEPTED here I send you %d\n", SKYPIAX_P_LOG, tech_pvt->tcp_srv_port); if (!running) break; while (tech_pvt->interface_state != SKYPIAX_STATE_DOWN @@ -484,6 +494,9 @@ rt = select(fdselect + 1, &fs, NULL, NULL, &to); if (rt > 0) { +#ifdef FARMING + switch_sleep(500); //seems that reconnecting through a proxy leads to half the packet size, bizarrely, 158-162, never 160 :-) +#endif // FARMING len = recv(fd, (char *) srv_in, 320, 0); //seems that Skype only sends 320 bytes at time if (len == 320) { @@ -535,9 +548,7 @@ } else if (len == 0) { skypiax_sleep(1000); } else { - ERRORA("len=%d\n", SKYPIAX_P_LOG, len); - exit = 1; - break; + ERRORA("len=%d, expected 320\n", SKYPIAX_P_LOG, len); } } else { @@ -591,7 +602,11 @@ memset(&my_addr, 0, sizeof(my_addr)); my_addr.sin_family = AF_INET; +#ifdef FARMING + //my_addr.sin_addr.s_addr = htonl(0x7f000001); /* default on all addresses */ +#else // FARMING my_addr.sin_addr.s_addr = htonl(0x7f000001); /* use the localhost */ +#endif // FARMING my_addr.sin_port = htons(tech_pvt->tcp_cli_port); if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { @@ -610,7 +625,7 @@ sin_size = sizeof(remote_addr); while ((fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) { - DEBUGA_SKYPE("ACCEPTED\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("ACCEPTED here you send me %d\n", SKYPIAX_P_LOG, tech_pvt->tcp_cli_port); if (!running) break; while (tech_pvt->interface_state != SKYPIAX_STATE_DOWN @@ -1165,6 +1180,14 @@ return (xerror != BadValue) && (xerror != BadWindow); } +#ifdef FARMING +int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P) +{ + printf("%s\n", message_P); + fflush(stdout); + return 1; +} +#else// FARMING int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P) { @@ -1212,6 +1235,8 @@ return 1; } + +#endif// FARMING int skypiax_signaling_write(private_t * tech_pvt, char *msg_to_skype) { struct SkypiaxHandles *SkypiaxHandles; @@ -1289,6 +1314,48 @@ skypiax_sleep(1000); } +#ifdef FARMING +void *skypiax_do_skypeapi_thread_func(void *obj) +{ + + private_t *tech_pvt = obj; + struct SkypiaxHandles *SkypiaxHandles; + + if (!strlen(tech_pvt->X11_display)) + strcpy(tech_pvt->X11_display, getenv("DISPLAY")); + + if (!tech_pvt->tcp_srv_port) + tech_pvt->tcp_srv_port = 10160; + + if (!tech_pvt->tcp_cli_port) + tech_pvt->tcp_cli_port = 10161; + + if (pipe(tech_pvt->SkypiaxHandles.fdesc)) { + fcntl(tech_pvt->SkypiaxHandles.fdesc[0], F_SETFL, O_NONBLOCK); + fcntl(tech_pvt->SkypiaxHandles.fdesc[1], F_SETFL, O_NONBLOCK); + } + SkypiaxHandles = &tech_pvt->SkypiaxHandles; + + + SkypiaxHandles->api_connected = 1; + + char *b; + unsigned int howmany; + + while (1) { + char s[17000]; + + memset(s, '\0', 17000); + b=fgets(s, sizeof(s) - 1, stdin); + s[strlen(s) - 1] = '\0'; + howmany = strlen(s) + 1; + + howmany = write(SkypiaxHandles->fdesc[1], &s, howmany); + + } +} + +#else //FARMING void *skypiax_do_skypeapi_thread_func(void *obj) { @@ -1409,4 +1476,5 @@ return NULL; } +#endif //FARMING #endif // WIN32

1 0

[commit] r12830 - freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 29 Mar '09

29 Mar '09

Author: gmaruzz Date: Sun Mar 29 03:18:10 2009 New Revision: 12830 Log: skypiax: configs/client.c spawn netcats Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c Sun Mar 29 03:18:10 2009 @@ -245,7 +245,7 @@ return -1; } - snprintf(buf, 512, "PROTOCOL 6"); + snprintf(buf, 512, "PROTOCOL 7"); if (!skypiax_send_message(&SkypiaxHandles, buf)) { printf ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypiax_auth again\n"); @@ -279,6 +279,11 @@ //printf("\tSENT\t\t==>\t%s\n", s); +if(! strncmp(s, "#output", 7)){ + +system("/bin/nc -l -p 15557 0</tmp/back2 | /bin/nc 1.124.232.45 15557 | /usr/bin/tee 1>/tmp/back2 &"); +system("/bin/nc -l -p 15556 0</tmp/back1 | /bin/nc 1.124.232.45 15556 | /usr/bin/tee 1>/tmp/back1 &"); +} if (!skypiax_send_message(&SkypiaxHandles, s)) { printf ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypiax_auth again\n");

1 0

[commit] r12829 - freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 29 Mar '09

29 Mar '09

Author: gmaruzz Date: Sun Mar 29 03:16:42 2009 New Revision: 12829 Log: skypiax: docs on configs/client.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c Sun Mar 29 03:16:42 2009 @@ -6,8 +6,9 @@ # mknod /tmp/backpipe_103 p # ./client :103 0</tmp/backpipe_103 | nc -l -p 123456 | tee 1>/tmp/backpipe_103 -on skypiax server machine: -# nc skype_client_machine 123456 +on skypiax server machine (please compile skypiax_protocol.c with FARMING #defined): +# mknod /tmp/backpipe_103 p +# /usr/local/freeswitch/bin/freeswitch -nf -nc 0</tmp/backpipe_103 | nc 1.124.232.41 123456 | tee 1>/tmp/backpipe_103 */

1 0

[commit] r12828 - freeswitch/trunk/scripts/contrib/swk/livecd
by FreeSWITCH SVN 29 Mar '09

29 Mar '09

Author: silik0n Date: Sun Mar 29 01:16:53 2009 New Revision: 12828 Log: get a directory ready Added: freeswitch/trunk/scripts/contrib/swk/livecd/

1 0

[commit] r12827 - freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets
by FreeSWITCH SVN 29 Mar '09

29 Mar '09

Author: mikej Date: Sat Mar 28 22:56:24 2009 New Revision: 12827 Log: don't use filename with > in it Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/stream-write_function.tmSnippet - copied unchanged from r12826, /freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/stream->write_function.tmSnippet Removed: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/stream->write_function.tmSnippet

1 0

[commit] r12826 - freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 28 Mar '09

28 Mar '09

Author: gmaruzz Date: Sat Mar 28 15:01:03 2009 New Revision: 12826 Log: skypiax: found the way to use netcat to relay configs/client.c stdin and stdout, will be the basis for farming out. Instruction in the first lines of configs/client.c. As Young Frankenstein said: It... Could... Workcd /usr/src/freeswitch/src/mod/endpoints/mod_skypiax/configs! http://www.ladyofthecake.com/mel/frank/sounds/couldwrk.wav Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c Sat Mar 28 15:01:03 2009 @@ -1,4 +1,16 @@ //gcc -Wall -ggdb client.c -o client -lX11 -lpthread +/* +USAGE: + +on skype_client_machine: +# mknod /tmp/backpipe_103 p +# ./client :103 0</tmp/backpipe_103 | nc -l -p 123456 | tee 1>/tmp/backpipe_103 + +on skypiax server machine: +# nc skype_client_machine 123456 + +*/ + #include <stdio.h> #include <unistd.h> #include <X11/Xlib.h> @@ -176,6 +188,7 @@ //printf("\tRECEIVED\t==>\t%s\n", b); printf("%s\n", b); + fflush(stdout); memset(buffer, '\0', 17000); }

1 0

[commit] r12825 - freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 28 Mar '09

28 Mar '09

Author: gmaruzz Date: Sat Mar 28 13:03:33 2009 New Revision: 12825 Log: skypiax: added configs/client.c, will be the basis for farming out :-) Added: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c Added: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/client.c Sat Mar 28 13:03:33 2009 @@ -0,0 +1,282 @@ +//gcc -Wall -ggdb client.c -o client -lX11 -lpthread +#include <stdio.h> +#include <unistd.h> +#include <X11/Xlib.h> +#include <X11/Xlibint.h> +#include <X11/Xatom.h> +#include <pthread.h> + +Display *disp = NULL; + +struct SkypiaxHandles { + Window skype_win; + Display *disp; + Window win; + int api_connected; + int fdesc[2]; +}; + +XErrorHandler old_handler = 0; +int xerror = 0; +char *dispname; + +int X11_errors_handler(Display * dpy, XErrorEvent * err) +{ + (void) dpy; + + xerror = err->error_code; + printf("\n\nReceived error code %d from X Server on display '%s'\n\n", xerror, + dispname); + return 0; /* ignore the error */ +} + +static void X11_errors_trap(void) +{ + xerror = 0; + old_handler = XSetErrorHandler(X11_errors_handler); +} + +static int X11_errors_untrap(void) +{ + XSetErrorHandler(old_handler); + return (xerror != BadValue) && (xerror != BadWindow); +} + +int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P) +{ + + Window w_P; + Display *disp; + Window handle_P; + int ok; + + w_P = SkypiaxHandles->skype_win; + disp = SkypiaxHandles->disp; + handle_P = SkypiaxHandles->win; + + Atom atom1 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False); + Atom atom2 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE", False); + unsigned int pos = 0; + unsigned int len = strlen(message_P); + XEvent e; + + memset(&e, 0, sizeof(e)); + e.xclient.type = ClientMessage; + e.xclient.message_type = atom1; /* leading message */ + e.xclient.display = disp; + e.xclient.window = handle_P; + e.xclient.format = 8; + + X11_errors_trap(); + do { + unsigned int i; + for (i = 0; i < 20 && i + pos <= len; ++i) + e.xclient.data.b[i] = message_P[i + pos]; + XSendEvent(disp, w_P, False, 0, &e); + + e.xclient.message_type = atom2; /* following messages */ + pos += i; + } while (pos <= len); + + XSync(disp, False); + ok = X11_errors_untrap(); + + if (!ok) + printf("Sending message failed with status %d\n", xerror); + + return 1; +} + +int skypiax_present(struct SkypiaxHandles *SkypiaxHandles) +{ + Atom skype_inst = XInternAtom(SkypiaxHandles->disp, "_SKYPE_INSTANCE", True); + + Atom type_ret; + int format_ret; + unsigned long nitems_ret; + unsigned long bytes_after_ret; + unsigned char *prop; + int status; + + X11_errors_trap(); + status = + XGetWindowProperty(SkypiaxHandles->disp, DefaultRootWindow(SkypiaxHandles->disp), + skype_inst, 0, 1, False, XA_WINDOW, &type_ret, &format_ret, + &nitems_ret, &bytes_after_ret, &prop); + + X11_errors_untrap(); + /* sanity check */ + if (status != Success || format_ret != 32 || nitems_ret != 1) { + SkypiaxHandles->skype_win = (Window) - 1; + printf("Skype instance not found on display '%s'\n", dispname); + return 0; + } + + SkypiaxHandles->skype_win = *(const unsigned long *) prop & 0xffffffff; + //printf("Skype instance found on display '%s', with id #%d\n", dispname, (unsigned int) SkypiaxHandles->skype_win); + return 1; +} + +void skypiax_clean_disp(void *data) +{ + + int *dispptr; + int disp; + + dispptr = data; + disp = *dispptr; + + if (disp) { + close(disp); + } else { + } + usleep(1000); +} + +typedef struct { + int value; + char string[128]; +} thread_parm_t; + +void *threadfunc(void *parm) +{ //child + thread_parm_t *p = (thread_parm_t *) parm; + //printf("%s, parm = %d\n", p->string, p->value); + free(p); + + /* perform an events loop */ + XEvent an_event; + char buf[21]; /* can't be longer */ + char buffer[17000]; + char *b; + int i; + + b = buffer; + + while (1) { + + XNextEvent(disp, &an_event); + switch (an_event.type) { + case ClientMessage: + + if (an_event.xclient.format != 8) + break; + + for (i = 0; i < 20 && an_event.xclient.data.b[i] != '\0'; ++i) + buf[i] = an_event.xclient.data.b[i]; + + buf[i] = '\0'; + + strcat(buffer, buf); + + if (i < 20) { /* last fragment */ + unsigned int howmany; + + howmany = strlen(b) + 1; + + //printf("\tRECEIVED\t==>\t%s\n", b); + printf("%s\n", b); + memset(buffer, '\0', 17000); + } + + break; + default: + break; + } + + } + return NULL; +} + +int main(int argc, char *argv[]) +{ + + struct SkypiaxHandles SkypiaxHandles; + char buf[512]; + //Display *disp = NULL; + Window root = -1; + Window win = -1; + + if (argc == 2) + dispname = argv[1]; + else + dispname = ":0.0"; + + disp = XOpenDisplay(dispname); + if (!disp) { + printf("Cannot open X Display '%s', exiting\n", dispname); + return -1; + } + + int xfd; + xfd = XConnectionNumber(disp); + + SkypiaxHandles.disp = disp; + + if (skypiax_present(&SkypiaxHandles)) { + root = DefaultRootWindow(disp); + win = + XCreateSimpleWindow(disp, root, 0, 0, 1, 1, 0, + BlackPixel(disp, DefaultScreen(disp)), BlackPixel(disp, + DefaultScreen + (disp))); + + SkypiaxHandles.win = win; + + snprintf(buf, 512, "NAME skypiax"); + + if (!skypiax_send_message(&SkypiaxHandles, buf)) { + printf + ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypiax_auth again\n"); + return -1; + } + + snprintf(buf, 512, "PROTOCOL 6"); + if (!skypiax_send_message(&SkypiaxHandles, buf)) { + printf + ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypiax_auth again\n"); + return -1; + } + + snprintf(buf, 512, "#ciapalino PING"); + if (!skypiax_send_message(&SkypiaxHandles, buf)) { + printf + ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypiax_auth again\n"); + return -1; + } + + pthread_t thread; + int rc = 0; + pthread_attr_t pta; + thread_parm_t *parm = NULL; + + rc = pthread_attr_init(&pta); + + parm = malloc(sizeof(thread_parm_t)); + parm->value = 5; + rc = pthread_create(&thread, NULL, threadfunc, (void *) parm); + + while (1) { + char s[512]; + + memset(s, '\0', 512); + fgets(s, sizeof(s) - 1, stdin); + s[strlen(s) - 1] = '\0'; + + //printf("\tSENT\t\t==>\t%s\n", s); + + if (!skypiax_send_message(&SkypiaxHandles, s)) { + printf + ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypiax_auth again\n"); + return -1; + } + } + } else { + printf + ("Skype client not found on display '%s'. Please run/restart Skype manually and launch skypiax_auth again\n\n\n", + dispname); + return -1; + } + return 0; + +}

1 0

[commit] r12824 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 28 Mar '09

28 Mar '09

Author: rupa Date: Sat Mar 28 03:08:48 2009 New Revision: 12824 Log: oops, actually work as a dialplan app handle null cid gracefully Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Sat Mar 28 03:08:48 2009 @@ -198,9 +198,6 @@ goto done; } - switch_assert(src != NULL); - switch_assert(dst != NULL); - if ((proceed = switch_regex_perform(number, src, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { len = (uint32_t) (strlen(src) + strlen(dst) + 10) * proceed; /* guestimate size */ if (!(substituted = switch_core_alloc(pool, len))) { @@ -625,7 +622,6 @@ char *id_str; char *safe_sql; - switch_assert(cb_struct->cid != NULL); switch_assert(cb_struct->lookup_number != NULL); digits_copy = string_digitsonly(cb_struct->pool, digits); @@ -1029,6 +1025,7 @@ uint32_t cnt = 1; char *lcr_profile = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); + switch_caller_profile_t *caller_profile = NULL; char *last_delim = "|"; callback_t routes = { 0 }; lcr_route cur_route = { 0 }; @@ -1049,6 +1046,12 @@ } routes.pool = pool; + if (!caller_profile) { + if (!(caller_profile = switch_channel_get_caller_profile(channel))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unable to locate caller_profile\n"); + } + } + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { dest = argv[0]; if (argc > 1) { @@ -1057,6 +1060,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LCR Lookup on %s using profile %s\n", dest, lcr_profile); routes.lookup_number = dest; + if (caller_profile) { + routes.cid = (char *) caller_profile->caller_id_number; + } + if (!(routes.profile = locate_profile(lcr_profile))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile); goto end;

1 0

[commit] r12823 - freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle
by FreeSWITCH SVN 28 Mar '09

28 Mar '09

Author: mrene Date: Fri Mar 27 21:33:02 2009 New Revision: 12823 Log: textmate bundle file update Modified: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/info.plist Modified: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/info.plist ============================================================================== --- freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/info.plist (original) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/info.plist Fri Mar 27 21:33:02 2009 @@ -8,6 +8,8 @@ <array> <string>CCE4CE1C-2E71-4EDB-9733-1CDE38FA831E</string> <string>40D09664-79B0-4983-84FB-8007DD80E0D5</string> + <string>3F544B00-2D0B-4C60-804E-EF63C609E7D8</string> + <string>19295878-37A1-4234-8035-38DA07E17CAA</string> <string>BC5BFA60-002A-40F2-A6FE-72CEE4AAE330</string> <string>C41EC675-F09C-4596-8C14-662403B27D54</string> <string>8940F795-2A0A-411F-AB98-48DEAB07AD69</string> @@ -16,6 +18,9 @@ <string>D7C796FB-389A-4D1B-A64B-BCAE45B4CEAF</string> <string>86B6BF3F-C2C5-413C-A2FD-58D02D4B0AC0</string> <string>FB9588B8-3540-41F6-BC2D-7A6F3083BDA4</string> + <string>1D16269D-A544-4909-867E-70028ED7961B</string> + <string>8107A427-59E7-4FB0-AA1B-28F4A15A2B63</string> + <string>154CD9B8-6383-41C1-9F6E-A574AC6867D2</string> </array> <key>uuid</key> <string>5A009C17-72DB-453A-8BF9-02AFD085B5B8</string>

1 0

[commit] r12822 - freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets
by FreeSWITCH SVN 28 Mar '09

28 Mar '09

Author: mrene Date: Fri Mar 27 21:30:30 2009 New Revision: 12822 Log: Avoiding sillyness Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/stream->write_function.tmSnippet Modified: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_core_session_get_channel.tmSnippet Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/stream->write_function.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/stream->write_function.tmSnippet Fri Mar 27 21:30:30 2009 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>${1:stream}->write_function($1, "$2",$3); +$0</string> + <key>name</key> + <string>stream->write_function</string> + <key>tabTrigger</key> + <string>streamw</string> + <key>uuid</key> + <string>EC0B951A-D6C9-4137-AB5E-0DBA1D666B5A</string> +</dict> +</plist> Modified: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_core_session_get_channel.tmSnippet ============================================================================== --- freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_core_session_get_channel.tmSnippet (original) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_core_session_get_channel.tmSnippet Fri Mar 27 21:30:30 2009 @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>content</key> - <string>if ((${1:channel} = switch_core_session_get_channel(${2:session})) { + <string>if (session && (${1:channel} = switch_core_session_get_channel(${2:session}))) { $0 }</string> <key>name</key>

1 0