<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16563] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16563">16563</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-02-03 13:19:10 -0600 (Wed, 03 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre> ZRTP Video works with ZFone (but you have to set your endpoint to use 99 for the payload for video or 125 in mod_h26x.c for H264 becuase the payloads MUST match or it can't figure it out</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_channelh">freeswitch/trunk/src/include/switch_channel.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx">freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs">freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs</a></li>
<li><a href="#freeswitchtrunksrcswitch_channelc">freeswitch/trunk/src/switch_channel.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_rtpc">freeswitch/trunk/src/switch_rtp.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_channelh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_channel.h (16562 => 16563)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_channel.h 2010-02-03 19:14:12 UTC (rev 16562)
+++ freeswitch/trunk/src/include/switch_channel.h 2010-02-03 19:19:10 UTC (rev 16563)
</span><span class="lines">@@ -434,6 +434,7 @@
</span><span class="cx"> \return void pointer to channel's private data
</span><span class="cx"> */
</span><span class="cx"> SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key);
</span><ins>+SWITCH_DECLARE(void *) switch_channel_get_private_partner(switch_channel_t *channel, const char *key);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> \brief Assign a name to a given channel
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (16562 => 16563)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-02-03 19:14:12 UTC (rev 16562)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-02-03 19:19:10 UTC (rev 16563)
</span><span class="lines">@@ -2032,6 +2032,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (tech_pvt->video_rtp_session) {
+ switch_rtp_destroy(&tech_pvt->video_rtp_session);
+ } else if (tech_pvt->local_sdp_video_port) {
+ switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port);
+ }
+
+
+ if (tech_pvt->local_sdp_video_port > 0 && sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
+ switch_nat_del_mapping((switch_port_t)tech_pvt->local_sdp_video_port, SWITCH_NAT_UDP);
+ }
+
+
</ins><span class="cx"> if (tech_pvt->rtp_session) {
</span><span class="cx"> switch_rtp_destroy(&tech_pvt->rtp_session);
</span><span class="cx"> } else if (tech_pvt->local_sdp_audio_port) {
</span><span class="lines">@@ -2042,16 +2054,6 @@
</span><span class="cx"> switch_nat_del_mapping((switch_port_t)tech_pvt->local_sdp_audio_port, SWITCH_NAT_UDP);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (tech_pvt->video_rtp_session) {
- switch_rtp_destroy(&tech_pvt->video_rtp_session);
- } else if (tech_pvt->local_sdp_video_port) {
- switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port);
- }
-
-
- if (tech_pvt->local_sdp_video_port > 0 && sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
- switch_nat_del_mapping((switch_port_t)tech_pvt->local_sdp_video_port, SWITCH_NAT_UDP);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t sofia_glue_tech_set_video_codec(private_object_t *tech_pvt, int force)
</span><span class="lines">@@ -2749,7 +2751,7 @@
</span><span class="cx"> sofia_glue_tech_set_video_codec(tech_pvt, 0);
</span><span class="cx">
</span><span class="cx"> flags &= ~(SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_NOBLOCK);
</span><del>- flags |= SWITCH_RTP_FLAG_VIDEO | SWITCH_RTP_FLAG_PROXY_MEDIA;
</del><ins>+ flags |= SWITCH_RTP_FLAG_VIDEO;
</ins><span class="cx">
</span><span class="cx"> tech_pvt->video_rtp_session = switch_rtp_new(tech_pvt->local_sdp_audio_ip,
</span><span class="cx"> tech_pvt->local_sdp_video_port,
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (16562 => 16563)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-02-03 19:14:12 UTC (rev 16562)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-02-03 19:19:10 UTC (rev 16563)
</span><span class="lines">@@ -21111,6 +21111,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_name_printf(void * jarg1, char * jarg2, char * jarg3) {
+ int jresult ;
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+ char *arg2 = (char *) 0 ;
+ char *arg3 = (char *) 0 ;
+ void *arg4 = 0 ;
+ switch_status_t result;
+
+ arg1 = (switch_channel_t *)jarg1;
+ arg2 = (char *)jarg2;
+ arg3 = (char *)jarg3;
+ result = (switch_status_t)switch_channel_set_variable_name_printf(arg1,(char const *)arg2,(char const *)arg3,arg4);
+ jresult = result;
+ return jresult;
+}
+
+
</ins><span class="cx"> SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_partner_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
</span><span class="cx"> int jresult ;
</span><span class="cx"> switch_channel_t *arg1 = (switch_channel_t *) 0 ;
</span><span class="lines">@@ -21567,6 +21584,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_private_partner(void * jarg1, char * jarg2) {
+ void * jresult ;
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+ char *arg2 = (char *) 0 ;
+ void *result = 0 ;
+
+ arg1 = (switch_channel_t *)jarg1;
+ arg2 = (char *)jarg2;
+ result = (void *)switch_channel_get_private_partner(arg1,(char const *)arg2);
+ jresult = (void *)result;
+ return jresult;
+}
+
+
</ins><span class="cx"> SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_name(void * jarg1, char * jarg2) {
</span><span class="cx"> int jresult ;
</span><span class="cx"> switch_channel_t *arg1 = (switch_channel_t *) 0 ;
</span><span class="lines">@@ -22746,15 +22777,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_del_header(void * jarg1, char * jarg2) {
</del><ins>+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_del_header_val(void * jarg1, char * jarg2, char * jarg3) {
</ins><span class="cx"> int jresult ;
</span><span class="cx"> switch_event_t *arg1 = (switch_event_t *) 0 ;
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><ins>+ char *arg3 = (char *) 0 ;
</ins><span class="cx"> switch_status_t result;
</span><span class="cx">
</span><span class="cx"> arg1 = (switch_event_t *)jarg1;
</span><span class="cx"> arg2 = (char *)jarg2;
</span><del>- result = (switch_status_t)switch_event_del_header(arg1,(char const *)arg2);
</del><ins>+ arg3 = (char *)jarg3;
+ result = (switch_status_t)switch_event_del_header_val(arg1,(char const *)arg2,(char const *)arg3);
</ins><span class="cx"> jresult = result;
</span><span class="cx"> return jresult;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (16562 => 16563)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-02-03 19:14:12 UTC (rev 16562)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-02-03 19:19:10 UTC (rev 16563)
</span><span class="lines">@@ -2851,6 +2851,11 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public static switch_status_t switch_channel_set_variable_name_printf(SWIGTYPE_p_switch_channel channel, string val, string fmt) {
+ switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_set_variable_name_printf(SWIGTYPE_p_switch_channel.getCPtr(channel), val, fmt);
+ return ret;
+ }
+
</ins><span class="cx"> public static switch_status_t switch_channel_set_variable_partner_var_check(SWIGTYPE_p_switch_channel channel, string varname, string value, switch_bool_t var_check) {
</span><span class="cx"> switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_set_variable_partner_var_check(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, value, (int)var_check);
</span><span class="cx"> return ret;
</span><span class="lines">@@ -3014,6 +3019,12 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public static SWIGTYPE_p_void switch_channel_get_private_partner(SWIGTYPE_p_switch_channel channel, string key) {
+ IntPtr cPtr = freeswitchPINVOKE.switch_channel_get_private_partner(SWIGTYPE_p_switch_channel.getCPtr(channel), key);
+ SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false);
+ return ret;
+ }
+
</ins><span class="cx"> public static switch_status_t switch_channel_set_name(SWIGTYPE_p_switch_channel channel, string name) {
</span><span class="cx"> switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_set_name(SWIGTYPE_p_switch_channel.getCPtr(channel), name);
</span><span class="cx"> return ret;
</span><span class="lines">@@ -3273,8 +3284,8 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public static switch_status_t switch_event_del_header(switch_event arg0, string header_name) {
- switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_event_del_header(switch_event.getCPtr(arg0), header_name);
</del><ins>+ public static switch_status_t switch_event_del_header_val(switch_event arg0, string header_name, string val) {
+ switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_event_del_header_val(switch_event.getCPtr(arg0), header_name, val);
</ins><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -10035,6 +10046,9 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_variable_printf")]
</span><span class="cx"> public static extern int switch_channel_set_variable_printf(HandleRef jarg1, string jarg2, string jarg3);
</span><span class="cx">
</span><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_variable_name_printf")]
+ public static extern int switch_channel_set_variable_name_printf(HandleRef jarg1, string jarg2, string jarg3);
+
</ins><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_variable_partner_var_check")]
</span><span class="cx"> public static extern int switch_channel_set_variable_partner_var_check(HandleRef jarg1, string jarg2, string jarg3, int jarg4);
</span><span class="cx">
</span><span class="lines">@@ -10137,6 +10151,9 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_private")]
</span><span class="cx"> public static extern IntPtr switch_channel_get_private(HandleRef jarg1, string jarg2);
</span><span class="cx">
</span><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_private_partner")]
+ public static extern IntPtr switch_channel_get_private_partner(HandleRef jarg1, string jarg2);
+
</ins><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_name")]
</span><span class="cx"> public static extern int switch_channel_set_name(HandleRef jarg1, string jarg2);
</span><span class="cx">
</span><span class="lines">@@ -10404,8 +10421,8 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_event_add_header_string")]
</span><span class="cx"> public static extern int switch_event_add_header_string(HandleRef jarg1, int jarg2, string jarg3, string jarg4);
</span><span class="cx">
</span><del>- [DllImport("mod_managed", EntryPoint="CSharp_switch_event_del_header")]
- public static extern int switch_event_del_header(HandleRef jarg1, string jarg2);
</del><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_switch_event_del_header_val")]
+ public static extern int switch_event_del_header_val(HandleRef jarg1, string jarg2, string jarg3);
</ins><span class="cx">
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_event_destroy")]
</span><span class="cx"> public static extern void switch_event_destroy(HandleRef jarg1);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_channelc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_channel.c (16562 => 16563)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_channel.c 2010-02-03 19:14:12 UTC (rev 16562)
+++ freeswitch/trunk/src/switch_channel.c 2010-02-03 19:19:10 UTC (rev 16563)
</span><span class="lines">@@ -623,6 +623,24 @@
</span><span class="cx"> return val;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(void *) switch_channel_get_private_partner(switch_channel_t *channel, const char *key)
+{
+ const char *uuid;
+ void *val = NULL;
+
+ switch_assert(channel != NULL);
+
+ if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) {
+ switch_core_session_t *session;
+ if ((session = switch_core_session_locate(uuid))) {
+ val = switch_core_hash_find_locked(channel->private_hash, key, channel->profile_mutex);
+ switch_core_session_rwunlock(session);
+ }
+ }
+
+ return val;
+}
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, const char *name)
</span><span class="cx"> {
</span><span class="cx"> const char *old = NULL;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_rtpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_rtp.c (16562 => 16563)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_rtp.c 2010-02-03 19:14:12 UTC (rev 16562)
+++ freeswitch/trunk/src/switch_rtp.c 2010-02-03 19:19:10 UTC (rev 16563)
</span><span class="lines">@@ -219,9 +219,9 @@
</span><span class="cx"> #ifdef ENABLE_ZRTP
</span><span class="cx"> zrtp_session_t *zrtp_session;
</span><span class="cx"> zrtp_profile_t *zrtp_profile;
</span><del>- zrtp_stream_t *zrtp_audio_ctx;
- zrtp_stream_t *zrtp_video_ctx;
</del><ins>+ zrtp_stream_t *zrtp_stream;
</ins><span class="cx"> int zrtp_mitm_tries;
</span><ins>+ int zinit;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifdef RTP_DEBUG_WRITE_DELTA
</span><span class="lines">@@ -439,44 +439,74 @@
</span><span class="cx"> static void zrtp_event_callback(zrtp_stream_t *stream, unsigned event)
</span><span class="cx"> {
</span><span class="cx"> switch_rtp_t *rtp_session = zrtp_stream_get_userdata(stream);
</span><ins>+ zrtp_session_info_t zrtp_session_info;
</ins><span class="cx"> switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_event_t *fsevent = NULL;
</span><ins>+ const char *type;
</ins><span class="cx">
</span><del>- zrtp_session_info_t zrtp_session_info;
-
</del><ins>+ type = switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO) ? "video" : "audio";
+
</ins><span class="cx"> switch (event) {
</span><span class="cx"> case ZRTP_EVENT_IS_SECURE:
</span><span class="cx"> {
</span><span class="cx"> switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND);
</span><span class="cx"> switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV);
</span><del>- switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
- switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
- if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) {
</del><ins>+ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO)) {
+ switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
+ switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
+ }
+ if (zrtp_status_ok == zrtp_session_get(stream->session, &zrtp_session_info)) {
</ins><span class="cx"> if (zrtp_session_info.sas_is_ready) {
</span><span class="cx">
</span><del>- switch_channel_set_variable(channel, "zrtp_secure_media_confirmed", "true");
- switch_channel_set_variable(channel, "zrtp_sas1_string", rtp_session->zrtp_session->sas1.buffer);
- switch_channel_set_variable(channel, "zrtp_sas2_string", rtp_session->zrtp_session->sas2.buffer);
</del><ins>+ switch_channel_set_variable_name_printf(channel, "true", "zrtp_secure_media_confirmed_%s", type);
+ switch_channel_set_variable_name_printf(channel, stream->session->sas1.buffer, "zrtp_sas1_string_%s", type);
+ switch_channel_set_variable_name_printf(channel, stream->session->sas2.buffer, "zrtp_sas2_string", type);
</ins><span class="cx">
</span><del>- zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid,
- &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1);
</del><ins>+ zrtp_verified_set(zrtp_global, &stream->session->zid,
+ &stream->session->peer_zid, zrtp_session_info.sas_is_verified^1);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO)) {
+ switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
+
+ if (session) {
+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ switch_rtp_t *video_rtp_session = switch_channel_get_private(channel, "__zrtp_video_rtp_session");
+
+ if (!video_rtp_session) {
+ video_rtp_session = switch_channel_get_private_partner(channel, "__zrtp_video_rtp_session");
+ }
+
+ if (video_rtp_session) {
+ if (zrtp_status_ok != zrtp_stream_attach(stream->session, &video_rtp_session->zrtp_stream)) {
+ abort();
+ }
+ zrtp_stream_set_userdata(video_rtp_session->zrtp_stream, video_rtp_session);
+ if (switch_true(switch_channel_get_variable(channel, "zrtp_enrollment"))) {
+ zrtp_stream_registration_start(video_rtp_session->zrtp_stream, video_rtp_session->ssrc);
+ } else {
+ zrtp_stream_start(video_rtp_session->zrtp_stream, video_rtp_session->ssrc);
+ }
+ }
+ }
+ }
+
+ if (switch_event_create(&fsevent, SWITCH_EVENT_CALL_SECURE) == SWITCH_STATUS_SUCCESS) {
+ switch_event_add_header(fsevent, SWITCH_STACK_BOTTOM, "secure_media_type", "%s", type);
+ switch_event_add_header(fsevent, SWITCH_STACK_BOTTOM, "secure_type", "zrtp:%s:%s", stream->session->sas1.buffer, stream->session->sas2.buffer);
+ switch_event_add_header_string(fsevent, SWITCH_STACK_BOTTOM, "caller-unique-id", switch_channel_get_uuid(channel));
+ switch_event_fire(&fsevent);
+ }
</ins><span class="cx"> }
</span><del>- if (switch_event_create(&fsevent, SWITCH_EVENT_CALL_SECURE) == SWITCH_STATUS_SUCCESS) {
- switch_event_add_header(fsevent, SWITCH_STACK_BOTTOM, "secure_type", "zrtp:%s:%s",
- rtp_session->zrtp_session->sas1.buffer, rtp_session->zrtp_session->sas2.buffer);
- switch_event_add_header_string(fsevent, SWITCH_STACK_BOTTOM, "caller-unique-id", switch_channel_get_uuid(channel));
- switch_event_fire(&fsevent);
- }
</del><span class="cx"> break;
</span><span class="cx"> #if 0
</span><span class="cx"> case ZRTP_EVENT_NO_ZRTP_QUICK:
</span><span class="cx"> {
</span><del>- if (rtp_session->zrtp_audio_ctx != NULL) {
- zrtp_stream_stop(rtp_session->zrtp_audio_ctx);
</del><ins>+ if (stream != NULL) {
+ zrtp_stream_stop(stream);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -484,19 +514,19 @@
</span><span class="cx"> case ZRTP_EVENT_IS_CLIENT_ENROLLMENT:
</span><span class="cx"> {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Enrolled complete!\n");
</span><del>- switch_channel_set_variable(channel, "zrtp_enroll_complete", "true");
</del><ins>+ switch_channel_set_variable_name_printf(channel, "true", "zrtp_enroll_complete_%s", type);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case ZRTP_EVENT_USER_ALREADY_ENROLLED:
</span><span class="cx"> {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "User already enrolled!\n");
</span><del>- switch_channel_set_variable(channel, "zrtp_already_enrolled", "true");
</del><ins>+ switch_channel_set_variable_name_printf(channel, "true", "zrtp_already_enrolled_%s", type);
</ins><span class="cx">
</span><del>- if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) {
</del><ins>+ if (zrtp_status_ok == zrtp_session_get(stream->session, &zrtp_session_info)) {
</ins><span class="cx"> if (zrtp_session_info.sas_is_ready) {
</span><del>- zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid,
- &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1);
</del><ins>+ zrtp_verified_set(zrtp_global, &stream->session->zid,
+ &stream->session->peer_zid, zrtp_session_info.sas_is_verified^1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -505,12 +535,12 @@
</span><span class="cx"> case ZRTP_EVENT_NEW_USER_ENROLLED:
</span><span class="cx"> {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New user enrolled!\n");
</span><del>- switch_channel_set_variable(channel, "zrtp_new_user_enrolled", "true");
</del><ins>+ switch_channel_set_variable_name_printf(channel, "true", "zrtp_new_user_enrolled_%s", type);
</ins><span class="cx">
</span><del>- if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) {
</del><ins>+ if (zrtp_status_ok == zrtp_session_get(stream->session, &zrtp_session_info)) {
</ins><span class="cx"> if (zrtp_session_info.sas_is_ready) {
</span><del>- zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid,
- &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1);
</del><ins>+ zrtp_verified_set(zrtp_global, &stream->session->zid,
+ &stream->session->peer_zid, zrtp_session_info.sas_is_verified^1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -519,12 +549,12 @@
</span><span class="cx"> case ZRTP_EVENT_USER_UNENROLLED:
</span><span class="cx"> {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "User unenrolled!\n");
</span><del>- switch_channel_set_variable(channel, "zrtp_user_unenrolled", "true");
</del><ins>+ switch_channel_set_variable_name_printf(channel, "true", "zrtp_user_unenrolled_%s", type);
</ins><span class="cx">
</span><del>- if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) {
</del><ins>+ if (zrtp_status_ok == zrtp_session_get(stream->session, &zrtp_session_info)) {
</ins><span class="cx"> if (zrtp_session_info.sas_is_ready) {
</span><del>- zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid,
- &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1);
</del><ins>+ zrtp_verified_set(zrtp_global, &stream->session->zid,
+ &stream->session->peer_zid, zrtp_session_info.sas_is_verified^1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -532,7 +562,7 @@
</span><span class="cx">
</span><span class="cx"> case ZRTP_EVENT_IS_PENDINGCLEAR:
</span><span class="cx"> {
</span><del>- switch_channel_set_variable(channel, "zrtp_secure_media_confirmed", "false");
</del><ins>+ switch_channel_set_variable_name_printf(channel, "false", "zrtp_secure_media_confirmed_%s", type);
</ins><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND);
</span><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV);
</span><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
</span><span class="lines">@@ -543,7 +573,7 @@
</span><span class="cx">
</span><span class="cx"> case ZRTP_EVENT_NO_ZRTP:
</span><span class="cx"> {
</span><del>- switch_channel_set_variable(channel, "zrtp_secure_media_confirmed", "false");
</del><ins>+ switch_channel_set_variable_name_printf(channel, "false", "zrtp_secure_media_confirmed_%s", type);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -556,24 +586,6 @@
</span><span class="cx"> {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s", data);
</span><span class="cx"> }
</span><del>-
-static void zrtp_handler(switch_rtp_t *rtp_session, switch_socket_t *sock, void *data, switch_size_t datalen, switch_sockaddr_t *from_addr)
-{
- zrtp_status_t status = zrtp_status_fail;
- unsigned int len = datalen;
-
- status = zrtp_process_srtp(rtp_session->zrtp_audio_ctx, (char*)data, &len);
- switch(status) {
- case zrtp_status_ok:
- break;
- case zrtp_status_drop:
- break;
- case zrtp_status_fail:
- break;
- default:
- break;
- }
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(void) switch_rtp_init(switch_memory_pool_t *pool)
</span><span class="lines">@@ -1126,7 +1138,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> rtp_session->seq = (uint16_t) rand();
</span><del>- rtp_session->ssrc = (uint32_t) ((intptr_t) &rtp_session + (uint32_t) switch_epoch_time_now(NULL));
</del><ins>+ rtp_session->ssrc = (uint32_t) ((intptr_t) rtp_session + (uint32_t) switch_epoch_time_now(NULL));
+
</ins><span class="cx"> rtp_session->send_msg.header.ssrc = htonl(rtp_session->ssrc);
</span><span class="cx"> rtp_session->send_msg.header.ts = 0;
</span><span class="cx"> rtp_session->send_msg.header.m = 0;
</span><span class="lines">@@ -1180,6 +1193,8 @@
</span><span class="cx">
</span><span class="cx"> #ifdef ENABLE_ZRTP
</span><span class="cx"> if (zrtp_on) {
</span><ins>+ switch_rtp_t *master_rtp_session = NULL;
+
</ins><span class="cx"> int initiator = 0;
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> const char *zrtp_enabled = switch_channel_get_variable(channel, "zrtp_secure_media");
</span><span class="lines">@@ -1191,40 +1206,57 @@
</span><span class="cx"> zrtp_enabled = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_channel_set_private(channel, "__zrtp_rtp_session", rtp_session);
</del><span class="cx">
</span><span class="cx"> if (switch_true(zrtp_enabled)) {
</span><ins>+ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO)){
+ switch_channel_set_private(channel, "__zrtp_video_rtp_session", rtp_session);
+ master_rtp_session = switch_channel_get_private(channel, "__zrtp_audio_rtp_session");
+ } else {
+ switch_channel_set_private(channel, "__zrtp_audio_rtp_session", rtp_session);
+ master_rtp_session = rtp_session;
+ }
+
+
</ins><span class="cx"> if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
</span><span class="cx"> initiator = 1;
</span><span class="cx"> }
</span><ins>+
+ if (rtp_session == master_rtp_session) {
+ rtp_session->zrtp_profile = switch_core_alloc(rtp_session->pool, sizeof(*rtp_session->zrtp_profile));
+ zrtp_profile_defaults(rtp_session->zrtp_profile, zrtp_global);
</ins><span class="cx">
</span><del>- rtp_session->zrtp_profile = switch_core_alloc(rtp_session->pool, sizeof(*rtp_session->zrtp_profile));
- zrtp_profile_defaults(rtp_session->zrtp_profile, zrtp_global);
</del><ins>+ rtp_session->zrtp_profile->allowclear = 0;
+ rtp_session->zrtp_profile->disclose_bit = 0;
+ rtp_session->zrtp_profile->cache_ttl = -1;
</ins><span class="cx">
</span><del>- rtp_session->zrtp_profile->allowclear = 0;
- rtp_session->zrtp_profile->disclose_bit = 0;
- rtp_session->zrtp_profile->cache_ttl = -1;
</del><ins>+ if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, initiator, &rtp_session->zrtp_session)) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error! zRTP INIT Failed\n");
+ zrtp_session_down(rtp_session->zrtp_session);
+ rtp_session->zrtp_session = NULL;
+ goto end;
+ }
</ins><span class="cx">
</span><del>- if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, initiator, &rtp_session->zrtp_session)) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error! zRTP INIT Failed\n");
- zrtp_session_down(rtp_session->zrtp_session);
- rtp_session->zrtp_session = NULL;
- }
</del><ins>+ zrtp_session_set_userdata(rtp_session->zrtp_session, session);
</ins><span class="cx">
</span><del>- zrtp_session_set_userdata(rtp_session->zrtp_session, rtp_session);
</del><span class="cx">
</span><del>- if (zrtp_status_ok != zrtp_stream_attach(rtp_session->zrtp_session, &rtp_session->zrtp_audio_ctx)) {
- abort();
</del><ins>+ if (zrtp_status_ok != zrtp_stream_attach(master_rtp_session->zrtp_session, &rtp_session->zrtp_stream)) {
+ abort();
+ }
+
+ zrtp_stream_set_userdata(rtp_session->zrtp_stream, rtp_session);
+
+ if (switch_true(switch_channel_get_variable(channel, "zrtp_enrollment"))) {
+ zrtp_stream_registration_start(rtp_session->zrtp_stream, rtp_session->ssrc);
+ } else {
+ zrtp_stream_start(rtp_session->zrtp_stream, rtp_session->ssrc);
+ }
</ins><span class="cx"> }
</span><del>- zrtp_stream_set_userdata(rtp_session->zrtp_audio_ctx, rtp_session);
</del><span class="cx">
</span><del>- if (switch_true(switch_channel_get_variable(channel, "zrtp_enrollment"))) {
- zrtp_stream_registration_start(rtp_session->zrtp_audio_ctx, rtp_session->ssrc);
- } else {
- zrtp_stream_start(rtp_session->zrtp_audio_ctx, rtp_session->ssrc);
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ end:
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> rtp_session->ready = 1;
</span><span class="lines">@@ -1484,8 +1516,8 @@
</span><span class="cx"> /* ZRTP */
</span><span class="cx"> if (zrtp_on) {
</span><span class="cx">
</span><del>- if ((*rtp_session)->zrtp_audio_ctx != NULL) {
- zrtp_stream_stop((*rtp_session)->zrtp_audio_ctx);
</del><ins>+ if ((*rtp_session)->zrtp_stream != NULL) {
+ zrtp_stream_stop((*rtp_session)->zrtp_stream);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_test_flag((*rtp_session), SWITCH_ZRTP_FLAG_SECURE_SEND)) {
</span><span class="lines">@@ -1940,7 +1972,7 @@
</span><span class="cx"> if (!bytes && poll_loop) {
</span><span class="cx"> goto recvfrom;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (bytes && rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) {
</span><span class="cx"> rtp_flush_read_buffer(rtp_session, SWITCH_RTP_FLUSH_ONCE);
</span><span class="cx"> }
</span><span class="lines">@@ -2063,24 +2095,43 @@
</span><span class="cx"> do_2833(rtp_session);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifdef ENABLE_ZRTP
+ /* ZRTP Recv */
+ if (bytes) {
+ unsigned int sbytes = (int) bytes;
+ zrtp_status_t stat = 0;
+
+ stat = zrtp_process_srtp(rtp_session->zrtp_stream, (void *)&rtp_session->recv_msg, &sbytes);
+
+ switch (stat) {
+ case zrtp_status_ok:
+ bytes = sbytes;
+ break;
+ case zrtp_status_drop:
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat);
+ bytes = 0;
+ goto do_continue;
+ case zrtp_status_fail:
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat);
+ ret = -1;
+ goto end;
+ default:
+ break;
+ }
+ }
+#endif
+
</ins><span class="cx"> if (bytes && rtp_session->recv_msg.header.version != 2) {
</span><span class="cx"> uint8_t *data = (uint8_t *) rtp_session->recv_msg.body;
</span><ins>+
</ins><span class="cx"> if (rtp_session->recv_msg.header.version == 0) {
</span><del>-#ifdef ENABLE_ZRTP
- if (zrtp_on && ZRTP_PACKETS_MAGIC == zrtp_ntoh32(rtp_session->recv_msg.header.ts)) {
- zrtp_handler(rtp_session, rtp_session->sock_input, (void *) &rtp_session->recv_msg, bytes, rtp_session->from_addr);
- } else {
-#endif
- if (rtp_session->ice_user) {
- handle_ice(rtp_session, (void *) &rtp_session->recv_msg, bytes);
- } else if (rtp_session->remote_stun_addr) {
- handle_stun_ping_reply(rtp_session, (void *) &rtp_session->recv_msg, bytes);
- }
-#ifdef ENABLE_ZRTP
</del><ins>+ if (rtp_session->ice_user) {
+ handle_ice(rtp_session, (void *) &rtp_session->recv_msg, bytes);
+ } else if (rtp_session->remote_stun_addr) {
+ handle_stun_ping_reply(rtp_session, (void *) &rtp_session->recv_msg, bytes);
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (rtp_session->invalid_handler) {
</span><span class="cx"> rtp_session->invalid_handler(rtp_session, rtp_session->sock_input, (void *) &rtp_session->recv_msg, bytes, rtp_session->from_addr);
</span><span class="cx"> }
</span><span class="lines">@@ -2133,31 +2184,6 @@
</span><span class="cx"> bytes = sbytes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifdef ENABLE_ZRTP
- /* ZRTP Recv */
- if (bytes && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV)) {
- unsigned int sbytes = (int) bytes;
- zrtp_status_t stat = 0;
-
- stat = zrtp_process_srtp(rtp_session->zrtp_audio_ctx, (void *)&rtp_session->recv_msg, &sbytes);
-
- switch (stat) {
- case zrtp_status_ok:
- break;
- case zrtp_status_drop:
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat);
- break;
- case zrtp_status_fail:
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat);
- ret = -1;
- goto end;
- default:
- break;
- }
- bytes = sbytes;
- }
-#endif
-
</del><span class="cx"> #ifdef DEBUG_2833
</span><span class="cx"> if (rtp_session->dtmf_data.in_digit_sanity && !(rtp_session->dtmf_data.in_digit_sanity % 100)) {
</span><span class="cx"> printf("sanity %d\n", rtp_session->dtmf_data.in_digit_sanity);
</span><span class="lines">@@ -2504,8 +2530,8 @@
</span><span class="cx"> #ifdef ENABLE_ZRTP
</span><span class="cx"> if (zrtp_on && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV)) {
</span><span class="cx"> zrtp_session_info_t zrtp_session_info;
</span><del>-
- if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) {
</del><ins>+
+ if (rtp_session->zrtp_session && (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info))) {
</ins><span class="cx"> if (zrtp_session_info.sas_is_ready) {
</span><span class="cx"> switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="lines">@@ -2516,7 +2542,7 @@
</span><span class="cx">
</span><span class="cx"> if ((other_session = switch_core_session_locate(uuid))) {
</span><span class="cx"> switch_channel_t *other_channel = switch_core_session_get_channel(other_session);
</span><del>- switch_rtp_t *other_rtp_session = switch_channel_get_private(other_channel, "__zrtp_rtp_session");
</del><ins>+ switch_rtp_t *other_rtp_session = switch_channel_get_private(other_channel, "__zrtp_audio_rtp_session");
</ins><span class="cx">
</span><span class="cx"> if (other_rtp_session) {
</span><span class="cx"> if (zrtp_status_ok == zrtp_session_get(other_rtp_session->zrtp_session, &zrtp_session_info)) {
</span><span class="lines">@@ -2525,7 +2551,7 @@
</span><span class="cx"> switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
</span><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
</span><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
</span><del>- } else if (zrtp_status_ok == zrtp_resolve_mitm_call(other_rtp_session->zrtp_audio_ctx, rtp_session->zrtp_audio_ctx)) {
</del><ins>+ } else if (zrtp_status_ok == zrtp_resolve_mitm_call(other_rtp_session->zrtp_stream, rtp_session->zrtp_stream)) {
</ins><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
</span><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
</span><span class="cx"> switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
</span><span class="lines">@@ -2541,8 +2567,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ } else {
+ switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
+ switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (bytes < 0) {
</span><span class="lines">@@ -2798,17 +2828,19 @@
</span><span class="cx"> }
</span><span class="cx"> #ifdef ENABLE_ZRTP
</span><span class="cx"> /* ZRTP Send */
</span><del>- if (switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND)) {
</del><ins>+ if (1) {
</ins><span class="cx"> unsigned int sbytes = (int) bytes;
</span><span class="cx"> zrtp_status_t stat = zrtp_status_fail;
</span><span class="cx">
</span><del>- stat = zrtp_process_rtp(rtp_session->zrtp_audio_ctx, (void*)send_msg, &sbytes);
</del><ins>+ stat = zrtp_process_rtp(rtp_session->zrtp_stream, (void*)send_msg, &sbytes);
</ins><span class="cx">
</span><span class="cx"> switch (stat) {
</span><span class="cx"> case zrtp_status_ok:
</span><span class="cx"> break;
</span><span class="cx"> case zrtp_status_drop:
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat);
</span><ins>+ ret = (int) bytes;
+ goto end;
</ins><span class="cx"> break;
</span><span class="cx"> case zrtp_status_fail:
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat);
</span><span class="lines">@@ -3004,7 +3036,6 @@
</span><span class="cx"> rtp_session->stats.outbound.media_bytes += bytes;
</span><span class="cx"> rtp_session->stats.outbound.media_packet_count++;
</span><span class="cx"> rtp_session->stats.outbound.packet_count++;
</span><del>-
</del><span class="cx"> return (int) bytes;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3023,7 +3054,9 @@
</span><span class="cx">
</span><span class="cx"> if ((other_session = switch_core_session_locate(uuid))) {
</span><span class="cx"> switch_channel_t *other_channel = switch_core_session_get_channel(other_session);
</span><del>- switch_rtp_t *other_rtp_session = switch_channel_get_private(other_channel, "__zrtp_rtp_session");
</del><ins>+ switch_rtp_t *other_rtp_session = switch_channel_get_private(other_channel, "__zrtp_audio_rtp_session");
+
+
</ins><span class="cx"> if (other_rtp_session) {
</span><span class="cx"> if (zrtp_status_ok == zrtp_session_get(other_rtp_session->zrtp_session, &zrtp_session_info)) {
</span><span class="cx"> if (rtp_session->zrtp_mitm_tries > ZRTP_MITM_TRIES) {
</span><span class="lines">@@ -3031,7 +3064,7 @@
</span><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
</span><span class="cx"> switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
</span><span class="cx"> switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
</span><del>- } else if (zrtp_status_ok == zrtp_resolve_mitm_call(other_rtp_session->zrtp_audio_ctx, rtp_session->zrtp_audio_ctx)) {
</del><ins>+ } else if (zrtp_status_ok == zrtp_resolve_mitm_call(other_rtp_session->zrtp_stream, rtp_session->zrtp_stream)) {
</ins><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
</span><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
</span><span class="cx"> switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
</span><span class="lines">@@ -3152,17 +3185,19 @@
</span><span class="cx"> }
</span><span class="cx"> #ifdef ENABLE_ZRTP
</span><span class="cx"> /* ZRTP Send */
</span><del>- if (switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND)) {
</del><ins>+ if (1) {
</ins><span class="cx"> unsigned int sbytes = (int) bytes;
</span><span class="cx"> zrtp_status_t stat = zrtp_status_fail;
</span><span class="cx">
</span><del>- stat = zrtp_process_rtp(rtp_session->zrtp_audio_ctx, (void*)&rtp_session->write_msg, &sbytes);
</del><ins>+ stat = zrtp_process_rtp(rtp_session->zrtp_stream, (void*)&rtp_session->write_msg, &sbytes);
</ins><span class="cx">
</span><span class="cx"> switch (stat) {
</span><span class="cx"> case zrtp_status_ok:
</span><span class="cx"> break;
</span><span class="cx"> case zrtp_status_drop:
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat);
</span><ins>+ ret = (int) bytes;
+ goto end;
</ins><span class="cx"> break;
</span><span class="cx"> case zrtp_status_fail:
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>