- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

04 Jan '07

Author: anthm Date: Thu Jan 4 12:27:37 2007 New Revision: 3905 Modified: freeswitch/trunk/src/switch_ivr.c Log: add parameter parsing to dial string (leading name=val pairs sep by , inside {} such as {foo=bar} ) Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Jan 4 12:27:37 2007 @@ -2221,7 +2221,7 @@ int32_t *idx, char *file, char *key, - char *ringback_data) + uint8_t early_ok) { uint32_t i; @@ -2235,7 +2235,7 @@ if (switch_channel_get_state(peer_channels[i]) >= CS_HANGUP) { hups++; } else if ((switch_channel_test_flag(peer_channels[i], CF_ANSWERED) || - (!ringback_data && len == 1 && switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA))) && + (early_ok && len == 1 && switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA))) && !switch_channel_test_flag(peer_channels[i], CF_TAGGED)) { if (key) { @@ -2325,14 +2325,15 @@ int32_t idx = IDX_NADA; switch_codec_t write_codec = {0}; switch_frame_t write_frame = {0}; - uint8_t err = 0, fdata[1024], pass = 0; + uint8_t fdata[1024], pass = 0; char *file = NULL, *key = NULL, *odata, *var; switch_call_cause_t reason = SWITCH_CAUSE_UNALLOCATED; uint8_t to = 0; - char *ringback_data = NULL; + char *var_val, *vars = NULL, *ringback_data = NULL; switch_codec_t *read_codec = NULL; - uint8_t sent_ring = 0; + uint8_t sent_ring = 0, early_ok = 1; switch_core_session_message_t *message = NULL; + switch_event_t *var_event = NULL; write_frame.data = fdata; @@ -2340,47 +2341,86 @@ odata = strdup(bridgeto); data = odata; - if (!strncasecmp(data, "confirm=", 8)) { - data += 8; - file = data; - if ((data = strchr(file, ';'))) { - *data++ = '\0'; - if ((key = strchr(file, ':'))) { - *key++ = '\0'; - } else { - err++; - } - } else { - err++; - } - } + if (*data == '{') { + vars = data + 1; + if (!(data = strchr(data, '}'))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + status = SWITCH_STATUS_GENERR; + goto done; + } + *data++ = '\0'; + } - if (err) { - 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. + */ + if (switch_event_create(&var_event, SWITCH_EVENT_MESSAGE) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + status = SWITCH_STATUS_MEMERR; + goto done; + } + if (session) { - caller_channel = switch_core_session_get_channel(session); + switch_hash_index_t *hi; + void *vval; + const void *vvar; + + caller_channel = switch_core_session_get_channel(session); assert(caller_channel != NULL); + /* Copy all the channel variables into the event */ + 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); + } + } + + } + + if (vars) { /* Parse parameters specified from the dialstring */ + char *var_array[1024] = {0}; + int var_count = 0; + if ((var_count = switch_separate_string(vars, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { + int x = 0; + for (x = 0; x < var_count; x++) { + char *inner_var_array[2]; + int inner_var_count; + if ((inner_var_count = + switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) { + + switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, inner_var_array[0], inner_var_array[1]); + if (caller_channel) { + switch_channel_set_variable(caller_channel, inner_var_array[0], inner_var_array[1]); + } + } + } + } + } + + + if (caller_channel) { /* ringback is only useful when there is an originator */ ringback_data = switch_channel_get_variable(caller_channel, "ringback"); switch_channel_set_variable(caller_channel, "originate_disposition", "failure"); - - if ((var = switch_channel_get_variable(caller_channel, "group_confirm_key"))) { - key = switch_core_session_strdup(session, var); - if ((var = switch_channel_get_variable(caller_channel, "group_confirm_file"))) { - file = switch_core_session_strdup(session, var); - } - } } - + if ((var = switch_event_get_header(var_event, "group_confirm_key"))) { + key = switch_core_session_strdup(session, var); + if ((var = switch_event_get_header(var_event, "group_confirm_file"))) { + file = switch_core_session_strdup(session, var); + } + } if (file && !strcmp(file, "undef")) { file = NULL; } + if ((var_val = switch_event_get_header(var_event, "noanswer_early_media")) && switch_true(var_val)) { + early_ok = 0; + } + or_argc = switch_separate_string(data, '|', pipe_names, (sizeof(pipe_names) / sizeof(pipe_names[0]))); if (caller_channel && or_argc > 1 && !ringback_data) { @@ -2652,9 +2692,13 @@ } } } + + if (ringback_data) { + early_ok = 0; + } - while ((!caller_channel || switch_channel_ready(caller_channel)) && - check_channel_status(peer_channels, peer_sessions, and_argc, &idx, file, key, ringback_data)) { + while ((!caller_channel || switch_channel_ready(caller_channel)) && + check_channel_status(peer_channels, peer_sessions, and_argc, &idx, file, key, early_ok)) { if ((to = (uint8_t)((time(NULL) - start) >= (time_t)timelimit_sec))) { idx = IDX_CANCEL; @@ -2804,6 +2848,10 @@ done: *cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + if (var_event) { + switch_event_destroy(&var_event); + } + if (status == SWITCH_STATUS_SUCCESS) { if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted");

1 0

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

04 Jan '07

Author: anthm Date: Wed Jan 3 20:18:06 2007 New Revision: 3904 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix uninit ints 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 Wed Jan 3 20:18:06 2007 @@ -3034,8 +3034,8 @@ case CONF_API_SUB_MEMBER_TARGET: { uint32_t id = 0; - int all; - int last; + uint8_t all = 0; + uint8_t last = 0; if (argv[argn+1]) { if (!(id = atoi(argv[argn+1]))) { @@ -3160,6 +3160,7 @@ if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]))) { if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); + goto done; } if (argc >= 2) { @@ -3185,7 +3186,8 @@ } else { stream->write_function(stream, "No parameters specified.\nTry 'help conference'\n"); } - + + done: switch_safe_free(lbuf); return status;

1 0

[commit] r3901 - in freeswitch/trunk: conf src
by Freeswitch SVN 03 Jan '07

03 Jan '07

Author: anthm Date: Wed Jan 3 11:43:59 2007 New Revision: 3901 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/switch_ivr.c Log: update phrase interface Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Jan 3 11:43:59 2007 @@ -678,57 +678,89 @@ <language name="en" sound_path="/snds" tts_engine="cepstral" tts_voice="david"> <macro name="msgcount"> <input pattern="(.*)"> - <action function="execute" data="sleep(1000)"/> - <action function="play-file" data="vm-youhave.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> - <action function="play-file" data="vm-messages.wav"/> -  -  + <match> + <action function="execute" data="sleep(1000)"/> + <action function="play-file" data="vm-youhave.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + <action function="play-file" data="vm-messages.wav"/> +  +  + </match> </input> </macro> <macro name="saydate"> <input pattern="(.*)"> - <action function="say" data="$1" method="pronounced" type="current_date_time"/> + <match> + <action function="say" data="$1" method="pronounced" type="current_date_time"/> + </match> </input> </macro> <macro name="timespec"> <input pattern="(.*)"> - <action function="say" data="$1" method="pronounced" type="time_measurement"/> + <match> + <action function="say" data="$1" method="pronounced" type="time_measurement"/> + </match> </input> </macro> <macro name="ip-addr"> <input pattern="(.*)"> - <action function="say" data="$1" method="iterated" type="ip_address"/> - <action function="say" data="$1" method="pronounced" type="ip_address"/> + <match> + <action function="say" data="$1" method="iterated" type="ip_address"/> + <action function="say" data="$1" method="pronounced" type="ip_address"/> + </match> </input> </macro> <macro name="spell"> <input pattern="(.*)"> - <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <match> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + </match> </input> </macro> <macro name="spell-phonetic"> <input pattern="(.*)"> - <action function="say" data="$1" method="pronounced" type="name_phonetic"/> + <match> + <action function="say" data="$1" method="pronounced" type="name_phonetic"/> + </match> </input> </macro> <macro name="tts-timeleft"> +  +  <input pattern="(\d+):(\d+)"> - <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/> + <match> + <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/> + <action function="break"/> + </match> + <nomatch> + <action function="speak-text" data="That input was invalid."/> + </nomatch> + </input> + <input pattern="(\d+) min (\d+) sec"> + <match> + <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/> + </match> + <nomatch> + <action function="speak-text" data="That input was invalid."/> + </nomatch> </input> </macro> </language> <language name="fr" sound_path="/var/sounds/lang/fr/jean" tts_engine="cepstral" tts_voice="jean-pierre"> <macro name="msgcount"> <input pattern="(.*)"> - <action function="play-file" data="tuas.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> - <action function="play-file" data="messages.wav"/> + <match> + <action function="play-file" data="tuas.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + <action function="play-file" data="messages.wav"/> + </match> </input> </macro> <macro name="timeleft"> <input pattern="(\d+):(\d+)"> - <action function="speak-text" data="il y a $1 minutes et de $2 secondes de restant"/> + <match> + <action function="speak-text" data="il y a $1 minutes et de $2 secondes de restant"/> + </match> </input> </macro> </language> Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Jan 3 11:43:59 2007 @@ -4414,6 +4414,7 @@ switch_status_t status = SWITCH_STATUS_GENERR; char *old_sound_prefix, *sound_path = NULL, *tts_engine = NULL, *tts_voice = NULL; switch_channel_t *channel; + uint8_t done = 0; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -4479,7 +4480,7 @@ switch_channel_pre_answer(channel); - while(input) { + while(input && !done) { char *pattern = (char *) switch_xml_attr(input, "pattern"); if (pattern) { @@ -4489,9 +4490,16 @@ uint32_t len = 0; char *odata = NULL; char *expanded = NULL; + switch_xml_t match = NULL; if ((proceed = switch_perform_regex(data, pattern, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { - for (action = switch_xml_child(input, "action"); action; action = action->next) { + match = switch_xml_child(input, "match"); + } else { + match = switch_xml_child(input, "nomatch"); + } + + if (match) { + for (action = switch_xml_child(match, "action"); action; action = action->next) { char *adata = (char *) switch_xml_attr_soft(action, "data"); char *func = (char *) switch_xml_attr_soft(action, "function"); @@ -4522,6 +4530,9 @@ if (!strcasecmp(func, "play-file")) { switch_ivr_play_file(session, NULL, odata, args); + } else if (!strcasecmp(func, "break")) { + done = 1; + break; } else if (!strcasecmp(func, "execute")) { const switch_application_interface_t *application_interface; char *app_name = NULL; @@ -4568,7 +4579,7 @@ } } } - + switch_clean_re(re); switch_safe_free(expanded); switch_safe_free(substituted);

1 0

[commit] r3900 - in freeswitch/trunk: conf src
by Freeswitch SVN 03 Jan '07

03 Jan '07

Author: anthm Date: Tue Jan 2 19:50:11 2007 New Revision: 3900 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/switch_utils.c Log: add strepoch api call and more say stuff Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Tue Jan 2 19:50:11 2007 @@ -518,6 +518,8 @@ <action application="phrase" data="timespec,12:45:15"/> <action application="phrase" data="saydate,0"/> <action application="phrase" data="msgcount,130"/> + <action application="phrase" data="ip-addr,66.250.68.194"/> + <action application="phrase" data="saydate,$strepoch(2006-03-23 7:23)"/>  </condition> </extension> @@ -694,6 +696,12 @@ <action function="say" data="$1" method="pronounced" type="time_measurement"/> </input> </macro> + <macro name="ip-addr"> + <input pattern="(.*)"> + <action function="say" data="$1" method="iterated" type="ip_address"/> + <action function="say" data="$1" method="pronounced" type="ip_address"/> + </input> + </macro> <macro name="spell"> <input pattern="(.*)"> <action function="say" data="$1" method="pronounced" type="name_spelled"/> Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Jan 2 19:50:11 2007 @@ -131,37 +131,42 @@ switch_time_t ret = 0; char *pattern = "^(\\d+)-(\\d+)-(\\d+)\\s*(\\d*):{0,1}(\\d*):{0,1}(\\d*)"; + switch_time_exp_lt(&tm, switch_time_now()); + tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = 0; + if ((proceed = switch_perform_regex(in, pattern, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { - printf("ASS %d\n", proceed); - pcre_copy_substring(in, ovector, proceed, 0, replace, sizeof(replace)); - tm.tm_year = atoi(replace) - 1900; - + if (proceed > 1) { pcre_copy_substring(in, ovector, proceed, 1, replace, sizeof(replace)); - tm.tm_mon = atoi(replace); + tm.tm_year = atoi(replace) - 1900; } if (proceed > 2) { pcre_copy_substring(in, ovector, proceed, 2, replace, sizeof(replace)); - tm.tm_mday = atoi(replace); + tm.tm_mon = atoi(replace) - 1; } - + if (proceed > 3) { pcre_copy_substring(in, ovector, proceed, 3, replace, sizeof(replace)); - tm.tm_hour = atoi(replace); + tm.tm_mday = atoi(replace)-1; } - + if (proceed > 4) { pcre_copy_substring(in, ovector, proceed, 4, replace, sizeof(replace)); - tm.tm_min = atoi(replace); + tm.tm_hour = atoi(replace); } if (proceed > 5) { pcre_copy_substring(in, ovector, proceed, 5, replace, sizeof(replace)); + tm.tm_min = atoi(replace); + } + + if (proceed > 6) { + pcre_copy_substring(in, ovector, proceed, 6, replace, sizeof(replace)); tm.tm_sec = atoi(replace); } - apr_time_exp_get(&ret, &tm); + apr_time_exp_gmt_get(&ret, &tm); return ret; } /* possible else with more patterns later */

1 0