Changes in [425:6d8b92d8f634:426:1e088c3c4dcb] in verona

Files:

• libeXosip2/src/eXconf.c (modified) (1 diff)
• libeXosip2/src/udp.c (modified) (3 diffs)
• phapi/phapi.c (modified) (1 diff)

libeXosip2/src/eXconf.c

@@ -776 +776 @@
 #ifdef HAVE_OPENSSL_SSL_H
 #if !(OPENSSL_VERSION_NUMBER < 0x00908000L)
-        eXtl_dtls.tl_init();
+                eXtl_dtls.tl_init();
 #endif
                 eXtl_tls.tl_init();
-        }
-#endif
+#endif
+        }
         return OSIP_SUCCESS;
 }

libeXosip2/src/udp.c

@@ -101 +101 @@
 
 
+static eXosip_new_transport()
+{
+        return !(  eXosip.eXtl == &eXtl_udp
+                || eXosip.eXtl == &eXtl_tcp
+#ifdef HAVE_OPENSSL_SSL_H
+#if !(OPENSSL_VERSION_NUMBER < 0x00908000L)
+                        || eXosip.eXtl == &eXtl_dtls
+#endif
+                        || eXosip.eXtl == &eXtl_tls
+#endif
+                );
+
+}
+
 static void
 eXosip_send_default_answer(eXosip_dialog_t * jd,
@@ -1592 +1606 @@
                 eXtl_udp.tl_set_fdset(&osip_fdset, &max);
                 eXtl_tcp.tl_set_fdset(&osip_fdset, &max);
-                if (eXosip.eXtl)
+                if (eXosip_new_transport())
                         eXosip.eXtl->tl_set_fdset(&osip_fdset, &max);
 #ifdef HAVE_OPENSSL_SSL_H
@@ -1637 +1651 @@
                         eXtl_udp.tl_read_message(&osip_fdset);
                         eXtl_tcp.tl_read_message(&osip_fdset);
-                        if (eXosip.eXtl)
+                        if (eXosip_new_transport())
                                 eXosip.eXtl->tl_read_message(&osip_fdset);
 

phapi/phapi.c

@@ -1120 +1120 @@
 
 #ifdef PHAPI_VIDEO_SUPPORT
-                  if (_is_video_enabled(ca->nego_mstreams)) {
+                  if (_is_video_enabled(ca->nego_mflags)) {
                           ca->video_rtptr = ph_create_rtp_tunnel(tun, ca->remote_sdp_video_ip, ca->remote_sdp_video_port);
                           ca->video_rtcptr = ph_create_rtp_tunnel(tun, ca->remote_sdp_video_ip, ca->remote_sdp_video_rtcp_port);