October 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9941 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Fri Oct 10 15:25:13 2008 New Revision: 9941 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/features.xml Log: polishing the configs up a bit more Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Oct 10 15:25:13 2008 @@ -236,7 +236,7 @@  <extension name="operator"> - <condition field="destination_number" expression="^operator$"> + <condition field="destination_number" expression="^operator|0$"> <action application="set" data="transfer_ringback=$${hold_music}"/> <action application="transfer" data="1000 XML features"/> </condition> Modified: freeswitch/trunk/conf/dialplan/features.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/features.xml (original) +++ freeswitch/trunk/conf/dialplan/features.xml Fri Oct 10 15:25:13 2008 @@ -33,6 +33,7 @@ <condition field="destination_number" expression="^(10[01][0-9])$"> <action application="set" data="transfer_ringback=$${hold_music}"/> <action application="answer"/> + <action application="sleep" data="1500"/> <action application="playback" data="ivr/ivr-hold_connect_call.wav"/> <action application="transfer" data="$1 XML default"/> </condition>

1 0

[commit] r9940 - freeswitch/trunk/src
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Fri Oct 10 15:09:51 2008 New Revision: 9940 Modified: freeswitch/trunk/src/switch_rtp.c Log: sigh Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Oct 10 15:09:51 2008 @@ -1274,22 +1274,23 @@ return_cng_frame(); } - if (bytes <= rtp_header_len) { + if (bytes && bytes <= 12) { continue; } - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { - const char *tx_host; - const char *old_host; - char bufa[30], bufb[30]; - tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr); - old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr); - if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) || strcmp(tx_host, old_host)) { - const char *err; - uint32_t old = rtp_session->remote_port; - - if (!switch_strlen_zero(tx_host) && switch_sockaddr_get_port(rtp_session->from_addr) > 0) { - if (++rtp_session->autoadj_tally >= 10) { + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { + if (++rtp_session->autoadj_tally >= 10) { + const char *tx_host; + const char *old_host; + char bufa[30], bufb[30]; + + tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr); + old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr); + if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) || strcmp(tx_host, old_host)) { + const char *err; + uint32_t old = rtp_session->remote_port; + + if (!switch_strlen_zero(tx_host) && switch_sockaddr_get_port(rtp_session->from_addr) > 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, switch_sockaddr_get_port(rtp_session->from_addr)); @@ -1299,7 +1300,7 @@ } } } - + if (bytes && rtp_session->autoadj_window) { if (--rtp_session->autoadj_window == 0) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ);

1 0

[commit] r9939 - freeswitch/trunk/src
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: mikej Date: Fri Oct 10 14:42:29 2008 New Revision: 9939 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: misplaced ( ) Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri Oct 10 14:42:29 2008 @@ -833,7 +833,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Module %s Already Loaded!\n", file); *err = "Module already loaded"; status = SWITCH_STATUS_FALSE; - } else if ((status = switch_loadable_module_load_file(path, file, &new_module) == SWITCH_STATUS_SUCCESS)) { + } else if ((status = switch_loadable_module_load_file(path, file, &new_module)) == SWITCH_STATUS_SUCCESS) { if ((status = switch_loadable_module_process(file, new_module)) == SWITCH_STATUS_SUCCESS && runtime) { if (new_module->switch_module_runtime) { switch_core_launch_thread(switch_loadable_module_exec, new_module, new_module->pool);

1 0

[commit] r9938 - freeswitch/trunk/src
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: mikej Date: Fri Oct 10 14:38:41 2008 New Revision: 9938 Modified: freeswitch/trunk/src/switch_time.c Log: quiet warning Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Fri Oct 10 14:38:41 2008 @@ -379,7 +379,9 @@ switch_time_sync(); } else { switch_time_t diff = ts - runtime.reference - STEP_MIC; +#ifndef WIN32 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Forward Clock Skew Detected!\n"); +#endif fwd_errs++; runtime.reference = switch_time_now(); current_ms = 0;

1 0

[commit] r9937 - freeswitch/trunk/src/mod/loggers/mod_console
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: mikej Date: Fri Oct 10 14:33:20 2008 New Revision: 9937 Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: silence app verifier assertion Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Fri Oct 10 14:33:20 2008 @@ -234,8 +234,10 @@ if (COLORIZE) { #ifdef WIN32 + DWORD len = (DWORD) strlen(node->data); + DWORD outbytes = 0; SetConsoleTextAttribute(hStdout, COLORS[node->level]); - WriteFile(hStdout, node->data, (DWORD) strlen(node->data), NULL, NULL); + WriteFile(hStdout, node->data, len, &outbytes, NULL); SetConsoleTextAttribute(hStdout, wOldColorAttrs); #else fprintf(handle, "%s%s%s", COLORS[node->level], node->data, SWITCH_SEQ_DEFAULT_COLOR);

1 0

[commit] r9936 - freeswitch/trunk/conf/lang/en/demo
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Fri Oct 10 13:43:06 2008 New Revision: 9936 Modified: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Log: wait a sec here Modified: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml (original) +++ freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Fri Oct 10 13:43:06 2008 @@ -25,7 +25,7 @@ <action function="execute" data="sleep(250)"/>  <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/> - <action function="execute" data="sleep(250)"/> + <action function="execute" data="sleep(1500)"/> <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/> <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/>

1 0

[commit] r9935 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Fri Oct 10 13:34:42 2008 New Revision: 9935 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Oct 10 13:34:42 2008 @@ -215,7 +215,8 @@ <anti-action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/> <anti-action application="bind_meta_app" data="2 b s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> <anti-action application="bind_meta_app" data="3 b s execute_extension::cf XML features"/> - <anti-action application="set" data="transfer_ringback=${us-ring}"/> + <anti-action application="set" data="ringback=${us-ring}"/> + <anti-action application="set" data="transfer_ringback=$${hold_music}"/> <anti-action application="set" data="call_timeout=30"/>  <anti-action application="set" data="hangup_after_bridge=true"/>

1 0

[commit] r9934 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: anthm Date: Fri Oct 10 12:15:45 2008 New Revision: 9934 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add proxy 3pcc mode Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Fri Oct 10 12:15:45 2008 @@ -146,7 +146,10 @@    + +   +    Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Oct 10 12:15:45 2008 @@ -409,6 +409,29 @@ } } } else { + /* This if statement check and handles the 3pcc proxy mode */ + if ((tech_pvt->profile->pflags & PFLAG_3PCC_PROXY) && switch_test_flag(tech_pvt, TFLAG_3PCC)) { + /* Send the 200 OK */ + nua_respond(tech_pvt->nh, SIP_200_OK, + SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), + SOATAG_REUSE_REJECTED(1), + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Sent a 200 OK, waiting for ACK\n"); + + /* Unlock the session signal to allow the ack to make it in */ + // Maybe we should timeout? + switch_core_session_signal_unlock(session); + while(switch_channel_ready(channel) && !switch_test_flag(tech_pvt, TFLAG_3PCC_HAS_ACK)) { + switch_yield(1000); + } + // if we never got the ack should we PUNT? + /* Get the lock back before we continue */ + switch_core_session_signal_lock(session); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Done waiting for ACK\n"); + } + if ((is_proxy && !b_sdp) || switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) || !tech_pvt->iananame) { switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Oct 10 12:15:45 2008 @@ -162,7 +162,8 @@ PFLAG_DISABLE_SRTP_AUTH = (1 << 25), PFLAG_FUNNY_STUN = (1 << 26), PFLAG_STUN_ENABLED = (1 << 27), - PFLAG_STUN_AUTO_DISABLE = (1 << 28) + PFLAG_STUN_AUTO_DISABLE = (1 << 28), + PFLAG_3PCC_PROXY = (1 << 29) } PFLAGS; typedef enum { @@ -207,7 +208,8 @@ TFLAG_TPORT_LOG = (1 << 27), TFLAG_SENT_UPDATE = (1 << 28), TFLAG_PROXY_MEDIA = (1 << 29), - TFLAG_HOLD_LOCK = (1 << 30) + TFLAG_HOLD_LOCK = (1 << 30), + TFLAG_3PCC_HAS_ACK = (1 << 31) } TFLAGS; struct mod_sofia_globals { 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 Fri Oct 10 12:15:45 2008 @@ -1643,6 +1643,9 @@ if (switch_true(val)) { profile->pflags |= PFLAG_3PCC; } + else if(!strcasecmp(val, "proxy")){ + profile->pflags |= PFLAG_3PCC_PROXY; + } } else if (!strcasecmp(var, "accept-blind-auth")) { if (switch_true(val)) { profile->pflags |= PFLAG_BLIND_AUTH; @@ -2432,6 +2435,15 @@ SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + } else if(profile->pflags & PFLAG_3PCC_PROXY){ + //3PCC proxy mode delays the 200 OK until the call is answered + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); + switch_set_flag_locked(tech_pvt, TFLAG_3PCC); + sofia_glue_tech_choose_port(tech_pvt, 0); + sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); + switch_channel_set_flag(channel, TFLAG_LATE_NEGOTIATION); + //Moves into CS_INIT so call moves forward into the dialplan + switch_channel_set_state(channel, CS_INIT); } else { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "3PCC DISABLED"); switch_channel_hangup(channel, SWITCH_CAUSE_MANDATORY_IE_MISSING); @@ -2658,10 +2670,17 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP Error!\n"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } - if (switch_channel_get_state(channel) == CS_HIBERNATE && switch_test_flag(tech_pvt, TFLAG_3PCC)) { - switch_set_flag_locked(tech_pvt, TFLAG_READY); - switch_channel_set_state(channel, CS_INIT); - switch_set_flag(tech_pvt, TFLAG_SDP); + + if (switch_test_flag(tech_pvt, TFLAG_3PCC)) { + /* Check if we are in 3PCC proxy mode, if so then set the flag to indicate we received the ack */ + if (profile->pflags & PFLAG_3PCC_PROXY ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Got my ACK\n"); + switch_set_flag(tech_pvt, TFLAG_3PCC_HAS_ACK); + } else if (switch_channel_get_state(channel) == CS_HIBERNATE) { + switch_set_flag_locked(tech_pvt, TFLAG_READY); + switch_channel_set_state(channel, CS_INIT); + switch_set_flag(tech_pvt, TFLAG_SDP); + } } goto done; }

1 0

[commit] r9933 - freeswitch/trunk/src
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: anthm Date: Fri Oct 10 11:47:58 2008 New Revision: 9933 Modified: freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Oct 10 11:47:58 2008 @@ -1274,7 +1274,11 @@ return_cng_frame(); } - if (bytes > 12 && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { + if (bytes <= rtp_header_len) { + continue; + } + + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { const char *tx_host; const char *old_host; char bufa[30], bufb[30];

1 0

[commit] r9932 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: mikej Date: Fri Oct 10 11:36:02 2008 New Revision: 9932 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: (MODENDP-112) custom sofia::gateway_state event Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Oct 10 11:36:02 2008 @@ -1193,7 +1193,8 @@ typedef switch_status_t (*sofia_command_t) (char **argv, int argc, switch_stream_handle_t *stream); -static const char *sofia_state_names[] = { "UNREGED", +static const char *sofia_state_names[] = { + "UNREGED", "TRYING", "REGISTER", "REGED", @@ -1204,6 +1205,11 @@ NULL }; +const char * sofia_state_string(int state) +{ + return sofia_state_names[state]; +} + struct cb_helper { sofia_profile_t *profile; switch_stream_handle_t *stream; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Oct 10 11:36:02 2008 @@ -72,6 +72,7 @@ #define MY_EVENT_REGISTER "sofia::register" #define MY_EVENT_UNREGISTER "sofia::unregister" #define MY_EVENT_EXPIRE "sofia::expire" +#define MY_EVENT_GATEWAY_STATE "sofia::gateway_state" #define MULTICAST_EVENT "multicast::event" #define SOFIA_REPLACES_HEADER "_sofia_replaces_" @@ -699,3 +700,4 @@ void sofia_reg_send_reboot(sofia_profile_t *profile, const char *user, const char *host, const char *contact, const char *user_agent); void sofia_glue_restart_all_profiles(void); void sofia_glue_toggle_hold(private_object_t *tech_pvt, int sendonly); +const char * sofia_state_string(int state); 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 Fri Oct 10 11:36:02 2008 @@ -56,6 +56,15 @@ } +static void sofia_reg_fire_custom_gateway_state_event(sofia_gateway_t *gateway) { + switch_event_t *s_event; + if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_GATEWAY_STATE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "Gateway", "%s", gateway->name); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "State", "%s", sofia_state_string(gateway->state)); + switch_event_fire(&s_event); + } +} + void sofia_reg_unregister(sofia_profile_t *profile) { sofia_gateway_t *gateway_ptr; @@ -197,6 +206,9 @@ } break; } + if (ostate != gateway_ptr->state) { + sofia_reg_fire_custom_gateway_state_event(gateway_ptr); + } } } @@ -1021,6 +1033,7 @@ tagi_t tags[]) { if (sofia_private && sofia_private->gateway) { + reg_state_t ostate = sofia_private->gateway->state; switch (status) { case 200: if (sip && sip->sip_contact) { @@ -1056,6 +1069,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Registration Failed with status %d\n", status); break; } + if (ostate != sofia_private->gateway->state) { + sofia_reg_fire_custom_gateway_state_event(sofia_private->gateway); + } } } @@ -1480,12 +1496,16 @@ } if ((gateway_ptr = sofia_reg_find_gateway(name))) { + reg_state_t ostate = gateway_ptr->state; gateway_ptr->retry = 0; if (exptime) { gateway_ptr->state = REG_STATE_UNREGED; } else { gateway_ptr->state = REG_STATE_UNREGISTER; } + if (ostate != gateway_ptr->state) { + sofia_reg_fire_custom_gateway_state_event(gateway_ptr); + } sofia_reg_release_gateway(gateway_ptr); } @@ -1502,12 +1522,16 @@ for (x = 0; x < argc; x++) { if ((gateway_ptr = sofia_reg_find_gateway((char *) argv[x]))) { + reg_state_t ostate = gateway_ptr->state; gateway_ptr->retry = 0; if (exptime) { gateway_ptr->state = REG_STATE_UNREGED; } else { gateway_ptr->state = REG_STATE_UNREGISTER; } + if (ostate != gateway_ptr->state) { + sofia_reg_fire_custom_gateway_state_event(gateway_ptr); + } sofia_reg_release_gateway(gateway_ptr); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Gateway '%s' not found.\n", argv[x]);

1 0