December 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3655 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: anthm Date: Thu Dec 14 16:16:48 2006 New Revision: 3655 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Dec 14 16:16:48 2006 @@ -2467,13 +2467,13 @@ conference_del_member(member->last_conference, member); conference_add_member(new_conference, member); - stream->write_function(stream, "OK Member %u sent to conference %s.\n", id, argv[3]); + stream->write_function(stream, "OK Members sent to conference %s.\n", id, argv[2]); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Conference-Name", argv[3]); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Conference-Name", argv[2]); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "transfer"); switch_event_fire(&event); }

1 0

[commit] r3653 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: anthm Date: Thu Dec 14 12:58:17 2006 New Revision: 3653 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add some events Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Dec 14 12:58:17 2006 @@ -892,13 +892,13 @@ conference_member_say(member->conference, member, msg, 0); } } else { + action = "unmute-member"; switch_set_flag_locked(member, MFLAG_CAN_SPEAK); if (member->conference->unmuted_sound) { conference_member_play_file(member, member->conference->unmuted_sound, 0); } else { snprintf(msg, sizeof(msg), "Un-Muted"); conference_member_say(member->conference, member, msg, 0); - action = "unmute-member"; } } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { @@ -924,13 +924,13 @@ conference_member_say(member->conference, member, msg, 0); } } else { + action = "unmute-deaf-member"; switch_set_flag_locked(member, MFLAG_CAN_SPEAK|MFLAG_CAN_HEAR); if (member->conference->unmuted_sound) { conference_member_play_file(member, member->conference->unmuted_sound, 0); } else { snprintf(msg, sizeof(msg), "UN-Muted"); conference_member_say(member->conference, member, msg, 0); - action = "unmute-deaf-member"; } }

1 0

[commit] r3652 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: anthm Date: Thu Dec 14 12:54:07 2006 New Revision: 3652 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add some events Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Dec 14 12:54:07 2006 @@ -880,43 +880,72 @@ for (digit = dtmf; *digit; digit++) { switch(*digit) { case '0': - if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { - switch_clear_flag_locked(member, MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR); - if (member->conference->muted_sound) { - conference_member_play_file(member, member->conference->muted_sound, 0); - } else { - snprintf(msg, sizeof(msg), "Muted"); - conference_member_say(member->conference, member, msg, 0); - } - } else { - switch_set_flag_locked(member, MFLAG_CAN_SPEAK); - if (member->conference->unmuted_sound) { - conference_member_play_file(member, member->conference->unmuted_sound, 0); - } else { - snprintf(msg, sizeof(msg), "Un-Muted"); - conference_member_say(member->conference, member, msg, 0); - } - } + { + char *action = "mute-member"; + + if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { + switch_clear_flag_locked(member, MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR); + if (member->conference->muted_sound) { + conference_member_play_file(member, member->conference->muted_sound, 0); + } else { + snprintf(msg, sizeof(msg), "Muted"); + conference_member_say(member->conference, member, msg, 0); + } + } else { + switch_set_flag_locked(member, MFLAG_CAN_SPEAK); + if (member->conference->unmuted_sound) { + conference_member_play_file(member, member->conference->unmuted_sound, 0); + } else { + snprintf(msg, sizeof(msg), "Un-Muted"); + conference_member_say(member->conference, member, msg, 0); + action = "unmute-member"; + } + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", action); + switch_event_fire(&event); + } + } + break; + case '*': + { + char *action = "mute-deaf-member"; + if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { + switch_clear_flag_locked(member, MFLAG_CAN_SPEAK|MFLAG_CAN_HEAR); + if (member->conference->muted_sound) { + conference_member_play_file(member, member->conference->muted_sound, 0); + } else { + snprintf(msg, sizeof(msg), "Muted"); + conference_member_say(member->conference, member, msg, 0); + } + } else { + switch_set_flag_locked(member, MFLAG_CAN_SPEAK|MFLAG_CAN_HEAR); + if (member->conference->unmuted_sound) { + conference_member_play_file(member, member->conference->unmuted_sound, 0); + } else { + snprintf(msg, sizeof(msg), "UN-Muted"); + conference_member_say(member->conference, member, msg, 0); + action = "unmute-deaf-member"; + } + } + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", action); + switch_event_fire(&event); + } + } + break; - case '*': - if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { - switch_clear_flag_locked(member, MFLAG_CAN_SPEAK|MFLAG_CAN_HEAR); - if (member->conference->muted_sound) { - conference_member_play_file(member, member->conference->muted_sound, 0); - } else { - snprintf(msg, sizeof(msg), "Muted"); - conference_member_say(member->conference, member, msg, 0); - } - } else { - switch_set_flag_locked(member, MFLAG_CAN_SPEAK|MFLAG_CAN_HEAR); - if (member->conference->unmuted_sound) { - conference_member_play_file(member, member->conference->unmuted_sound, 0); - } else { - snprintf(msg, sizeof(msg), "UN-Muted"); - conference_member_say(member->conference, member, msg, 0); - } - } - break; case '9': switch_mutex_lock(member->flag_mutex); member->energy_level += 100; @@ -926,6 +955,17 @@ switch_mutex_unlock(member->flag_mutex); snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); conference_member_say(member->conference, member, msg, 0); + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%u", member->energy_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); + switch_event_fire(&event); + } break; case '8': switch_mutex_lock(member->flag_mutex); @@ -933,6 +973,16 @@ switch_mutex_unlock(member->flag_mutex); snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); conference_member_say(member->conference, member, msg, 0); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%u", member->energy_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); + switch_event_fire(&event); + } break; case '7': switch_mutex_lock(member->flag_mutex); @@ -943,6 +993,16 @@ switch_mutex_unlock(member->flag_mutex); snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); conference_member_say(member->conference, member, msg, 0); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%u", member->energy_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); + switch_event_fire(&event); + } break; case '3': switch_mutex_lock(member->flag_mutex); @@ -951,6 +1011,16 @@ switch_mutex_unlock(member->flag_mutex); snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); conference_member_say(member->conference, member, msg, 0); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%u", member->volume_out_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); + switch_event_fire(&event); + } break; case '2': switch_mutex_lock(member->flag_mutex); @@ -958,6 +1028,16 @@ switch_mutex_unlock(member->flag_mutex); snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); conference_member_say(member->conference, member, msg, 0); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%u", member->volume_out_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); + switch_event_fire(&event); + } break; case '1': switch_mutex_lock(member->flag_mutex); @@ -966,6 +1046,16 @@ switch_mutex_unlock(member->flag_mutex); snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); conference_member_say(member->conference, member, msg, 0); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%u", member->volume_out_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); + switch_event_fire(&event); + } break; case '6': switch_mutex_lock(member->flag_mutex); @@ -974,6 +1064,16 @@ switch_mutex_unlock(member->flag_mutex); snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); conference_member_say(member->conference, member, msg, 0); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%u", member->volume_in_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); + switch_event_fire(&event); + } break; case '5': switch_mutex_lock(member->flag_mutex); @@ -981,6 +1081,16 @@ switch_mutex_unlock(member->flag_mutex); snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); conference_member_say(member->conference, member, msg, 0); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%u", member->volume_in_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); + switch_event_fire(&event); + } break; case '4': switch_mutex_lock(member->flag_mutex); @@ -989,6 +1099,16 @@ switch_mutex_unlock(member->flag_mutex); snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); conference_member_say(member->conference, member, msg, 0); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%u", member->volume_in_level); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); + switch_event_fire(&event); + } break; case '#': switch_clear_flag_locked(member, MFLAG_RUNNING);

1 0

[commit] r3651 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: anthm Date: Thu Dec 14 10:48:25 2006 New Revision: 3651 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: rm extra \n Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Thu Dec 14 10:48:25 2006 @@ -72,7 +72,7 @@ switch_uuid_t uuid; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; - if (!(data = switch_mprintf("section=%s&tag_name=%s&key_name=%s&key_value=%s%s%s\n", + if (!(data = switch_mprintf("section=%s&tag_name=%s&key_name=%s&key_value=%s%s%s", section, tag_name ? tag_name : "", key_name ? key_name : "",

1 0

[commit] r3650 - freeswitch/trunk/conf
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: anthm Date: Thu Dec 14 10:13:01 2006 New Revision: 3650 Modified: freeswitch/trunk/conf/freeswitch.xml Log: add example config re: auth to xml_curl Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Dec 14 10:13:01 2006 @@ -342,6 +342,8 @@ need it) -->   +  +  </settings> </configuration>

1 0

[commit] r3649 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: anthm Date: Thu Dec 14 10:08:23 2006 New Revision: 3649 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: add auth to xml_curl Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Thu Dec 14 10:08:23 2006 @@ -36,10 +36,12 @@ static struct { char *url; char *bindings; + char *cred; } globals; SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_url, globals.url); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_bindings, globals.bindings); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cred, globals.cred); struct config_data { char *name; @@ -93,6 +95,10 @@ config_data.name = filename; if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC)) > -1) { + if (!switch_strlen_zero(globals.cred)) { + curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY); + curl_easy_setopt(curl_handle, CURLOPT_USERPWD, globals.cred); + } curl_easy_setopt(curl_handle, CURLOPT_POST, 1); curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, data); curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); @@ -150,7 +156,9 @@ char *bindings = (char *) switch_xml_attr_soft(param, "bindings"); set_global_bindings(bindings); set_global_url(val); - } + } else if (!strcasecmp(var, "gateway-credentials")) { + set_global_cred(val); + } } }

1 0

[commit] r3648 - freeswitch/branches/fonomni
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: sphere Date: Thu Dec 14 02:00:33 2006 New Revision: 3648 Added: freeswitch/branches/fonomni/ Log: Creating empty folder for fonomni

1 0

[commit] r3646 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: anthm Date: Wed Dec 13 21:35:39 2006 New Revision: 3646 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Dec 13 21:35:39 2006 @@ -863,7 +863,7 @@ if (switch_channel_test_flag(channel, CF_OUTBOUND)) { /* test to see if outbound channel has answered */ if (switch_channel_test_flag(channel, CF_ANSWERED) && !switch_test_flag(member->conference, CFLAG_ANSWERED)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED\n"); switch_set_flag(member->conference, CFLAG_ANSWERED); } } else { @@ -2577,7 +2577,7 @@ goto done; } /* add them to the conference */ - if (flags) { + if (flags && strcasecmp(flags, "none")) { snprintf(appdata, sizeof(appdata), "%s +flags{%s}", conference->name, flags); switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata); } else {

1 0

[commit] r3645 - in freeswitch/branches/knhor/trunk: . src src/mod/endpoints/mod_sofia src/mod/languages/mod_spidermonkey
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: knhor Date: Wed Dec 13 21:30:39 2006 New Revision: 3645 Modified: freeswitch/branches/knhor/trunk/ (props changed) freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/knhor/trunk/src/switch_rtp.c Log: Merged revisions 3640-3642 via svnmerge from trunk Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Dec 13 21:30:39 2006 @@ -1468,6 +1468,9 @@ if ((vad_in && inb) || (vad_out && !inb)) { switch_rtp_enable_vad(tech_pvt->rtp_session, tech_pvt->session, &tech_pvt->read_codec, SWITCH_VAD_FLAG_TALKING); switch_set_flag_locked(tech_pvt, TFLAG_VAD); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RTP Engage VAD for %s ( %s %s )\n", + switch_channel_get_name(switch_core_session_get_channel(tech_pvt->session)), + vad_in ? "in" : "", vad_out ? "out" : ""); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP REPORTS ERROR: [%s]\n", err); @@ -4367,7 +4370,7 @@ } } - if (status == 401 || status == 407) { + if (sip && (status == 401 || status == 407)) { sip_r_challenge(status, phrase, nua, profile, nh, sofia_private, sip, tags); goto done; } Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Dec 13 21:30:39 2006 @@ -793,13 +793,19 @@ static JSBool session_flush_digits(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { struct js_session *jss = JS_GetPrivate(cx, obj); - switch_channel_t *channel; char buf[256]; switch_size_t has; + switch_channel_t *channel; channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + if ((has = switch_channel_has_dtmf(channel))) { switch_channel_dequeue_dtmf(channel, buf, has); } @@ -812,7 +818,17 @@ { struct js_session *jss = JS_GetPrivate(cx, obj); switch_event_t *event; + switch_channel_t *channel; + channel = switch_core_session_get_channel(jss->session); + assert(channel != NULL); + + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + while (switch_core_session_dequeue_event(jss->session, &event) == SWITCH_STATUS_SUCCESS) { switch_event_destroy(&event); } @@ -837,6 +853,13 @@ channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + if (argc > 0) { file_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); @@ -885,7 +908,7 @@ JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; - return (switch_channel_ready(channel)) ? JS_TRUE : JS_FALSE; + return JS_TRUE; } @@ -902,6 +925,13 @@ channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + if (argc > 0) { if ((function = JS_ValueToFunction(cx, argv[0]))) { @@ -931,7 +961,7 @@ *rval = cb_state.ret; - return (switch_channel_ready(channel)) ? JS_TRUE : JS_FALSE; + return JS_TRUE; } static JSBool session_streamfile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) @@ -950,6 +980,13 @@ channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + if (argc > 0) { file_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); @@ -994,7 +1031,7 @@ JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; - return (switch_channel_ready(channel)) ? JS_TRUE : JS_FALSE; + return JS_TRUE; } static JSBool session_set_variable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) @@ -1005,6 +1042,13 @@ channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + if (argc > 1) { char *var, *val; @@ -1027,6 +1071,13 @@ channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + if (argc > 0) { char *var, *val; @@ -1063,6 +1114,13 @@ channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + if (argc > 0) { tts_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); @@ -1113,7 +1171,7 @@ JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; - return (switch_channel_ready(channel)) ? JS_TRUE : JS_FALSE; + return JS_TRUE; } static JSBool session_get_digits(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) @@ -1123,6 +1181,17 @@ char *buf; int digits; int32 timeout = 5000; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(jss->session); + assert(channel != NULL); + + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + if (argc > 0) { char term; @@ -1151,6 +1220,13 @@ channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + switch_channel_answer(channel); return JS_TRUE; } @@ -1162,6 +1238,7 @@ channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + *rval = BOOLEAN_TO_JSVAL( switch_channel_ready(channel) ? JS_TRUE : JS_FALSE ); return JS_TRUE; @@ -1176,8 +1253,10 @@ switch_time_t started; unsigned int elapsed; int32 timeout = 60; + channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + started = switch_time_now(); if (argc > 0) { @@ -1209,8 +1288,10 @@ switch_time_t started; unsigned int elapsed; int32 timeout = 60; + channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); + started = switch_time_now(); if (argc > 0) { @@ -1237,6 +1318,19 @@ static JSBool session_execute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { JSBool retval = JS_FALSE; + switch_channel_t *channel; + struct js_session *jss = JS_GetPrivate(cx, obj); + + channel = switch_core_session_get_channel(jss->session); + assert(channel != NULL); + + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + if (argc > 1) { const switch_application_interface_t *application_interface; char *app_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); @@ -1262,7 +1356,18 @@ { struct js_session *jss = JS_GetPrivate(cx, obj); switch_event_t *event; + switch_channel_t *channel; + channel = switch_core_session_get_channel(jss->session); + assert(channel != NULL); + + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + if (switch_core_session_dequeue_event(jss->session, &event) == SWITCH_STATUS_SUCCESS) { JSObject *Event; struct event_obj *eo; @@ -1319,13 +1424,20 @@ char *cause_name = NULL; switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; + channel = switch_core_session_get_channel(jss->session); + assert(channel != NULL); + + if (!switch_channel_ready(channel)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Session is not active!\n"); + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + if (argc > 1) { cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); cause = switch_channel_str2cause(cause_name); } - channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); switch_channel_hangup(channel, cause); switch_core_session_kill_channel(jss->session, SWITCH_SIG_KILL); Modified: freeswitch/branches/knhor/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_rtp.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_rtp.c Wed Dec 13 21:30:39 2006 @@ -1160,7 +1160,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_GOOGLEHACK) && rtp_session->send_msg.header.pt == 97) { rtp_session->recv_msg.header.pt = 102; } - + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VAD) && rtp_session->recv_msg.header.pt == rtp_session->vad_data.read_codec->implementation->ianacode && ((datalen == rtp_session->vad_data.read_codec->implementation->encoded_bytes_per_frame) || @@ -1171,7 +1171,8 @@ uint32_t len = sizeof(decoded); time_t now = time(NULL); send = 0; - + + if (rtp_session->vad_data.scan_freq && rtp_session->vad_data.next_scan <= now) { rtp_session->vad_data.bg_count = rtp_session->vad_data.bg_level = 0; rtp_session->vad_data.next_scan = now + rtp_session->vad_data.scan_freq; @@ -1191,7 +1192,7 @@ uint32_t energy = 0; uint32_t x, y = 0, z = len / sizeof(int16_t); uint32_t score = 0; - + if (z) { for (x = 0; x < z; x++) { energy += abs(decoded[y]);

1 0

[commit] r3644 - in freeswitch/branches/knhor/trunk: . src src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: knhor Date: Wed Dec 13 21:29:33 2006 New Revision: 3644 Modified: freeswitch/branches/knhor/trunk/ (props changed) freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/knhor/trunk/src/switch_rtp.c Log: Merged revisions 3635-3639 via svnmerge from trunk Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Dec 13 21:29:33 2006 @@ -454,7 +454,7 @@ char uridigest[2 * SU_MD5_DIGEST_SIZE + 1]; char bigdigest[2 * SU_MD5_DIGEST_SIZE + 1]; char *nonce, *uri, *qop, *cnonce, *nc, *response, *input = NULL, *input2 = NULL; - auth_res_t ret = AUTH_OK; + auth_res_t ret = AUTH_FORBIDDEN; char *npassword = NULL; int cnt = 0; nonce = uri = qop = cnonce = nc = response = NULL; @@ -527,7 +527,7 @@ su_md5_strupdate(&ctx, input2); su_md5_hexdigest(&ctx, bigdigest); su_md5_deinit(&ctx); - + if (!strcasecmp(bigdigest, response)) { ret = AUTH_OK; } else { @@ -1437,6 +1437,8 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RTP CHANGING DEST TO: [%s:%d]\n", tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); + /* Reactivate the NAT buster flag. */ + switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_AUTOADJ); } return SWITCH_STATUS_SUCCESS; } @@ -2815,7 +2817,6 @@ } sql = switch_mprintf("select passwd from sip_authentication where nonce='%q'", nonce); - if (switch_core_db_prepare(db, sql, -1, &stmt, 0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Statement Error!\n"); goto fail; @@ -2939,9 +2940,11 @@ } if (authorization) { - auth_res = parse_auth(profile, authorization, (char *)sip->sip_request->rq_method_name, key, keylen); + if ((auth_res = parse_auth(profile, authorization, (char *)sip->sip_request->rq_method_name, key, keylen)) == AUTH_STALE) { + stale = 1; + } - if (auth_res != AUTH_OK && auth_res != AUTH_STALE) { + if (auth_res != AUTH_OK && !stale) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send %s for [%s@%s]\n", forbidden ? "forbidden" : "challange", from_user, from_host); @@ -3014,15 +3017,14 @@ switch_uuid_format(uuid_str, &uuid); sql = switch_mprintf("delete from sip_authentication where user='%q' and host='%q';\n" - "insert into sip_authentication values('%q','%q','%q','%q', %ld)", - from_user, - from_host, - from_user, - from_host, - hexdigest, - uuid_str, - time(NULL) + 60); - + "insert into sip_authentication values('%q','%q','%q','%q', %ld)", + from_user, + from_host, + from_user, + from_host, + hexdigest, + uuid_str, + time(NULL) + 60); auth_str = switch_mprintf("Digest realm=\"%q\", nonce=\"%q\",%s algorithm=MD5, qop=\"auth\"", from_host, uuid_str, stale ? " stale=\"true\"," : ""); @@ -4165,7 +4167,8 @@ sip_t const *sip, tagi_t tags[]) { - handle_register(nua, profile, nh, sip, REG_REGISTER, NULL, 0); + char key[128] = ""; + handle_register(nua, profile, nh, sip, REG_REGISTER, key, sizeof(key)); } Modified: freeswitch/branches/knhor/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_rtp.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_rtp.c Wed Dec 13 21:29:33 2006 @@ -865,18 +865,15 @@ if (rtp_session->recv_msg.header.version) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && rtp_session->from_addr->port) { - if ((rtp_session->from_addr->port != rtp_session->remote_port)) { + char *tx_host; + 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 ((rtp_session->from_addr->port != rtp_session->remote_port) || strcmp(tx_host, old_host)) { const char *err; - char *tx_host; uint32_t old = rtp_session->remote_port; - char *old_host; - char bufa[30], bufb[30]; - - //switch_sockaddr_ip_get(&tx_host, rtp_session->from_addr); - //switch_sockaddr_ip_get(&old_host, rtp_session->remote_addr); - - 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_strlen_zero(tx_host) && rtp_session->from_addr->port > 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Auto Changing port from %s:%u to %s:%u\n",

1 0