- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

10 Oct '08

Author: mikej Date: Thu Oct 9 23:59:55 2008 New Revision: 9931 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: whitespace 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 Thu Oct 9 23:59:55 2008 @@ -194,12 +194,7 @@ } } } -#if 0 - if (status != 100 && status != 200) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "event [%s] status [%d][%s] session: %s\n", - nua_event_name(event), status, phrase, session ? switch_channel_get_name(channel) : "n/a"); - } -#endif + if (session) { switch_core_session_signal_lock(session); @@ -246,30 +241,11 @@ } switch (event) { - case nua_r_shutdown: - if (status >= 200) { - su_root_break(profile->s_root); - } - break; - - case nua_r_message: - sofia_handle_sip_r_message(status, profile, nh, sip); - break; - case nua_r_invite: - sofia_handle_sip_r_invite(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); - break; - case nua_r_options: - sofia_handle_sip_r_options(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); - break; case nua_r_get_params: case nua_r_unregister: case nua_i_fork: case nua_r_info: case nua_r_bye: - break; - case nua_i_bye: - sofia_handle_sip_i_bye(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); - break; case nua_r_unsubscribe: case nua_r_publish: case nua_i_cancel: @@ -279,6 +255,23 @@ case nua_i_ack: case nua_i_terminated: case nua_r_set_params: + case nua_i_prack: + case nua_r_prack: + break; + case nua_r_shutdown: + if (status >= 200) su_root_break(profile->s_root); + break; + case nua_r_message: + sofia_handle_sip_r_message(status, profile, nh, sip); + break; + case nua_r_invite: + sofia_handle_sip_r_invite(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); + break; + case nua_r_options: + sofia_handle_sip_r_options(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); + break; + case nua_i_bye: + sofia_handle_sip_i_bye(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_r_notify: sofia_handle_sip_r_notify(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); @@ -293,9 +286,7 @@ sofia_handle_sip_i_options(status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_i_invite: - if (!session) { - sofia_handle_sip_i_invite(nua, profile, nh, sofia_private, sip, tags); - } + if (!session) sofia_handle_sip_i_invite(nua, profile, nh, sofia_private, sip, tags); break; case nua_i_publish: sofia_presence_handle_sip_i_publish(nua, profile, nh, sofia_private, sip, tags); @@ -303,9 +294,6 @@ case nua_i_register: sofia_reg_handle_sip_i_register(nua, profile, nh, sofia_private, sip, tags); break; - case nua_i_prack: - case nua_r_prack: - break; case nua_i_state: sofia_handle_sip_i_state(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); break; @@ -318,9 +306,7 @@ case nua_r_refer: break; case nua_i_refer: - if (session) { - sofia_handle_sip_i_refer(nua, profile, nh, session, sip, tags); - } + if (session) sofia_handle_sip_i_refer(nua, profile, nh, session, sip, tags); break; case nua_r_subscribe: sofia_presence_handle_sip_r_subscribe(status, phrase, nua, profile, nh, sofia_private, sip, tags); @@ -344,7 +330,6 @@ break; default: if (nh && ((sofia_private && sofia_private->destroy_nh) || !nua_handle_magic(nh))) { - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Destroy handle [%s]\n", nua_event_name(event)); if (sofia_private) { nua_handle_bind(nh, NULL); } @@ -484,7 +469,6 @@ return NULL; } - void launch_sofia_worker_thread(sofia_profile_t *profile) { switch_thread_t *thread; @@ -732,8 +716,6 @@ switch_thread_create(&thread, thd_attr, sofia_profile_thread_run, profile, profile->pool); } - - static void logger(void *logarg, char const *fmt, va_list ap) { char *data = NULL; @@ -960,7 +942,6 @@ gateway->freq = 3600; } - gateway->next = profile->gateways; profile->gateways = gateway; sofia_reg_add_gateway(gateway->name, gateway); @@ -971,10 +952,8 @@ } } - static void parse_domain_tag(sofia_profile_t *profile, switch_xml_t x_domain_tag, const char *dname, const char *parse, const char *alias) { - if (switch_true(alias)) { if (sofia_glue_add_profile(switch_core_strdup(profile->pool, dname), profile) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding Alias [%s] for profile [%s]\n", dname, profile->name); @@ -994,7 +973,6 @@ } } - switch_status_t reconfig_sofia(sofia_profile_t *profile) { switch_xml_t cfg, xml = NULL, xprofile, profiles, gateways_tag, domain_tag, domains_tag, aliases_tag, alias_tag, settings, param; @@ -1259,7 +1237,6 @@ } } } - if ((gateways_tag = switch_xml_child(xprofile, "gateways"))) { parse_gateways(profile, gateways_tag); @@ -1318,7 +1295,6 @@ switch_event_destroy(&params); return status; - } switch_status_t config_sofia(int reload, char *profile_name) @@ -2015,7 +1991,6 @@ } } - static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status, char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, @@ -2078,7 +2053,6 @@ return; } - if ((status == 180 || status == 183 || status == 200)) { const char *astate = "early"; url_t *from = NULL, *to = NULL, *contact = NULL; @@ -2171,7 +2145,6 @@ } } } - } } @@ -2218,7 +2191,6 @@ switch_thread_create(&thread, thd_attr, media_on_hold_thread_run, session, switch_core_session_get_pool(session)); } - static void sofia_handle_sip_i_state(switch_core_session_t *session, int status, char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, @@ -2757,7 +2729,6 @@ return; } - typedef struct { char *exten; char *event; @@ -2766,7 +2737,6 @@ switch_memory_pool_t *pool; } nightmare_xfer_helper_t; - void *SWITCH_THREAD_FUNC nightmare_xfer_thread_run(switch_thread_t *thread, void *obj) { nightmare_xfer_helper_t *nhelper = (nightmare_xfer_helper_t *) obj; @@ -2795,7 +2765,6 @@ SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(nhelper->event), TAG_END()); status = SWITCH_STATUS_FALSE; } else { - tuuid_str = switch_core_session_get_uuid(tsession); switch_ivr_uuid_bridge(nhelper->bridge_to_uuid, tuuid_str); switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER"); @@ -2829,7 +2798,6 @@ switch_thread_create(&thread, thd_attr, nightmare_xfer_thread_run, nhelper, nhelper->pool); } - /*---------------------------------------*/ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[]) { @@ -2923,7 +2891,6 @@ br_a = switch_channel_get_variable(channel_a, SWITCH_SIGNAL_BOND_VARIABLE); br_b = switch_channel_get_variable(channel_b, SWITCH_SIGNAL_BOND_VARIABLE); - if (br_a && br_b) { switch_core_session_t *new_b_session = NULL, *a_session = NULL, *tmp = NULL; @@ -2931,7 +2898,6 @@ switch_str_nil(br_a), switch_str_nil(br_b)); - if ((profile->media_options & MEDIA_OPT_BYPASS_AFTER_ATT_XFER) && (tmp = switch_core_session_locate(br_b))) { switch_channel_t *tchannel = switch_core_session_get_channel(tmp); switch_channel_set_variable(tchannel, SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE, "true"); @@ -2959,24 +2925,10 @@ } } else { if (!br_a && !br_b) { -#if 0 - switch_set_flag_locked(tech_pvt, TFLAG_NOHUP); - switch_set_flag_locked(b_tech_pvt, TFLAG_XFER); - b_tech_pvt->xferto = switch_core_session_strdup(b_session, switch_core_session_get_uuid(session)); - switch_set_flag_locked(tech_pvt, TFLAG_BYE); - nua_notify(tech_pvt->nh, - NUTAG_NEWSUB(1), - SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), - NUTAG_SUBSTATE(nua_substate_terminated), - SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END()); -#endif - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot transfer channels that are not in a bridge.\n"); nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END()); - - } else { switch_core_session_t *t_session; switch_channel_t *hup_channel; @@ -3071,11 +3023,9 @@ headers = switch_core_session_sprintf(session, "?%s", refer_to->r_url->url_headers); } - exten = switch_core_session_sprintf(session, "sofia/%s/sip:%s@%s:%s%s%s", profile->name, refer_to->r_url->url_user, refer_to->r_url->url_host, port, param_string, headers); - switch_core_new_memory_pool(&npool); nightmare_xfer_helper = switch_core_alloc(npool, sizeof(*nightmare_xfer_helper)); @@ -3141,8 +3091,6 @@ switch_channel_set_variable(b_channel, SOFIA_REFER_TO_VARIABLE, full_ref_to); } - - switch_ivr_session_transfer(b_session, exten, NULL, NULL); switch_core_session_rwunlock(b_session); } @@ -3280,7 +3228,6 @@ nua_respond(nh, 488, "Unsupported Request", NUTAG_WITH_THIS(nua), TAG_END()); } - #define url_set_chanvars(session, url, varprefix) _url_set_chanvars(session, url, #varprefix "_user", #varprefix "_host", #varprefix "_port", #varprefix "_uri", #varprefix "_params") const char *_url_set_chanvars(switch_core_session_t *session, url_t *url, const char *user_var, const char *host_var, const char *port_var, const char *uri_var, const char *params_var) @@ -3934,9 +3881,7 @@ contact_host = switch_str_nil(contact->url_host); } - if (profile->pres_type) { - sql = switch_mprintf("insert into sip_dialogs " "(call_id,uuid,sip_to_user,sip_to_host,sip_from_user,sip_from_host,contact_user," "contact_host,state,direction,user_agent,profile_name,hostname) " @@ -3946,7 +3891,6 @@ to_user, to_host, dialog_from_user, dialog_from_host, contact_user, contact_host, "confirmed", "inbound", user_agent, profile->name, mod_sofia_globals.hostname); - switch_assert(sql); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } @@ -3956,7 +3900,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting NAT mode based on %s\n", is_nat); switch_channel_set_variable(channel, "sip_nat_detected", "true"); } - return; } @@ -3968,7 +3911,6 @@ "Green laserfire moves past the beeping little robot as his head turns. " "After a few beeps and a twist of his mechanical arm,\n" "Artoo reduces the max sessions to %d thus, saving the switch from certain doom.\n", sess_count - 10); - switch_mutex_unlock(profile->flag_mutex); }

1 0

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

10 Oct '08

Author: brian Date: Thu Oct 9 23:22:34 2008 New Revision: 9930 Modified: freeswitch/trunk/src/switch_channel.c Log: cosmetic pickyness of me Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Oct 9 23:22:34 2008 @@ -833,7 +833,7 @@ const char *file, const char *func, int line) { switch_mutex_lock(channel->flag_mutex); - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "%s Running State Change %s\n", channel->name, state_names[state]); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "(%s) Running State Change %s\n", channel->name, state_names[state]); channel->running_state = state; if (channel->state_flags) { @@ -1065,7 +1065,7 @@ } if (ok) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "%s State Change %s -> %s\n", + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "(%s) State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]); switch_mutex_lock(channel->flag_mutex); channel->state = state; @@ -1080,7 +1080,7 @@ } } else { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_WARNING, - "%s Invalid State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]); + "(%s) Invalid State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]); /* we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee! */ /* not cool lets crash this bad boy and figure out wtf is going on */ switch_assert(channel->state >= CS_HANGUP);

1 0

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

10 Oct '08

Author: brian Date: Thu Oct 9 22:59:59 2008 New Revision: 9929 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: nua_r_prack 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 Thu Oct 9 22:59:59 2008 @@ -304,6 +304,7 @@ sofia_reg_handle_sip_i_register(nua, profile, nh, sofia_private, sip, tags); break; case nua_i_prack: + case nua_r_prack: break; case nua_i_state: sofia_handle_sip_i_state(session, status, phrase, nua, profile, nh, sofia_private, sip, tags);

1 0

[commit] r9928 - in freeswitch/trunk/src/mod/endpoints: mod_alsa mod_portaudio mod_woomera
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Thu Oct 9 22:45:27 2008 New Revision: 9928 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: more tweaks Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Thu Oct 9 22:45:27 2008 @@ -779,7 +779,7 @@ if (outbound_profile) { char name[128]; const char *id = !switch_strlen_zero(outbound_profile->caller_id_number) ? outbound_profile->caller_id_number : "na"; - snprintf(name, sizeof(name), "Alsa/%s", id); + snprintf(name, sizeof(name), "alsa/%s", id); switch_channel_set_name(channel, name); @@ -1461,7 +1461,7 @@ NULL, dialplan, cid_name, cid_num, ip, NULL, NULL, NULL, (char *) modname, NULL, dest)) != 0) { char name[128]; - snprintf(name, sizeof(name), "Alsa/%s", tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->destination_number : modname); + snprintf(name, sizeof(name), "alsa/%s", tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->destination_number : modname); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Oct 9 22:45:27 2008 @@ -673,7 +673,7 @@ if (outbound_profile) { char name[128]; const char *id = !switch_strlen_zero(outbound_profile->caller_id_number) ? outbound_profile->caller_id_number : "na"; - switch_snprintf(name, sizeof(name), "PortAudio/%s", id); + switch_snprintf(name, sizeof(name), "portaudio/%s", id); switch_channel_set_name(channel, name); @@ -1543,7 +1543,7 @@ if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), NULL, dialplan, cid_name, cid_num, ip, NULL, NULL, NULL, modname, NULL, dest)) != 0) { char name[128]; - switch_snprintf(name, sizeof(name), "PortAudio/%s", + switch_snprintf(name, sizeof(name), "portaudio/%s", tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->destination_number : modname); switch_channel_set_name(channel, name); 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 Oct 9 22:45:27 2008 @@ -427,7 +427,7 @@ char name[128]; switch_caller_profile_t *caller_profile; - switch_snprintf(name, sizeof(name), "Woomera/%s-%04x", outbound_profile->destination_number, rand() & 0xffff); + switch_snprintf(name, sizeof(name), "woomera/%s-%04x", outbound_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); @@ -978,7 +978,7 @@ tech_pvt->profile->dialplan, cid_name, cid_num, ip, NULL, NULL, NULL, modname, NULL, exten)) != 0) { char name[128]; - switch_snprintf(name, sizeof(name), "Woomera/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); + switch_snprintf(name, sizeof(name), "woomera/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);

1 0