- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3419 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 Nov '06

20 Nov '06

Author: mikej Date: Mon Nov 20 00:26:20 2006 New Revision: 3419 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: disable registration probe and options keep-alive for now as there is a bug in the implementation of this on the sofia side, and it causes the registration to never happen, and for it to spin re-registering out of control forever in some situations with UA's that send 404's to OPTIONS packets, or when behind nat on either side. This will get fixed in sofia, then become a configurable option on our side. 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 Mon Nov 20 00:26:20 2006 @@ -4451,11 +4451,14 @@ nua_handle_bind(oregp->nh, &oregp->sofia_private); nua_register(oregp->nh, - SIPTAG_FROM_STR(oregp->register_from), - SIPTAG_CONTACT_STR(oregp->register_from), - SIPTAG_EXPIRES_STR(oregp->expires_str), - NUTAG_REGISTRAR(oregp->register_proxy), - TAG_NULL()); + SIPTAG_FROM_STR(oregp->register_from), + SIPTAG_CONTACT_STR(oregp->register_from), + SIPTAG_EXPIRES_STR(oregp->expires_str), + NUTAG_REGISTRAR(oregp->register_proxy), + NUTAG_OUTBOUND("no-options-keepalive"), + NUTAG_OUTBOUND("no-validate"), + NUTAG_KEEPALIVE(0), + TAG_NULL()); oregp->retry = now + 10; oregp->state = REG_STATE_TRYING; } else {

1 0

[commit] r3418 - freeswitch/trunk/src
by Freeswitch SVN 20 Nov '06

20 Nov '06

Author: anthm Date: Sun Nov 19 21:01:21 2006 New Revision: 3418 Modified: freeswitch/trunk/src/switch_channel.c Log: ampersand was being used to indicate a function and a double call change it to carrot ^ for functions Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sun Nov 19 21:01:21 2006 @@ -1117,7 +1117,7 @@ size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; char *sub_val = NULL, *func_val = NULL; - if (!strchr(in, '$') && !strchr(in, '&')) { + if (!strchr(in, '$') && !strchr(in, '^')) { return in; } @@ -1133,7 +1133,7 @@ if (*p == '$') { vtype = 1; } - if (*p == '&') { + if (*p == '^') { vtype = 2; } @@ -1141,7 +1141,7 @@ char *s = p, *e, *vname, *vval = NULL; size_t nlen; s++; - if (*s == '{') { + if (vtype == 1 && *s == '{') { br = 1; s++; } @@ -1219,7 +1219,7 @@ len++; } - if (*p == '$' || *p == '&') { + if (*p == '$' || *p == '^') { p--; } else { *c++ = *p;

1 0

[commit] r3417 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Nov '06

19 Nov '06

Author: anthm Date: Sun Nov 19 15:30:17 2006 New Revision: 3417 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Sun Nov 19 15:30:17 2006 @@ -4112,6 +4112,25 @@ sip_t const *sip, tagi_t tags[]) { + if (sofia_private && sofia_private->oreg) { + if (status == 200) { + sofia_private->oreg->state = REG_STATE_REGISTER; + } else { + sofia_private->oreg->state = REG_STATE_FAILED; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "received %d on register!\n", status); + } + } +} + +static void sip_r_challenge(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, + tagi_t tags[]) +{ outbound_reg_t *oreg = NULL; sip_www_authenticate_t const *authenticate = NULL; switch_core_session_t *session = sofia_private ? sofia_private->session : NULL; @@ -4131,86 +4150,77 @@ } } - if (sofia_private && sofia_private->oreg) { - oreg = sofia_private->oreg; - if (status == 200) { - oreg->state = REG_STATE_REGISTER; - return; - } - } - - if (status == 401 || status == 407) { - if (sip->sip_www_authenticate) { - authenticate = sip->sip_www_authenticate; - } else if (sip->sip_proxy_authenticate) { - authenticate = sip->sip_proxy_authenticate; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Missing Authenticate Header!\n"); - return; - } - scheme = (char const *) authenticate->au_scheme; - if (authenticate->au_params) { - for(index = 0; (cur=(char*)authenticate->au_params[index]); index++) { - if ((realm = strstr(cur, "realm="))) { - realm += 6; - break; - } + if (sip->sip_www_authenticate) { + authenticate = sip->sip_www_authenticate; + } else if (sip->sip_proxy_authenticate) { + authenticate = sip->sip_proxy_authenticate; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Missing Authenticate Header!\n"); + return; + } + scheme = (char const *) authenticate->au_scheme; + if (authenticate->au_params) { + for(index = 0; (cur=(char*)authenticate->au_params[index]); index++) { + if ((realm = strstr(cur, "realm="))) { + realm += 6; + break; } } + } - if (!(scheme && realm)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No scheme and realm!\n"); - return; - } + if (!(scheme && realm)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No scheme and realm!\n"); + return; + } - if (profile) { - outbound_reg_t *oregp; + if (profile) { + outbound_reg_t *oregp; - if ((duprealm = strdup(realm))) { - qrealm = duprealm; + if ((duprealm = strdup(realm))) { + qrealm = duprealm; - while(*qrealm && *qrealm == '"') { - qrealm++; - } + while(*qrealm && *qrealm == '"') { + qrealm++; + } - if ((p = strchr(qrealm, '"'))) { - *p = '\0'; - } + if ((p = strchr(qrealm, '"'))) { + *p = '\0'; + } - for (oregp = profile->registrations; oregp; oregp = oregp->next) { - if (scheme && qrealm && !strcasecmp(oregp->register_scheme, scheme) && !strcasecmp(oregp->register_realm, qrealm)) { - oreg = oregp; - break; - } + for (oregp = profile->registrations; oregp; oregp = oregp->next) { + if (scheme && qrealm && !strcasecmp(oregp->register_scheme, scheme) && !strcasecmp(oregp->register_realm, qrealm)) { + oreg = oregp; + break; } - if (!oreg) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Match for Scheme [%s] Realm [%s]\n", scheme, qrealm); - } - switch_safe_free(duprealm); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); - return; } + if (!oreg) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Match for Scheme [%s] Realm [%s]\n", scheme, qrealm); + } + switch_safe_free(duprealm); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + return; } + } - snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, - oreg->register_username, - oreg->register_password); + snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, + oreg->register_username, + oreg->register_password); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", - profile->username, authentication); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", + profile->username, authentication); - ss_state = nua_callstate_authenticating; + ss_state = nua_callstate_authenticating; - tl_gets(tags, - NUTAG_CALLSTATE_REF(ss_state), - SIPTAG_WWW_AUTHENTICATE_REF(authenticate), - TAG_END()); + tl_gets(tags, + NUTAG_CALLSTATE_REF(ss_state), + SIPTAG_WWW_AUTHENTICATE_REF(authenticate), + TAG_END()); - nua_authenticate(nh, SIPTAG_EXPIRES_STR(oreg->expires_str), NUTAG_AUTH(authentication), TAG_END()); - } + nua_authenticate(nh, SIPTAG_EXPIRES_STR(oreg->expires_str), NUTAG_AUTH(authentication), TAG_END()); + } static void event_callback(nua_event_t event, @@ -4263,6 +4273,11 @@ goto done; } } + + if (status == 401 || status == 407) { + sip_r_challenge(status, phrase, nua, profile, nh, sofia_private, sip, tags); + goto done; + } switch (event) { case nua_r_shutdown: @@ -4274,6 +4289,8 @@ break; case nua_r_invite: + break; + case nua_r_register: sip_r_register(status, phrase, nua, profile, nh, sofia_private, sip, tags); break;

1 0

[commit] r3416 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Nov '06

19 Nov '06

Author: anthm Date: Sun Nov 19 15:08:58 2006 New Revision: 3416 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Sun Nov 19 15:08:58 2006 @@ -4133,7 +4133,7 @@ if (sofia_private && sofia_private->oreg) { oreg = sofia_private->oreg; - if (oreg && status == 200) { + if (status == 200) { oreg->state = REG_STATE_REGISTER; return; }

1 0

[commit] r3415 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Nov '06

19 Nov '06

Author: anthm Date: Sun Nov 19 15:08:16 2006 New Revision: 3415 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Sun Nov 19 15:08:16 2006 @@ -4120,6 +4120,8 @@ char const *scheme = NULL; int index; char *cur; + char authentication[256] = ""; + int ss_state; if (session) { private_object_t *tech_pvt; @@ -4129,6 +4131,15 @@ } } + if (sofia_private && sofia_private->oreg) { + oreg = sofia_private->oreg; + if (oreg && status == 200) { + oreg->state = REG_STATE_REGISTER; + return; + } + } + + if (status == 401 || status == 407) { if (sip->sip_www_authenticate) { authenticate = sip->sip_www_authenticate; @@ -4152,13 +4163,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No scheme and realm!\n"); return; } - } - - if (sofia_private) { - if (sofia_private->oreg) { - oreg = sofia_private->oreg; - } else if (profile) { + if (profile) { outbound_reg_t *oregp; if ((duprealm = strdup(realm))) { @@ -4167,6 +4173,7 @@ while(*qrealm && *qrealm == '"') { qrealm++; } + if ((p = strchr(qrealm, '"'))) { *p = '\0'; } @@ -4186,38 +4193,23 @@ return; } } - } - - if (!oreg) { - return; - } - - if (status == 200) { - oreg->state = REG_STATE_REGISTER; - } else if (authenticate) { - char authentication[256] = ""; - int ss_state; - - if (realm) { - snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, - oreg->register_username, - oreg->register_password); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", - profile->username, authentication); + snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, + oreg->register_username, + oreg->register_password); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", + profile->username, authentication); - ss_state = nua_callstate_authenticating; - tl_gets(tags, - NUTAG_CALLSTATE_REF(ss_state), - SIPTAG_WWW_AUTHENTICATE_REF(authenticate), - TAG_END()); + ss_state = nua_callstate_authenticating; - - - nua_authenticate(nh, SIPTAG_EXPIRES_STR(oreg->expires_str), NUTAG_AUTH(authentication), TAG_END()); - } + tl_gets(tags, + NUTAG_CALLSTATE_REF(ss_state), + SIPTAG_WWW_AUTHENTICATE_REF(authenticate), + TAG_END()); + + nua_authenticate(nh, SIPTAG_EXPIRES_STR(oreg->expires_str), NUTAG_AUTH(authentication), TAG_END()); } }

1 0

[commit] r3414 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Nov '06

19 Nov '06

Author: anthm Date: Sun Nov 19 14:51:40 2006 New Revision: 3414 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Sun Nov 19 14:51:40 2006 @@ -4150,42 +4150,43 @@ if (!(scheme && realm)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No scheme and realm!\n"); + return; } } - if (!(scheme && realm)) { - return; - } - duprealm = strdup(realm); - qrealm = duprealm; - - while(qrealm && *qrealm && *qrealm == '"') { - qrealm++; - } - if ((p = strchr(qrealm, '"'))) { - *p = '\0'; - } - if (sofia_private) { if (sofia_private->oreg) { oreg = sofia_private->oreg; } else if (profile) { outbound_reg_t *oregp; - for (oregp = profile->registrations; oregp; oregp = oregp->next) { - if (scheme && qrealm && !strcasecmp(oregp->register_scheme, scheme) && !strcasecmp(oregp->register_realm, qrealm)) { - oreg = oregp; - break; + + if ((duprealm = strdup(realm))) { + qrealm = duprealm; + + while(*qrealm && *qrealm == '"') { + qrealm++; } - } - if (!oreg) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Match for Scheme [%s] Realm [%s]\n", scheme, qrealm); - } + if ((p = strchr(qrealm, '"'))) { + *p = '\0'; + } + for (oregp = profile->registrations; oregp; oregp = oregp->next) { + if (scheme && qrealm && !strcasecmp(oregp->register_scheme, scheme) && !strcasecmp(oregp->register_realm, qrealm)) { + oreg = oregp; + break; + } + } + if (!oreg) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Match for Scheme [%s] Realm [%s]\n", scheme, qrealm); + } + switch_safe_free(duprealm); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + return; + } } } - - switch_safe_free(duprealm); if (!oreg) { return;

1 0

[commit] r3413 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 19 Nov '06

19 Nov '06

Author: mikej Date: Sat Nov 18 20:21:44 2006 New Revision: 3413 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: silence silly warning on msvc. Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Sat Nov 18 20:21:44 2006 @@ -63,7 +63,7 @@ #include "sha1.h" #ifdef _MSC_VER -#pragma warning(disable:4127) +#pragma warning(disable:4127 4706) #endif #define microsleep(x) apr_sleep(x * 1000)

1 0

[commit] r3412 - freeswitch/trunk/src
by Freeswitch SVN 19 Nov '06

19 Nov '06

Author: anthm Date: Sat Nov 18 20:21:41 2006 New Revision: 3412 Modified: freeswitch/trunk/src/switch_core.c Log: stackable dialplans Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat Nov 18 20:21:41 2006 @@ -2625,11 +2625,26 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't get profile!\n"); switch_channel_hangup(session->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } else { + char *dp[25]; + int argc, x, count = 0; + if (!switch_strlen_zero(caller_profile->dialplan)) { - dialplan_interface = switch_loadable_module_get_dialplan_interface(caller_profile->dialplan); + argc = switch_separate_string(caller_profile->dialplan, ',', dp, (sizeof(dp) / sizeof(dp[0]))); + for (x = 0; x < argc; x++) { + if (!(dialplan_interface = switch_loadable_module_get_dialplan_interface(dp[x]))) { + continue; + } + + count++; + + if ((extension = dialplan_interface->hunt_function(session)) != 0) { + switch_channel_set_caller_extension(session->channel, extension); + break; + } + } } - if (!dialplan_interface) { + if (!count) { if (switch_channel_test_flag(session->channel, CF_OUTBOUND)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Dialplan, changing state to HOLD\n"); switch_channel_set_state(session->channel, CS_HOLD); @@ -2638,12 +2653,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Dialplan, Aborting\n"); switch_channel_hangup(session->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } - } else { - if ((extension = dialplan_interface->hunt_function(session)) != 0) { - switch_channel_set_caller_extension(session->channel, extension); - } } } + } static void switch_core_standard_on_execute(switch_core_session_t *session)

1 0

[commit] r3411 - freeswitch/trunk/src
by Freeswitch SVN 19 Nov '06

19 Nov '06

Author: mikej Date: Sat Nov 18 20:11:07 2006 New Revision: 3411 Modified: freeswitch/trunk/src/switch_ivr.c Log: parentheses for proper cast. Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat Nov 18 20:11:07 2006 @@ -2617,7 +2617,7 @@ } } write_frame.data = abuf; - write_frame.datalen = (uint32_t) ringback.asis ? olen : olen * 2; + write_frame.datalen = (uint32_t) (ringback.asis ? olen : olen * 2); if (switch_core_session_write_frame(session, &write_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { break; }

1 0

[commit] r3410 - in freeswitch/trunk/src: . mod/languages/mod_perl
by Freeswitch SVN 19 Nov '06

19 Nov '06

Author: anthm Date: Sat Nov 18 20:09:10 2006 New Revision: 3410 Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c freeswitch/trunk/src/switch_swig.c Log: update Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Sat Nov 18 20:09:10 2006 @@ -118,7 +118,6 @@ if (!(my_perl = perl_alloc())) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate perl intrepreter\n"); - switch_core_destroy(); return SWITCH_STATUS_MEMERR; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocated perl intrepreter.\n"); Modified: freeswitch/trunk/src/switch_swig.c ============================================================================== --- freeswitch/trunk/src/switch_swig.c (original) +++ freeswitch/trunk/src/switch_swig.c Sat Nov 18 20:09:10 2006 @@ -64,7 +64,7 @@ { switch_status_t status; - status = switch_core_destroy(); + status = switch_core_destroy(0); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; }

1 0