Ticket #467: ticket467.patch

pjmedia/src/pjmedia/transport_srtp.c

@@ -1171 +1171 @@
             }
             goto BYPASS_SRTP;
         } else if (srtp->setting.use == PJMEDIA_SRTP_OPTIONAL) {
-            if (pj_stricmp(&m_rem->desc.transport, &m_loc->desc.transport)) {
-                DEACTIVATE_MEDIA(pool, m_loc);
-                return PJMEDIA_SDP_EINPROTO;
-            }
+            // Regardless the answer's transport type (RTP/AVP or RTP/SAVP),
+            // the answer must be processed through in optional mode.
+            // Please note that at this point transport type is ensured to be 
+            // RTP/AVP or RTP/SAVP, see transport_media_create()
+            //if (pj_stricmp(&m_rem->desc.transport, &m_loc->desc.transport)) {
+                //DEACTIVATE_MEDIA(pool, m_loc);
+                //return PJMEDIA_SDP_EINPROTO;
+            //}
         } else if (srtp->setting.use == PJMEDIA_SRTP_MANDATORY) {
             if (pj_stricmp(&m_rem->desc.transport, &ID_RTP_SAVP)) {
                 DEACTIVATE_MEDIA(pool, m_loc);

pjmedia/src/pjmedia/sdp_neg.c

@@ -478 +478 @@
         return PJMEDIA_SDPNEG_EINVANSMEDIA;
     }
 
+#if !defined(PJMEDIA_HAS_SRTP) || (PJMEDIA_HAS_SRTP == 0)
+    /* When SRTP enabled, checking transport is handled by transprot SRTP */
 
-    /* Chec that transport in the answer match our offer. */
-
+    /* Check that transport in the answer match our offer. */
     if (pj_strcmp(&answer->desc.transport, 
                   &offer->desc.transport)!=0) 
     {
@@ -488 +489 @@
         return PJMEDIA_SDPNEG_EINVANSTP;
     }
 
+#endif
+
     /* Check if remote has rejected our offer */
     
     if (answer->desc.port == 0) {

pjmedia/src/pjmedia/session.c

@@ -190 +190 @@
 
     /* Transport protocol */
 
+#if !defined(PJMEDIA_HAS_SRTP) || (PJMEDIA_HAS_SRTP == 0)
+    /* When SRTP enabled, checking transport is handled by transprot SRTP */
+
     /* Transport type must be equal */
     if (pj_stricmp(&rem_m->desc.transport, 
                    &local_m->desc.transport) != 0) 
@@ -197 +200 @@
         si->type = PJMEDIA_TYPE_UNKNOWN;
         return PJMEDIA_SDPNEG_EINVANSTP;
     }
+#endif
 
     if (pj_stricmp(&local_m->desc.transport, &ID_RTP_AVP) == 0) {