September 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5727 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 20 Sep '07

20 Sep '07

Author: greenlizard Date: Thu Sep 20 16:09:04 2007 New Revision: 5727 Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/switch_xml.c Log: patch which causes directory xml_curl requests to pass the sofia profile name Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Thu Sep 20 16:09:04 2007 @@ -322,7 +322,8 @@ char *ip, switch_xml_t *root, switch_xml_t *domain, - switch_xml_t *user); + switch_xml_t *user, + char *profile_name); ///\brief open a config in the core registry ///\param file_path the name of the config section e.g. modules.conf 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 Thu Sep 20 16:09:04 2007 @@ -816,7 +816,7 @@ free(sql); } - if (switch_xml_locate_user(username, realm, ip, &xml, &domain, &user) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate_user(username, realm, ip, &xml, &domain, &user, profile->name) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", username, realm); ret = AUTH_FORBIDDEN; goto end; Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Thu Sep 20 16:09:04 2007 @@ -1201,7 +1201,8 @@ char *ip, switch_xml_t *root, switch_xml_t *domain, - switch_xml_t *user) + switch_xml_t *user, + char *profile_name) { char params[1024] = ""; switch_status_t status; @@ -1209,7 +1210,7 @@ *user = NULL; *domain = NULL; - snprintf(params, sizeof(params), "user=%s&domain=%s&ip=%s", switch_str_nil(user_name), switch_str_nil(domain_name), switch_str_nil(ip)); + snprintf(params, sizeof(params), "user=%s&domain=%s&ip=%s&profile=%s", switch_str_nil(user_name), switch_str_nil(domain_name), switch_str_nil(ip), profile_name); if ((status = switch_xml_locate_domain(domain_name, params, root, domain)) != SWITCH_STATUS_SUCCESS) { return status; }

1 0

[commit] r5726 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 20 Sep '07

20 Sep '07

Author: anthm Date: Thu Sep 20 14:05:01 2007 New Revision: 5726 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: remove useless if, cleanup for grouchy compiler Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Thu Sep 20 14:05:01 2007 @@ -175,8 +175,8 @@ if (in != 0) { for (x = 8; x >= 0; x--) { int num = (int) pow(10, x); - if ((places[x] = in / num)) { - in -= places[x] * num; + if ((places[(uint32_t)x] = in / num)) { + in -= places[(uint32_t)x] * num; } } @@ -197,9 +197,7 @@ { char *p; for (p = tosay; p && *p; p++) { - if (places[x] > -1) { - say_file("digits/%c.wav", *p); - } + say_file("digits/%c.wav", *p); } } break;

1 0

[commit] r5725 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 20 Sep '07

20 Sep '07

Author: silik0n Date: Thu Sep 20 13:38:32 2007 New Revision: 5725 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: fill a little bug Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Thu Sep 20 13:38:32 2007 @@ -156,7 +156,7 @@ { switch_channel_t *channel; int in; - uint32_t x = 0; + int x = 0; int places[9] = { 0 }; char sbuf[13] = ""; switch_status_t status;

1 0

[commit] r5724 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 Sep '07

20 Sep '07

Author: mikej Date: Thu Sep 20 01:44:02 2007 New Revision: 5724 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: run spellcheck 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 Sep 20 01:44:02 2007 @@ -1881,7 +1881,7 @@ } displayname = tmp; } else { - displayname = switch_strlen_zero(from_user) ? "unkonwn" : from_user; + displayname = switch_strlen_zero(from_user) ? "unknown" : from_user; } }

1 0

[commit] r5723 - freeswitch/trunk/src
by Freeswitch SVN 19 Sep '07

19 Sep '07

Author: mikej Date: Wed Sep 19 17:01:38 2007 New Revision: 5723 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix brokeness caused by r5673. Don't pre-set uuid and chan_name on originate off the source profile. Fix for FSCORE-49 Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Sep 19 17:01:38 2007 @@ -471,6 +471,8 @@ caller_caller_profile = caller_profile_override ? caller_profile_override : switch_channel_get_caller_profile(caller_channel); new_profile = switch_caller_profile_clone(session, caller_caller_profile); + new_profile->uuid = NULL; + new_profile->chan_name = NULL; new_profile->destination_number = chan_data; if (cid_name_override) { @@ -491,6 +493,8 @@ if (caller_profile_override) { new_profile = switch_caller_profile_dup(pool, caller_profile_override); new_profile->destination_number = chan_data; + new_profile->uuid = NULL; + new_profile->chan_name = NULL; } else { if (!cid_name_override) { cid_name_override = "FreeSWITCH";

1 0

[commit] r5722 - freeswitch/trunk/src
by Freeswitch SVN 19 Sep '07

19 Sep '07

Author: anthm Date: Wed Sep 19 15:33:03 2007 New Revision: 5722 Modified: freeswitch/trunk/src/switch_ivr.c Log: make the park function only pre-answer and not answer Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Sep 19 15:33:03 2007 @@ -413,7 +413,10 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - switch_channel_answer(channel); + if (!switch_channel_test_flag(channel, CF_ANSWERED)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Careful, Channel is unaswered. Pre-answering...\n"); + switch_channel_pre_answer(channel); + } if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_PARK) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event);

1 0

[commit] r5721 - freeswitch/trunk/src/mod/endpoints/mod_alsa
by Freeswitch SVN 19 Sep '07

19 Sep '07

Author: mikej Date: Wed Sep 19 14:49:59 2007 New Revision: 5721 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Log: fix for MODENDP-25 from Bret McDanel. 1 byte makes all the difference 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 Wed Sep 19 14:49:59 2007 @@ -1487,7 +1487,7 @@ tech_pvt->sample_rate = atoi(argv[4]); } - if (!switch_strlen_zero(argv[4])) { + if (!switch_strlen_zero(argv[5])) { tech_pvt->codec_ms = atoi(argv[5]); }

1 0

[commit] r5720 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Sep '07

19 Sep '07

Author: mikej Date: Wed Sep 19 14:47:59 2007 New Revision: 5720 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: merge MODENDP-27, properly handle options and avoid handle leak 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 Wed Sep 19 14:47:59 2007 @@ -304,6 +304,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created agent for %s\n", profile->name); nua_set_params(profile->nua, + NUTAG_APPL_METHOD("OPTIONS"), //NUTAG_EARLY_MEDIA(1), NUTAG_AUTOANSWER(0), NUTAG_AUTOALERT(0), @@ -328,6 +329,7 @@ NUTAG_URL(node->url), TAG_END()); /* Last tag should always finish the sequence */ nua_set_params(node->nua, + NUTAG_APPL_METHOD("OPTIONS"), NUTAG_EARLY_MEDIA(1), NUTAG_AUTOANSWER(0), NUTAG_AUTOALERT(0), @@ -2054,6 +2056,7 @@ //SOATAG_AUDIO_AUX("cn telephone-event"), //NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + nua_handle_destroy(nh); }

1 0

[commit] r5719 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Sep '07

19 Sep '07

Author: anthm Date: Wed Sep 19 14:39:46 2007 New Revision: 5719 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: move code to only be executed on sucessful auth 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 Wed Sep 19 14:39:46 2007 @@ -841,7 +841,60 @@ } } - if (first) { + if (switch_strlen_zero(passwd) && switch_strlen_zero(a1_hash)) { + ret = AUTH_OK; + goto end; + } + + if (!a1_hash) { + su_md5_t ctx; + char *input; + + input = switch_mprintf("%s:%s:%s", username, realm, passwd); + su_md5_init(&ctx); + su_md5_strupdate(&ctx, input); + su_md5_hexdigest(&ctx, hexdigest); + su_md5_deinit(&ctx); + switch_safe_free(input); + a1_hash = hexdigest; + + } + + for_the_sake_of_interop: + + if ((input = switch_mprintf("%s:%q", regstr, uri))) { + su_md5_init(&ctx); + su_md5_strupdate(&ctx, input); + su_md5_hexdigest(&ctx, uridigest); + su_md5_deinit(&ctx); + } + + if ((input2 = switch_mprintf("%q:%q:%q:%q:%q:%q", a1_hash, nonce, nc, cnonce, qop, uridigest))) { + memset(&ctx, 0, sizeof(ctx)); + su_md5_init(&ctx); + su_md5_strupdate(&ctx, input2); + su_md5_hexdigest(&ctx, bigdigest); + su_md5_deinit(&ctx); + + if (!strcasecmp(bigdigest, response)) { + ret = AUTH_OK; + } else { + if ((profile->ndlb & PFLAG_NDLB_BROKEN_AUTH_HASH) && strcasecmp(regstr, "REGISTER") && strcasecmp(regstr, "INVITE")) { + /* some clients send an ACK with the method 'INVITE' in the hash which will break auth so we will + try again with INVITE so we don't get people complaining to us when someone else's client has a bug...... + */ + switch_safe_free(input); + switch_safe_free(input2); + regstr = "INVITE"; + goto for_the_sake_of_interop; + } + + ret = AUTH_FORBIDDEN; + } + } + + + if (first && ret == AUTH_OK) { if (v_event && (xparams = switch_xml_child(user, "variables"))) { if (switch_event_create(v_event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { for (param = switch_xml_child(xparams, "variable"); param; param = param->next) { @@ -906,57 +959,6 @@ } } - if (switch_strlen_zero(passwd) && switch_strlen_zero(a1_hash)) { - ret = AUTH_OK; - goto end; - } - - if (!a1_hash) { - su_md5_t ctx; - char *input; - - input = switch_mprintf("%s:%s:%s", username, realm, passwd); - su_md5_init(&ctx); - su_md5_strupdate(&ctx, input); - su_md5_hexdigest(&ctx, hexdigest); - su_md5_deinit(&ctx); - switch_safe_free(input); - a1_hash = hexdigest; - - } - - for_the_sake_of_interop: - - if ((input = switch_mprintf("%s:%q", regstr, uri))) { - su_md5_init(&ctx); - su_md5_strupdate(&ctx, input); - su_md5_hexdigest(&ctx, uridigest); - su_md5_deinit(&ctx); - } - - if ((input2 = switch_mprintf("%q:%q:%q:%q:%q:%q", a1_hash, nonce, nc, cnonce, qop, uridigest))) { - memset(&ctx, 0, sizeof(ctx)); - su_md5_init(&ctx); - su_md5_strupdate(&ctx, input2); - su_md5_hexdigest(&ctx, bigdigest); - su_md5_deinit(&ctx); - - if (!strcasecmp(bigdigest, response)) { - ret = AUTH_OK; - } else { - if ((profile->ndlb & PFLAG_NDLB_BROKEN_AUTH_HASH) && strcasecmp(regstr, "REGISTER") && strcasecmp(regstr, "INVITE")) { - /* some clients send an ACK with the method 'INVITE' in the hash which will break auth so we will - try again with INVITE so we don't get people complaining to us when someone else's client has a bug...... - */ - switch_safe_free(input); - switch_safe_free(input2); - regstr = "INVITE"; - goto for_the_sake_of_interop; - } - - ret = AUTH_FORBIDDEN; - } - } end: if (xml) {

1 0

[commit] r5718 - in freeswitch/trunk/src: include mod/endpoints/mod_sofia
by Freeswitch SVN 19 Sep '07

19 Sep '07

Author: anthm Date: Wed Sep 19 14:24:47 2007 New Revision: 5718 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: initial blind crack at passing reinvites across no-media bridges Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Sep 19 14:24:47 2007 @@ -387,6 +387,7 @@ SWITCH_MESSAGE_INDICATE_REDIRECT - indicate redirect SWITCH_MESSAGE_INDICATE_REJECT - indicate reject SWITCH_MESSAGE_INDICATE_BROADCAST - indicate media broadcast + SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT - indicate media broadcast </pre> */ typedef enum { @@ -404,7 +405,8 @@ SWITCH_MESSAGE_INDICATE_UNHOLD, SWITCH_MESSAGE_INDICATE_REDIRECT, SWITCH_MESSAGE_INDICATE_REJECT, - SWITCH_MESSAGE_INDICATE_BROADCAST + SWITCH_MESSAGE_INDICATE_BROADCAST, + SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT } switch_core_session_message_types_t; 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 Wed Sep 19 14:24:47 2007 @@ -689,7 +689,8 @@ switch_channel_mark_answered(channel); } break; - case SWITCH_MESSAGE_INDICATE_NOMEDIA: { + case SWITCH_MESSAGE_INDICATE_NOMEDIA: + { char *uuid; switch_core_session_t *other_session; switch_channel_t *other_channel; @@ -715,16 +716,26 @@ sofia_glue_tech_absorb_sdp(tech_pvt); } sofia_glue_do_invite(session); - } + } break; - case SWITCH_MESSAGE_INDICATE_MEDIA:{ - uint32_t count = 0; - if (switch_channel_get_state(channel) >= CS_HANGUP) { - return SWITCH_STATUS_FALSE; + case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT: + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending media re-direct:\n%s\n", msg->string_arg); + tech_pvt->local_sdp_str = switch_core_session_strdup(session, msg->string_arg); + sofia_glue_do_invite(session); } + break; + + case SWITCH_MESSAGE_INDICATE_MEDIA: + { + uint32_t count = 0; - switch_channel_clear_flag(channel, CF_BYPASS_MEDIA); + if (switch_channel_get_state(channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + + switch_channel_clear_flag(channel, CF_BYPASS_MEDIA); tech_pvt->local_sdp_str = NULL; if (!switch_rtp_ready(tech_pvt->rtp_session)) { sofia_glue_tech_prepare_codecs(tech_pvt); @@ -751,13 +762,15 @@ } break; - case SWITCH_MESSAGE_INDICATE_HOLD:{ + case SWITCH_MESSAGE_INDICATE_HOLD: + { switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); sofia_glue_do_invite(session); } break; - - case SWITCH_MESSAGE_INDICATE_UNHOLD:{ + + case SWITCH_MESSAGE_INDICATE_UNHOLD: + { switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); sofia_glue_do_invite(session); } 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 Wed Sep 19 14:24:47 2007 @@ -1210,6 +1210,19 @@ if (r_sdp) { if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) + && (other_session = switch_core_session_locate(uuid))) { + switch_core_session_message_t msg = { 0 }; + + msg.message_id = SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT; + msg.from = __FILE__; + msg.string_arg = (char *) r_sdp; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing SDP to other leg.\n%s\n", r_sdp); + switch_core_session_receive_message(other_session, &msg); + switch_core_session_rwunlock(other_session); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Re-INVITE to a no-media channel that is not in a bridge.\n"); + } goto done; } else { if (tech_pvt->num_codecs) {

1 0