January 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3915 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 06 Jan '07

06 Jan '07

Author: mikej Date: Fri Jan 5 21:53:11 2007 New Revision: 3915 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: fix issues with speaking 1 or 0 amounts in time measurement add fixes from mmurdock via irc, thanks mike Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Fri Jan 5 21:53:11 2007 @@ -291,13 +291,16 @@ if ((p = strrchr(tme, ':'))) { *p++ = '\0'; seconds = atoi(p); - if ((p = strrchr(tme, ':'))) { + if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); if (tme) { hours = atoi(tme); } } + else { + minutes = atoi(tme); + } } } else { if ((seconds = atoi(tosay)) <= 0) { @@ -319,18 +322,45 @@ if (hours) { say_num(hours, SSM_PRONOUNCED); - say_file("digits/hours.wav"); + if (hours == 1) { + say_file("digits/hour.wav"); //TODO -- NEED TO GET "hour.wav" recorded + } + else { + say_file("digits/hours.wav"); + } } + else { + say_file("digits/0.wav"); + say_file("digits/hours.wav"); + } if (minutes) { say_num(minutes, SSM_PRONOUNCED); - say_file("digits/minutes.wav"); + if (minutes == 1) { + say_file("digits/minute.wav"); + } + else { + say_file("digits/minutes.wav"); + } } + else { + say_file("digits/0.wav"); + say_file("digits/minutes.wav"); + } if (seconds) { say_num(seconds, SSM_PRONOUNCED); - say_file("digits/seconds.wav"); + if (seconds == 1) { + say_file("digits/second.wav"); + } + else { + say_file("digits/seconds.wav"); + } } + else { + say_file("digits/0.wav"); + say_file("digits/seconds.wav"); + } return SWITCH_STATUS_SUCCESS; } @@ -419,6 +449,9 @@ if ((cents = strchr(sbuf, '.'))) { *cents++ = '\0'; + if (strlen(cents) > 2) { + cents[2] = '\0'; + } } /* If positive sign - skip over" */

1 0

[commit] r3914 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 06 Jan '07

06 Jan '07

Author: anthm Date: Fri Jan 5 19:57:54 2007 New Revision: 3914 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: add fixes from mmurdock, thanks mike Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Fri Jan 5 19:57:54 2007 @@ -420,7 +420,12 @@ if ((cents = strchr(sbuf, '.'))) { *cents++ = '\0'; } - + + /* If positive sign - skip over" */ + if (sbuf[0] == '+') { + dollars++; + } + /* If negative say "negative" */ if (sbuf[0] == '-') { say_file("negative.wav"); @@ -439,14 +444,20 @@ /* Say "and" */ say_file("and.wav"); - /* Say cents */ - en_say_general_count(session, cents, type, method, args); - if (atoi(cents) == 1) { - say_file("cent.wav"); - } - else { - say_file("cents.wav"); - } + /* Say cents */ + if (cents) { + en_say_general_count(session, cents, type, method, args); + if (atoi(cents) == 1) { + say_file("cent.wav"); + } + else { + say_file("cents.wav"); + } + } + else { + say_file("digits/0.wav"); + say_file("cents.wav"); + } return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r3913 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 05 Jan '07

05 Jan '07

Author: mikej Date: Fri Jan 5 12:09:29 2007 New Revision: 3913 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: simplify en_say_money to not have to use math fuctions, as we have it in char already and need to keep it that way for later. Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Fri Jan 5 12:09:29 2007 @@ -402,45 +402,46 @@ { switch_channel_t *channel; - char sbuf[16] = ""; // enuf for 999,999,999,999.99 (w/o the commas) - - double amt, dollars, cents; + char sbuf[16] = ""; /* enuough for 999,999,999,999.99 (w/o the commas or leading $) */ + char *dollars = NULL; + char *cents = NULL; assert(session != NULL); channel = switch_core_session_get_channel(session); assert(channel != NULL); - if (!(tosay = strip_nonnumerics(tosay, sbuf, sizeof(sbuf))) || strlen(tosay) > 15) { + if (strlen(tosay) > 15 || !(tosay = strip_nonnumerics(tosay, sbuf, sizeof(sbuf)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); return SWITCH_STATUS_GENERR; } - amt = atof(tosay); //convert to double - cents = modf(fabs(amt), &dollars); // split dollars and cents + dollars = sbuf; + + if ((cents = strchr(sbuf, '.'))) { + *cents++ = '\0'; + } - // If negative say "negative" (or "minus") - if (amt < 0.0) { + /* If negative say "negative" */ + if (sbuf[0] == '-') { say_file("negative.wav"); - // say_file("minus.wav"); + dollars++; } - // Say dollar amount - snprintf(sbuf, sizeof(sbuf), "%.0f", dollars); - en_say_general_count(session, sbuf, type, method, args); - if (dollars == 1.0) { + /* Say dollar amount */ + en_say_general_count(session, dollars, type, method, args); + if (atoi(dollars) == 1) { say_file("dollar.wav"); } else { say_file("dollars.wav"); } - // Say "and" + /* Say "and" */ say_file("and.wav"); - // Say cents - snprintf(sbuf, sizeof(sbuf), "%.0f", cents); - en_say_general_count(session, sbuf, type, method, args); - if (cents == 1.0) { + /* Say cents */ + en_say_general_count(session, cents, type, method, args); + if (atoi(cents) == 1) { say_file("cent.wav"); } else {

1 0

[commit] r3912 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/say/mod_say_en
by Freeswitch SVN 05 Jan '07

05 Jan '07

Author: mikej Date: Fri Jan 5 11:49:36 2007 New Revision: 3912 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/switch_ivr.c Log: make build on windows. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Jan 5 11:49:36 2007 @@ -291,6 +291,8 @@ } stream->write_function(stream, "%d", (uint32_t)apr_time_sec(out)); + + return SWITCH_STATUS_SUCCESS; } static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Fri Jan 5 11:49:36 2007 @@ -402,13 +402,10 @@ { switch_channel_t *channel; - int x = 0; char sbuf[16] = ""; // enuf for 999,999,999,999.99 (w/o the commas) double amt, dollars, cents; - switch_status_t status; - assert(session != NULL); channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -419,9 +416,7 @@ } amt = atof(tosay); //convert to double - dollars = trunc(amt); // get whole dollars - cents = trunc(fabs((amt - dollars))*100.0); // get cents as whole integer (dropping sign) - dollars = fabs(dollars); // lose the sign + cents = modf(fabs(amt), &dollars); // split dollars and cents // If negative say "negative" (or "minus") if (amt < 0.0) { Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Jan 5 11:49:36 2007 @@ -2389,7 +2389,7 @@ for (hi = switch_channel_variable_first(caller_channel, switch_core_session_get_pool(session)); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, &vvar, NULL, &vval); if (vvar && vval) { - switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, vvar, vval); + switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, (void *)vvar, vval); } }

1 0

[commit] r3911 - freeswitch/trunk/src/mod/endpoints/mod_woomera
by Freeswitch SVN 05 Jan '07

05 Jan '07

Author: anthm Date: Fri Jan 5 10:52:23 2007 New Revision: 3911 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: move opts up Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Fri Jan 5 10:52:23 2007 @@ -809,6 +809,9 @@ return -1; } + switch_socket_timeout_set((*new_sock), 10000000); + switch_socket_opt_set((*new_sock), SWITCH_SO_KEEPALIVE, 1); + /* status = switch_socket_bind((*new_sock), sa); if (0 && status != SWITCH_STATUS_SUCCESS) { @@ -820,8 +823,6 @@ return -1; } - switch_socket_timeout_set((*new_sock), 10000000); - switch_socket_opt_set((*new_sock), SWITCH_SO_KEEPALIVE, 1); return 1; }

1 0

[commit] r3910 - freeswitch/trunk/src/mod/endpoints/mod_woomera
by Freeswitch SVN 05 Jan '07

05 Jan '07

Author: anthm Date: Fri Jan 5 10:50:10 2007 New Revision: 3910 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: fix names Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Fri Jan 5 10:50:10 2007 @@ -26,7 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * * - * mod_woomerachan.c -- Woomera Endpoint Module + * mod_woomera.c -- Woomera Endpoint Module * */ #include <switch.h> @@ -164,18 +164,18 @@ static woomera_profile default_profile; -static switch_status_t woomerachan_on_init(switch_core_session_t *session); -static switch_status_t woomerachan_on_hangup(switch_core_session_t *session); -static switch_status_t woomerachan_on_ring(switch_core_session_t *session); -static switch_status_t woomerachan_on_loopback(switch_core_session_t *session); -static switch_status_t woomerachan_on_transmit(switch_core_session_t *session); -static switch_status_t woomerachan_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, +static switch_status_t woomera_on_init(switch_core_session_t *session); +static switch_status_t woomera_on_hangup(switch_core_session_t *session); +static switch_status_t woomera_on_ring(switch_core_session_t *session); +static switch_status_t woomera_on_loopback(switch_core_session_t *session); +static switch_status_t woomera_on_transmit(switch_core_session_t *session); +static switch_status_t woomera_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t *pool); -static switch_status_t woomerachan_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, +static switch_status_t woomera_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id); -static switch_status_t woomerachan_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, +static switch_status_t woomera_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, switch_io_flag_t flags, int stream_id); -static switch_status_t woomerachan_kill_channel(switch_core_session_t *session, int sig); +static switch_status_t woomera_kill_channel(switch_core_session_t *session, int sig); static void tech_destroy(private_object * tech_pvt); static void woomera_printf(woomera_profile * profile, switch_socket_t *socket, char *fmt, ...); static char *woomera_message_header(woomera_message * wmsg, char *key); @@ -196,7 +196,7 @@ returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it. */ -static switch_status_t woomerachan_on_init(switch_core_session_t *session) +static switch_status_t woomera_on_init(switch_core_session_t *session) { switch_channel_t *channel; struct private_object *tech_pvt = NULL; @@ -235,12 +235,12 @@ switch_core_session_launch_thread(session, woomera_channel_thread_run, session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERACHAN INIT\n", switch_channel_get_name(channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERA INIT\n", switch_channel_get_name(channel)); return SWITCH_STATUS_SUCCESS; } -static switch_status_t woomerachan_on_ring(switch_core_session_t *session) +static switch_status_t woomera_on_ring(switch_core_session_t *session) { switch_channel_t *channel = NULL; struct private_object *tech_pvt = NULL; @@ -251,12 +251,12 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERACHAN RING\n", switch_channel_get_name(channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERA RING\n", switch_channel_get_name(channel)); return SWITCH_STATUS_SUCCESS; } -static switch_status_t woomerachan_on_execute(switch_core_session_t *session) +static switch_status_t woomera_on_execute(switch_core_session_t *session) { switch_channel_t *channel = NULL; @@ -268,13 +268,13 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERACHAN EXECUTE\n", switch_channel_get_name(channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERA EXECUTE\n", switch_channel_get_name(channel)); return SWITCH_STATUS_SUCCESS; } -static switch_status_t woomerachan_on_hangup(switch_core_session_t *session) +static switch_status_t woomera_on_hangup(switch_core_session_t *session) { switch_channel_t *channel = NULL; struct private_object *tech_pvt = NULL; @@ -288,7 +288,7 @@ switch_core_codec_destroy(&tech_pvt->read_codec); switch_core_codec_destroy(&tech_pvt->write_codec); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERACHAN HANGUP\n", switch_channel_get_name(channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERA HANGUP\n", switch_channel_get_name(channel)); tech_destroy(tech_pvt); return SWITCH_STATUS_SUCCESS; @@ -312,7 +312,7 @@ } -static switch_status_t woomerachan_kill_channel(switch_core_session_t *session, int sig) +static switch_status_t woomera_kill_channel(switch_core_session_t *session, int sig) { switch_channel_t *channel = NULL; struct private_object *tech_pvt = NULL; @@ -330,7 +330,7 @@ switch(sig) { case SWITCH_SIG_KILL: udp_socket_close(tech_pvt); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERACHAN KILL\n", switch_channel_get_name(channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERA KILL\n", switch_channel_get_name(channel)); break; case SWITCH_SIG_BREAK: { @@ -345,19 +345,19 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t woomerachan_on_loopback(switch_core_session_t *session) +static switch_status_t woomera_on_loopback(switch_core_session_t *session) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WOOMERACHAN LOOPBACK\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WOOMERA LOOPBACK\n"); return SWITCH_STATUS_SUCCESS; } -static switch_status_t woomerachan_on_transmit(switch_core_session_t *session) +static switch_status_t woomera_on_transmit(switch_core_session_t *session) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WOOMERACHAN TRANSMIT\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WOOMERA TRANSMIT\n"); return SWITCH_STATUS_SUCCESS; } -static switch_status_t woomerachan_waitfor_read(switch_core_session_t *session, int ms, int stream_id) +static switch_status_t woomera_waitfor_read(switch_core_session_t *session, int ms, int stream_id) { struct private_object *tech_pvt = NULL; @@ -367,7 +367,7 @@ return switch_socket_waitfor(&tech_pvt->read_poll, ms) ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS; } -static switch_status_t woomerachan_waitfor_write(switch_core_session_t *session, int ms, int stream_id) +static switch_status_t woomera_waitfor_write(switch_core_session_t *session, int ms, int stream_id) { struct private_object *tech_pvt = NULL; @@ -378,7 +378,7 @@ // return switch_socket_waitfor(&tech_pvt->write_poll, ms); } -static switch_status_t woomerachan_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, +static switch_status_t woomera_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id) { switch_channel_t *channel = NULL; @@ -396,7 +396,7 @@ return SWITCH_STATUS_GENERR; } /* - if ((status = woomerachan_waitfor_read(session, -1)) != SWITCH_STATUS_SUCCESS) { + if ((status = woomera_waitfor_read(session, -1)) != SWITCH_STATUS_SUCCESS) { return status; }1< */ @@ -413,7 +413,7 @@ return SWITCH_STATUS_FALSE; } -static switch_status_t woomerachan_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, +static switch_status_t woomera_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, switch_io_flag_t flags, int stream_id) { switch_channel_t *channel = NULL; @@ -441,36 +441,36 @@ return SWITCH_STATUS_GENERR; } -static const switch_state_handler_table_t woomerachan_event_handlers = { - /*.on_init */ woomerachan_on_init, - /*.on_ring */ woomerachan_on_ring, - /*.on_execute */ woomerachan_on_execute, - /*.on_hangup */ woomerachan_on_hangup, - /*.on_loopback */ woomerachan_on_loopback, - /*.on_transmit */ woomerachan_on_transmit +static const switch_state_handler_table_t woomera_event_handlers = { + /*.on_init */ woomera_on_init, + /*.on_ring */ woomera_on_ring, + /*.on_execute */ woomera_on_execute, + /*.on_hangup */ woomera_on_hangup, + /*.on_loopback */ woomera_on_loopback, + /*.on_transmit */ woomera_on_transmit }; -static const switch_io_routines_t woomerachan_io_routines = { - /*.outgoing_channel */ woomerachan_outgoing_channel, +static const switch_io_routines_t woomera_io_routines = { + /*.outgoing_channel */ woomera_outgoing_channel, /*.answer_channel */ NULL, - /*.read_frame */ woomerachan_read_frame, - /*.write_frame */ woomerachan_write_frame, - /*.kill_channel */ woomerachan_kill_channel, - /*.waitfor_read */ woomerachan_waitfor_read, - /*.waitfor_write */ woomerachan_waitfor_write + /*.read_frame */ woomera_read_frame, + /*.write_frame */ woomera_write_frame, + /*.kill_channel */ woomera_kill_channel, + /*.waitfor_read */ woomera_waitfor_read, + /*.waitfor_write */ woomera_waitfor_write }; -static const switch_endpoint_interface_t woomerachan_endpoint_interface = { +static const switch_endpoint_interface_t woomera_endpoint_interface = { /*.interface_name */ "woomera", - /*.io_routines */ &woomerachan_io_routines, - /*.event_handlers */ &woomerachan_event_handlers, + /*.io_routines */ &woomera_io_routines, + /*.event_handlers */ &woomera_event_handlers, /*.private */ NULL, /*.next */ NULL }; -static const switch_loadable_module_interface_t woomerachan_module_interface = { +static const switch_loadable_module_interface_t woomera_module_interface = { /*.module_name */ modname, - /*.endpoint_interface */ &woomerachan_endpoint_interface, + /*.endpoint_interface */ &woomera_endpoint_interface, /*.timer_interface */ NULL, /*.dialplan_interface */ NULL, /*.codec_interface */ NULL, @@ -481,10 +481,10 @@ /* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines that allocate memory or you will have 1 channel with memory allocated from another channel's pool! */ -static switch_status_t woomerachan_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, +static switch_status_t woomera_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t *pool) { - if ((*new_session = switch_core_session_request(&woomerachan_endpoint_interface, pool)) != 0) { + if ((*new_session = switch_core_session_request(&woomera_endpoint_interface, pool)) != 0) { struct private_object *tech_pvt; switch_channel_t *channel; @@ -1258,7 +1258,7 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Inbound Channel %s!\n", name); - if ((session = switch_core_session_request(&woomerachan_endpoint_interface, NULL)) != 0) { + if ((session = switch_core_session_request(&woomera_endpoint_interface, NULL)) != 0) { struct private_object *tech_pvt; switch_channel_t *channel; @@ -1409,7 +1409,7 @@ /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &woomerachan_module_interface; + *module_interface = &woomera_module_interface; /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r3909 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 04 Jan '07

04 Jan '07

Author: anthm Date: Thu Jan 4 17:08:41 2007 New Revision: 3909 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: fix seg from bad input Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Jan 4 17:08:41 2007 @@ -1876,6 +1876,11 @@ return SWITCH_STATUS_FALSE; } + if (switch_strlen_zero(arg)) { + stream->write_function(stream, "USAGE: %s\n", login_api_interface.syntax); + return SWITCH_STATUS_SUCCESS; + } + myarg = strdup(arg); argc = switch_separate_string(myarg, ';', argv, (sizeof(argv) / sizeof(argv[0])));

1 0

[commit] r3908 - in freeswitch/trunk: libs/sofia-sip src/mod/endpoints/mod_woomera
by Freeswitch SVN 04 Jan '07

04 Jan '07

Author: anthm Date: Thu Jan 4 13:02:05 2007 New Revision: 3908 Added: freeswitch/trunk/libs/sofia-sip/.update Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: trigger sofia rebuild Added: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Jan 4 13:02:05 2007 @@ -0,0 +1 @@ +Thu Jan 4 13:01:49 EST 2007 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Thu Jan 4 13:02:05 2007 @@ -667,12 +667,16 @@ } status = switch_socket_recv(fd, ptr, &len); - if (SWITCH_STATUS_IS_BREAK(status)) { + + if (status == 70007) { + char bbuf = '\n'; + switch_size_t blen = sizeof(bbuf); + switch_socket_send(fd, &bbuf, &blen); continue; } if (status != SWITCH_STATUS_SUCCESS) { - return -1; + return -1; } ptr++; @@ -804,6 +808,7 @@ if (switch_socket_create(new_sock, AF_INET, SOCK_STREAM, 0, module_pool) != SWITCH_STATUS_SUCCESS) { return -1; } + /* status = switch_socket_bind((*new_sock), sa); if (0 && status != SWITCH_STATUS_SUCCESS) { @@ -815,6 +820,9 @@ return -1; } + switch_socket_timeout_set((*new_sock), 10000000); + switch_socket_opt_set((*new_sock), SWITCH_SO_KEEPALIVE, 1); + return 1; }

1 0

[commit] r3907 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 04 Jan '07

04 Jan '07

Author: anthm Date: Thu Jan 4 13:00:13 2007 New Revision: 3907 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add dtmf function to conference Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Jan 4 13:00:13 2007 @@ -2338,8 +2338,8 @@ switch_mutex_lock(member->flag_mutex); switch_clear_flag(member, MFLAG_RUNNING); switch_set_flag(member, MFLAG_KICKED); - switch_mutex_unlock(member->flag_mutex); switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); + switch_mutex_unlock(member->flag_mutex); if (stream != NULL) { stream->write_function(stream, "OK kicked %u\n", member->id); @@ -2361,6 +2361,47 @@ return ret_status; } + +static switch_status_t conf_api_sub_dtmf(conference_member_t *member, switch_stream_handle_t *stream, void *data) +{ + switch_event_t *event; + char *dtmf = (char *) data; + + if (member == NULL) { + stream->write_function(stream, "Invalid member!\n"); + return SWITCH_STATUS_GENERR; + } + + if (switch_strlen_zero(dtmf)) { + stream->write_function(stream, "Invalid input!\n"); + return SWITCH_STATUS_GENERR; + } + + + switch_mutex_lock(member->flag_mutex); + switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); + switch_core_session_send_dtmf(member->session, dtmf); + switch_mutex_unlock(member->flag_mutex); + + + if (stream != NULL) { + stream->write_function(stream, "OK sent %s to %u\n", (char *) data, member->id); + } + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "dtmf-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Digits", dtmf); + switch_event_fire(&event); + } + + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t conf_api_sub_energy(conference_member_t *member, switch_stream_handle_t *stream, void *data) { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; @@ -2990,6 +3031,7 @@ {"say", &conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"}, {"saymember", &conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE, "<confname> saymember <member_id> <text>"}, {"stop", &conf_api_sub_stop, CONF_API_SUB_ARGS_SPLIT, "<confname> stop <[current|all|last]> [<member_id>]"}, + {"dtmf", &conf_api_sub_dtmf, CONF_API_SUB_MEMBER_TARGET, "<confname> dtmf <[member_id|all|last]> <digits>"}, {"kick", &conf_api_sub_kick, CONF_API_SUB_MEMBER_TARGET, "<confname> kick <[member_id|all|last]>"}, {"mute", &conf_api_sub_mute, CONF_API_SUB_MEMBER_TARGET, "<confname> mute <[member_id|all]|last>"}, {"unmute", &conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET, "<confname> unmute <[member_id|all]|last>"},

1 0

[commit] r3906 - freeswitch/trunk/src
by Freeswitch SVN 04 Jan '07

04 Jan '07

Author: anthm Date: Thu Jan 4 12:40:47 2007 New Revision: 3906 Modified: freeswitch/trunk/src/switch_ivr.c Log: tidy up on top of last commit Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Jan 4 12:40:47 2007 @@ -2341,6 +2341,11 @@ odata = strdup(bridgeto); data = odata; + /* strip leading spaces */ + while (data && *data && *data == ' ') { + data++; + } + if (*data == '{') { vars = data + 1; if (!(data = strchr(data, '}'))) { @@ -2351,7 +2356,17 @@ *data++ = '\0'; } - + /* strip leading spaces (again)*/ + while (data && *data && *data == ' ') { + data++; + } + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + status = SWITCH_STATUS_GENERR; + goto done; + } + /* Some channel are created from an originating channel and some aren't so not all outgoing calls have a way to get params so we will normalize dialstring params and channel variables (when there is an originator) into an event that we will use as a pseudo hash to consult for params as needed.

1 0