- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7755 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Feb '08

27 Feb '08

Author: anthm Date: Wed Feb 27 12:06:25 2008 New Revision: 7755 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: tweak 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 Feb 27 12:06:25 2008 @@ -224,6 +224,11 @@ if (session) { switch_core_session_signal_lock(session); + + if (channel && switch_channel_get_state(channel) >= CS_HANGUP) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n"); + goto done; + } } if ((profile->pflags & PFLAG_AUTH_ALL) && tech_pvt && tech_pvt->key && sip) {

1 0

[commit] r7754 - freeswitch/trunk/src
by Freeswitch SVN 27 Feb '08

27 Feb '08

Author: anthm Date: Tue Feb 26 19:08:06 2008 New Revision: 7754 Modified: freeswitch/trunk/src/switch.c Log: finiky compiler contd Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Feb 26 19:08:06 2008 @@ -93,7 +93,7 @@ } /* pull the pid from the file */ - if (fscanf(f, "%d", (int *)&pid)!=1) { + if (fscanf(f, "%d", (int *)(intptr_t)&pid)!=1) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Unable to get the pid!\n"); }

1 0

[commit] r7753 - freeswitch/trunk/src
by Freeswitch SVN 27 Feb '08

27 Feb '08

Author: anthm Date: Tue Feb 26 19:03:25 2008 New Revision: 7753 Modified: freeswitch/trunk/src/switch.c Log: finiky compiler Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Feb 26 19:03:25 2008 @@ -93,7 +93,7 @@ } /* pull the pid from the file */ - if (fscanf(f, "%d", &pid)!=1) { + if (fscanf(f, "%d", (int *)&pid)!=1) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Unable to get the pid!\n"); }

1 0

[commit] r7752 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 26 Feb '08

26 Feb '08

Author: mikej Date: Tue Feb 26 18:29:58 2008 New Revision: 7752 Modified: freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: fix for FSCORE-97 and add set_name app to rename channel Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Tue Feb 26 18:29:58 2008 @@ -93,6 +93,8 @@ char *uuid; /*! context */ const char *context; + /*! profile index */ + const char *profile_index; /*! flags */ switch_caller_profile_flag_t flags; struct switch_caller_profile *originator_caller_profile; Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Feb 26 18:29:58 2008 @@ -345,6 +345,14 @@ switch_channel_hangup(switch_core_session_get_channel(session), cause); } +SWITCH_STANDARD_APP(set_name_function) +{ + + if (!switch_strlen_zero(data)) { + switch_channel_set_name(switch_core_session_get_channel(session), (char *) data); + } +} + SWITCH_STANDARD_APP(answer_function) { switch_channel_answer(switch_core_session_get_channel(session)); @@ -1502,6 +1510,7 @@ SWITCH_ADD_APP(app_interface, "pre_answer", "Pre-Answer the call", "Pre-Answer the call for a channel.", pre_answer_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "answer", "Answer the call", "Answer the call for a channel.", answer_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "hangup", "Hangup the call", "Hangup the call for a channel.", hangup_function, "[<cause>]", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "set_name", "Name the channel", "Name the channel", set_name_function, "<name>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "log", "Logs a channel variable", LOG_LONG_DESC, log_function, "<varname>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "info", "Display Call Info", "Display Call Info", info_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "event", "Fire an event", "Fire an event", event_function, "", SAF_SUPPORT_NOMEDIA); Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Tue Feb 26 18:29:58 2008 @@ -159,9 +159,15 @@ if (!strcasecmp(name, "context")) { return caller_profile->context; } + if (!strcasecmp(name, "chan_name")) { return caller_profile->chan_name; } + + if (!strcasecmp(name, "profile_index")) { + return caller_profile->profile_index; + } + if (!strcasecmp(name, "caller_ton")) { return switch_core_sprintf(caller_profile->pool, "%u", caller_profile->caller_ton); } @@ -245,6 +251,10 @@ switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Name", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->chan_name); } + if (!switch_strlen_zero(caller_profile->profile_index)) { + switch_snprintf(header_name, sizeof(header_name), "%s-Profile-Index", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->profile_index); + } if (caller_profile->times) { switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Created-Time", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->created); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Feb 26 18:29:58 2008 @@ -122,6 +122,7 @@ switch_call_cause_t hangup_cause; int vi; int event_count; + int profile_index; }; SWITCH_DECLARE(const char *) switch_channel_cause2str(switch_call_cause_t cause) @@ -190,7 +191,7 @@ switch_mutex_init(&(*channel)->flag_mutex, SWITCH_MUTEX_NESTED, pool); switch_mutex_init(&(*channel)->profile_mutex, SWITCH_MUTEX_NESTED, pool); (*channel)->hangup_cause = SWITCH_CAUSE_UNALLOCATED; - (*channel)->name = "N/A"; + (*channel)->name = ""; return SWITCH_STATUS_SUCCESS; } @@ -513,13 +514,22 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, const char *name) { + const char *old = NULL; + switch_assert(channel != NULL); + if (!switch_strlen_zero(channel->name)) { + old = channel->name; + } channel->name = NULL; if (name) { char *uuid = switch_core_session_get_uuid(channel->session); channel->name = switch_core_session_strdup(channel->session, name); switch_channel_set_variable(channel, SWITCH_CHANNEL_NAME_VARIABLE, name); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Chan %s [%s]\n", name, uuid); + if (old) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Rename Channel %s->%s [%s]\n", old, name, uuid); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Channel %s [%s]\n", name, uuid); + } } return SWITCH_STATUS_SUCCESS; } @@ -527,7 +537,7 @@ SWITCH_DECLARE(char *) switch_channel_get_name(switch_channel_t *channel) { switch_assert(channel != NULL); - return channel->name ? channel->name : "N/A"; + return (!switch_strlen_zero(channel->name)) ? channel->name : "N/A"; } SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *channel, const char *varname, const char *value) @@ -1138,7 +1148,8 @@ caller_profile->next = channel->caller_profile; channel->caller_profile = caller_profile; - + caller_profile->profile_index = switch_core_sprintf(caller_profile->pool, "%d", ++channel->profile_index); + switch_mutex_unlock(channel->profile_mutex); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Feb 26 18:29:58 2008 @@ -1341,7 +1341,14 @@ if (!(x_callflow = switch_xml_add_child_d(cdr, "callflow", cdr_off++))) { goto error; } - switch_xml_set_attr_d(x_callflow, "dialplan", caller_profile->dialplan); + + if (!switch_strlen_zero(caller_profile->dialplan)) { + switch_xml_set_attr_d(x_callflow, "dialplan", caller_profile->dialplan); + } + + if (!switch_strlen_zero(caller_profile->profile_index)) { + switch_xml_set_attr_d(x_callflow, "profile_index", caller_profile->profile_index); + } if (caller_profile->caller_extension) { switch_caller_application_t *ap;

1 0

[commit] r7751 - freeswitch/trunk/src
by Freeswitch SVN 26 Feb '08

26 Feb '08

Author: mikej Date: Tue Feb 26 17:03:30 2008 New Revision: 7751 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: fix for FSCORE-100 Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Feb 26 17:03:30 2008 @@ -45,11 +45,33 @@ CoreSession::CoreSession() { - do { session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; memset(&args, 0, sizeof(args)); ap = NULL; caller_profile.source = "mod_unknown"; caller_profile.dialplan = ""; caller_profile.context = ""; caller_profile.caller_id_name = ""; caller_profile.caller_id_number = ""; caller_profile.network_addr = ""; caller_profile.ani = ""; caller_profile.aniii = ""; caller_profile.rdnis = ""; caller_profile.username = ""; on_hangup = NULL; cb_state.function = NULL; } while(0); + session = NULL; + channel = NULL; + uuid = NULL; + tts_name = NULL; + voice_name = NULL; + memset(&args, 0, sizeof(args)); + ap = NULL; + on_hangup = NULL; + cb_state.function = NULL; + + memset(&caller_profile, 0, sizeof(caller_profile)); + caller_profile.source = "mod_unknown"; + caller_profile.dialplan = ""; + caller_profile.context = ""; + caller_profile.caller_id_name = ""; + caller_profile.caller_id_number = ""; + caller_profile.network_addr = ""; + caller_profile.ani = ""; + caller_profile.aniii = ""; + caller_profile.rdnis = ""; + caller_profile.username = ""; + } CoreSession::CoreSession(char *nuuid) { + memset(&caller_profile, 0, sizeof(caller_profile)); init_vars(); uuid = strdup(nuuid); if (session = switch_core_session_locate(uuid)) { @@ -59,6 +81,7 @@ CoreSession::CoreSession(switch_core_session_t *new_session) { + memset(&caller_profile, 0, sizeof(caller_profile)); init_vars(); session = new_session; channel = switch_core_session_get_channel(session);

1 0

[commit] r7750 - freeswitch/trunk/src
by Freeswitch SVN 26 Feb '08

26 Feb '08

Author: anthm Date: Tue Feb 26 16:55:59 2008 New Revision: 7750 Modified: freeswitch/trunk/src/switch_channel.c Log: fix MODAPP-78 Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Feb 26 16:55:59 2008 @@ -1937,9 +1937,11 @@ switch_strftime(profile_start, &retsize, sizeof(profile_start), fmt, &tm); switch_channel_set_variable(channel, "profile_start_stamp", profile_start); - switch_time_exp_lt(&tm, caller_profile->times->answered); - switch_strftime(answer, &retsize, sizeof(answer), fmt, &tm); - switch_channel_set_variable(channel, "answer_stamp", answer); + if (caller_profile->times->answered) { + switch_time_exp_lt(&tm, caller_profile->times->answered); + switch_strftime(answer, &retsize, sizeof(answer), fmt, &tm); + switch_channel_set_variable(channel, "answer_stamp", answer); + } switch_time_exp_lt(&tm, caller_profile->times->hungup); switch_strftime(end, &retsize, sizeof(end), fmt, &tm);

1 0

[commit] r7749 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 26 Feb '08

26 Feb '08

Author: mikej Date: Tue Feb 26 16:53:48 2008 New Revision: 7749 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: merge patch from MODEVENT-16 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Feb 26 16:53:48 2008 @@ -195,7 +195,7 @@ SWITCH_STANDARD_APP(socket_function) { - char *host, *port_name; + char *host, *port_name, *path; switch_socket_t *new_sock; switch_sockaddr_t *sa; switch_port_t port = 8084; @@ -203,6 +203,9 @@ int argc = 0, x = 0; char *argv[80] = { 0 }; char *mydata; + switch_channel_t *channel = NULL; + + channel = switch_core_session_get_channel(session); if (data && (mydata = switch_core_session_strdup(session, data))) { argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); @@ -220,11 +223,18 @@ return; } + switch_channel_set_variable(channel, "socket_host", host); + if ((port_name = strchr(host, ':'))) { *port_name++ = '\0'; port = (switch_port_t) atoi(port_name); } + if ((path = strchr(port_name, '/'))) { + *path++ = '\0'; + switch_channel_set_variable(channel, "socket_path", path); + } + if (switch_sockaddr_info_get(&sa, host, AF_INET, port, 0, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error!\n"); return;

1 0

[commit] r7748 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket
by Freeswitch SVN 26 Feb '08

26 Feb '08

Author: mikej Date: Tue Feb 26 16:44:27 2008 New Revision: 7748 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c Log: fix for MODLANG-51, MODLANG-52 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c Tue Feb 26 16:44:27 2008 @@ -44,28 +44,27 @@ /*********************************************************************************/ static JSBool socket_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { - if (argc > 0) { - js_socket_obj_t* js_socket_obj = 0; - switch_memory_pool_t *pool; - switch_socket_t *socket; - - switch_core_new_memory_pool(&pool); - if (!switch_socket_create(&socket, AF_INET, SOCK_STREAM, SWITCH_PROTO_TCP, pool)) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Failed to create socket.\n"); - return JS_FALSE; - } - - // allocate information needed by JS to be able to write to the log. - // (needed since multitple js sessions can write to the same log) - js_socket_obj = switch_core_alloc(pool, sizeof(js_socket_obj_t)); - js_socket_obj->pool = pool; - js_socket_obj->socket = socket; - JS_SetPrivate(cx, obj, js_socket_obj); - return JS_TRUE; + js_socket_obj_t* js_socket_obj = 0; + switch_memory_pool_t *pool; + switch_socket_t *socket; + switch_status_t ret; + + switch_core_new_memory_pool(&pool); + ret = switch_socket_create(&socket, AF_INET, SOCK_STREAM, SWITCH_PROTO_TCP, pool); + if (ret != SWITCH_STATUS_SUCCESS) + { + switch_core_destroy_memory_pool(&pool); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Failed to create socket, reason: %d.\n", ret); + return JS_FALSE; } - return JS_FALSE; + // allocate information needed by JS to be able to write to the log. + // (needed since multitple js sessions can write to the same log) + js_socket_obj = switch_core_alloc(pool, sizeof(js_socket_obj_t)); + js_socket_obj->pool = pool; + js_socket_obj->socket = socket; + JS_SetPrivate(cx, obj, js_socket_obj); + return JS_TRUE; } static void socket_destroy(JSContext * cx, JSObject * obj) @@ -115,7 +114,7 @@ *rval = BOOLEAN_TO_JSVAL(JS_FALSE); } else - *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); }

1 0

[commit] r7747 - in freeswitch/trunk/conf/dialplan: . extensions
by Freeswitch SVN 26 Feb '08

26 Feb '08

Author: brian Date: Tue Feb 26 16:33:30 2008 New Revision: 7747 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.noload Log: not export srtp support on outbound Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Feb 26 16:33:30 2008 @@ -55,7 +55,7 @@ <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never"> <action application="set" data="sip_secure_media=true"/>  - <action application="export" data="sip_secure_media=true"/> +  </condition> <condition> <action application="db" data="insert/spymap/${caller_id_number}/${uuid}"/> @@ -327,7 +327,6 @@ --> <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> - <action application="unset" data="sip_secure_media"/> <action application="transfer" data="$1 enum"/> </condition> </extension> Modified: freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload ============================================================================== --- freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload (original) +++ freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Tue Feb 26 16:33:30 2008 @@ -1,7 +1,6 @@ <include> <extension name="sipphone.com"> <condition field="destination_number" expression="^((1222.*)$|^(1747.*))$"> - <action application="unset" data="sip_secure_media"/> <action application="bridge" data="sofia/gateway/proxy01.sipphone.com/$1"/> </condition> </extension> Modified: freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.noload ============================================================================== --- freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.noload (original) +++ freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.noload Tue Feb 26 16:33:30 2008 @@ -1,7 +1,6 @@ <include> <extension name="tollfreegateway.com"> <condition field="destination_number" expression="^1?(8(00|55|66|77|88)[2-9]\d{6})$"> - <action application="unset" data="sip_secure_media"/> <action application="bridge" data="{absolute_codec_string=PCMU,PCMA}sofia/${use_profile}/9313371$1(a)sip.tollfreegateway.com"/> </condition> </extension>

1 0

[commit] r7746 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Feb '08

26 Feb '08

Author: anthm Date: Tue Feb 26 16:13:47 2008 New Revision: 7746 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: srtp update 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 Tue Feb 26 16:13:47 2008 @@ -76,6 +76,7 @@ #define SOFIA_SECURE_MEDIA_VARIABLE "sip_secure_media" #define SOFIA_SECURE_MEDIA_CONFIRMED_VARIABLE "sip_secure_media_confirmed" #define SOFIA_HAS_CRYPTO_VARIABLE "sip_has_crypto" +#define SOFIA_CRYPTO_MANDATORY_VARIABLE "sip_crypto_mandatory" #include <sofia-sip/nua.h> #include <sofia-sip/sip_status.h> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Feb 26 16:13:47 2008 @@ -1127,7 +1127,7 @@ if ((parser = sdp_parse(NULL, sdp_str, (int) strlen(sdp_str), 0))) { if ((sdp = sdp_session(parser))) { for (m = sdp->sdp_media; m; m = m->m_next) { - if (m->m_type != sdp_media_audio) { + if (m->m_type != sdp_media_audio || !m->m_port) { continue; } @@ -1726,7 +1726,7 @@ switch_channel_t *channel = switch_core_session_get_channel(session); const char *val; const char *crypto = NULL; - int got_crypto = 0, got_audio = 0; + int got_crypto = 0, got_audio = 0, got_avp = 0, got_savp = 0; switch_assert(tech_pvt != NULL); @@ -1808,7 +1808,13 @@ ptime = dptime; - if (m->m_type == sdp_media_audio && !got_audio) { + if (m->m_proto == sdp_proto_srtp) { + got_savp++; + } else if (m->m_proto == sdp_proto_rtp) { + got_avp++; + } + + if (m->m_type == sdp_media_audio && m->m_port && !got_audio) { sdp_rtpmap_t *map; for (attr = m->m_attributes; attr; attr = attr->a_next) { @@ -1862,6 +1868,11 @@ } } + if (got_crypto && !got_avp) { + switch_channel_set_variable(tech_pvt->channel, SOFIA_CRYPTO_MANDATORY_VARIABLE, "true"); + switch_channel_set_variable(tech_pvt->channel, SOFIA_SECURE_MEDIA_VARIABLE, "true"); + } + connection = sdp->sdp_connection; if (m->m_connections) { connection = m->m_connections; @@ -2024,7 +2035,7 @@ goto greed; } - } else if (m->m_type == sdp_media_video) { + } else if (m->m_type == sdp_media_video && m->m_port) { sdp_rtpmap_t *map; const char *rm_encoding; int framerate = 0;

1 0