April 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8044 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: brian Date: Mon Apr 7 12:05:17 2008 New Revision: 8044 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: fix ivr name Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Apr 7 12:05:17 2008 @@ -199,7 +199,7 @@  <extension name="ivr_demo"> <condition field="destination_number" expression="5000"> - <action application="ivr" data="demo"/> + <action application="ivr" data="demo_ivr"/> </condition> </extension>

1 0

[commit] r8043 - freeswitch/trunk/conf/lang/en/vm
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: brian Date: Mon Apr 7 12:04:52 2008 New Revision: 8043 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml Log: spelling error Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/trunk/conf/lang/en/vm/sounds.xml Mon Apr 7 12:04:52 2008 @@ -215,7 +215,7 @@ <input pattern="^(.*)$"> <match> <action function="say" data="$1" method="pronounced" type="name_spelled"/> - <action function="play-file" data="voicemail/vm-not_avaliable.wav"/> + <action function="play-file" data="voicemail/vm-not_available.wav"/> </match> </input> </macro>

1 0

[commit] r8042 - freeswitch/trunk/conf
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: brian Date: Mon Apr 7 11:20:41 2008 New Revision: 8042 Modified: freeswitch/trunk/conf/vars.xml Log: set sounds path in here Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Apr 7 11:20:41 2008 @@ -1,6 +1,7 @@  + <X-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/callie"/> <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/> <X-PRE-PROCESS cmd="set" data="moh_uri=local_stream://moh"/> <!-- xmpp_client_profile and xmpp_server_profile

1 0

[commit] r8041 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: anthm Date: Mon Apr 7 10:03:10 2008 New Revision: 8041 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Apr 7 10:03:10 2008 @@ -2438,6 +2438,7 @@ const char *user = NULL, *host = NULL, *port = NULL; char *uri = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); + char new_port[25] = ""; if (url) { user = url->url_user; @@ -2462,16 +2463,17 @@ switch_channel_set_variable(channel, user_var, user); } - if (!port) { - port = SOFIA_DEFAULT_PORT; + + if (port) { + switch_snprintf(new_port, sizeof(new_port), ":%s", port); } switch_channel_set_variable(channel, port_var, port); if (host) { if (user) { - uri = switch_core_session_sprintf(session, "%s@%s:%s", user, host, port); + uri = switch_core_session_sprintf(session, "%s@%s:%s", user, host, new_port); } else { - uri = switch_core_session_sprintf(session, "%s:%s", host, port); + uri = switch_core_session_sprintf(session, "%s:%s", host, new_port); } switch_channel_set_variable(channel, uri_var, uri); switch_channel_set_variable(channel, host_var, host); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Apr 7 10:03:10 2008 @@ -1173,6 +1173,7 @@ if (contact) { char *port = (char *) contact->m_url->url_port; + char new_port[25] = ""; display = contact->m_display; @@ -1187,15 +1188,15 @@ display = "\"user\""; } - if (!port) { - port = SOFIA_DEFAULT_PORT; + if (port) { + switch_snprintf(new_port, sizeof(new_port), ":%s", port); } - + if (contact->m_url->url_params) { - contact_str = switch_mprintf("%s <sip:%s@%s:%s;%s>", - display, contact->m_url->url_user, contact->m_url->url_host, port, contact->m_url->url_params); + contact_str = switch_mprintf("%s <sip:%s@%s%s;%s>", + display, contact->m_url->url_user, contact->m_url->url_host, new_port, contact->m_url->url_params); } else { - contact_str = switch_mprintf("%s <sip:%s@%s:%s>", display, contact->m_url->url_user, contact->m_url->url_host, port); + contact_str = switch_mprintf("%s <sip:%s@%s%s>", display, contact->m_url->url_user, contact->m_url->url_host, new_port); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon Apr 7 10:03:10 2008 @@ -403,6 +403,7 @@ if (contact->m_url) { const char *port = contact->m_url->url_port; + char new_port[25] = ""; display = contact->m_display; if (switch_strlen_zero(display)) { @@ -414,15 +415,15 @@ } } - if (!port) { - port = SOFIA_DEFAULT_PORT; + if (port) { + switch_snprintf(new_port, sizeof(new_port), ":%s", port); } if (contact->m_url->url_params) { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%s;%s>", - display, contact->m_url->url_user, contact->m_url->url_host, port, contact->m_url->url_params); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s>", + display, contact->m_url->url_user, contact->m_url->url_host, new_port, contact->m_url->url_params); } else { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%s>", display, contact->m_url->url_user, contact->m_url->url_host, port); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s>", display, contact->m_url->url_user, contact->m_url->url_host, new_port); } }

1 0

[commit] r8040 - freeswitch/trunk/src
by Freeswitch SVN 06 Apr '08

06 Apr '08

Author: anthm Date: Sun Apr 6 19:47:33 2008 New Revision: 8040 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Apr 6 19:47:33 2008 @@ -1123,6 +1123,10 @@ goto end; } + if (bytes > 0) { + rtp_session->missed_count = 0; + } + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); do_2833(rtp_session); @@ -1347,10 +1351,6 @@ } } - if (bytes > 0) { - rtp_session->missed_count = 0; - } - if (status == SWITCH_STATUS_BREAK || bytes == 0) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DATAWAIT)) { goto do_continue;

1 0

[commit] r8039 - in freeswitch/trunk/src: include mod/applications/mod_fifo
by Freeswitch SVN 05 Apr '08

05 Apr '08

Author: anthm Date: Sat Apr 5 11:48:12 2008 New Revision: 8039 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: add fifo_record_template Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Sat Apr 5 11:48:12 2008 @@ -91,6 +91,13 @@ } session_flag_t; +class switchEvent { + protected: + switch_event_t *event; + public: + switchEvent(switch_event_types_t event_id, const char *subclass_name); +}; + class CoreSession { protected: switch_input_args_t args; // holds ptr to cb function and input_callback_state struct Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Sat Apr 5 11:48:12 2008 @@ -797,7 +797,9 @@ switch_channel_t *other_channel = switch_core_session_get_channel(other_session); switch_caller_profile_t *cloned_profile; const char *o_announce = NULL; - + const char *record_template = switch_channel_get_variable(channel, "fifo_record_template"); + char *expanded = NULL; + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(other_channel, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "FIFO-Name", "%s", argv[0]); @@ -864,8 +866,21 @@ switch_mutex_lock(node->mutex); send_presence(node); switch_mutex_unlock(node->mutex); + + if (record_template) { + expanded = switch_channel_expand_variables(other_channel, record_template); + switch_ivr_record_session(session, expanded, 0, NULL); + } + switch_ivr_multi_threaded_bridge(session, other_session, on_dtmf, other_session, session); + if (record_template) { + switch_ivr_stop_record_session(session, expanded); + if (expanded != record_template) { + switch_safe_free(expanded); + } + } + ts = switch_timestamp_now(); switch_time_exp_lt(&tm, ts); switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm);

1 0

[commit] r8038 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 05 Apr '08

05 Apr '08

Author: anthm Date: Fri Apr 4 23:20:06 2008 New Revision: 8038 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Apr 4 23:20:06 2008 @@ -117,7 +117,7 @@ static void node_remove_uuid(fifo_node_t *node, const char *uuid) { - int i, len = 0; + int i, len = 0, done = 0; void *pop = NULL; for (i = 0; i < MAX_PRI; i++) { @@ -126,18 +126,17 @@ } while(len) { if (switch_queue_trypop(node->fifo_list[i], &pop) == SWITCH_STATUS_SUCCESS && pop) { - if (!strcmp((char *)pop, uuid)) { + if (!done && !strcmp((char *)pop, uuid)) { free(pop); - goto end; + done++; + } else { + switch_queue_push(node->fifo_list[i], pop); } - switch_queue_push(node->fifo_list[i], pop); } len--; } } - end: - if (!node_consumer_wait_count(node)) { node->start_waiting = 0; }

1 0

[commit] r8037 - freeswitch/trunk/src
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: anthm Date: Fri Apr 4 18:58:34 2008 New Revision: 8037 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: fix cpp wrapper Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Fri Apr 4 18:58:34 2008 @@ -71,12 +71,11 @@ CoreSession::CoreSession(char *nuuid) { - + memset(&caller_profile, 0, sizeof(caller_profile)); + init_vars(); if (session = switch_core_session_locate(nuuid)) { channel = switch_core_session_get_channel(session); - init_vars(); uuid = strdup(nuuid); - memset(&caller_profile, 0, sizeof(caller_profile)); allocated = 1; } } @@ -162,6 +161,8 @@ void CoreSession::setDTMFCallback(void *cbfunc, char *funcargs) { + sanity_check_noreturn; + cb_state.funcargs = funcargs; cb_state.function = cbfunc; @@ -466,6 +467,8 @@ void CoreSession::setHangupHook(void *hangup_func) { + sanity_check_noreturn; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::seHangupHook, hangup_func: %p\n", hangup_func); on_hangup = hangup_func; switch_channel_t *channel = switch_core_session_get_channel(session);

1 0

[commit] r8036 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: stkn Date: Fri Apr 4 18:17:06 2008 New Revision: 8036 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: Fix typo in log message: Invaid -> Invalid Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Apr 4 18:17:06 2008 @@ -641,7 +641,7 @@ } else if (!strcasecmp(strat_str, "waiting_longer")) { strat = STRAT_WAITING_LONGER; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid strategy\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid strategy\n"); return; } }

1 0

[commit] r8035 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: mikej Date: Fri Apr 4 18:04:10 2008 New Revision: 8035 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: match type. 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 Fri Apr 4 18:04:10 2008 @@ -2857,7 +2857,7 @@ if (profile->acl_count) { for (x = 0; x < len; x++) { - int y = 0; + uint32_t y = 0; for (y = 0; y < profile->acl_count; y++) { if (switch_check_network_list_ip(candidates[x].address, profile->acl[y])) { choice = x;

1 0