Changeset 1810 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

Feb 21, 2008 10:08:27 AM (16 years ago)

Author:

bennylp

Message:

Ticket #467: fixed issues with RTP/AVP vs RTP/SAVP negotiation

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -36 +36 @@
 #define MAX_BUFFER_LEN  1500
 #define MAX_KEY_LEN     32
-#define DEACTIVATE_MEDIA(pool, m) {\
-            attr = pjmedia_sdp_attr_create(pool, ID_INACTIVE.ptr, NULL); \
-            m->attr[m->attr_count++] = attr; \
-            m->desc.port = 0; \
-        }
+#define DEACTIVATE_MEDIA(pool, m) pjmedia_sdp_media_deactivate(pool, m)
 
 static const pj_str_t ID_RTP_AVP  = { "RTP/AVP", 7 };
@@ -84 +80 @@
     pj_lock_t           *mutex;
     char                 tx_buffer[MAX_BUFFER_LEN];
-
     pjmedia_srtp_setting setting;
+    unsigned             media_option;
+
     /* SRTP policy */
     pj_bool_t            session_inited;
@@ -151 +148 @@
 static pj_status_t transport_media_create(pjmedia_transport *tp,
                                        pj_pool_t *pool,
+                                       unsigned options,
                                        pjmedia_sdp_session *sdp_local,
                                        const pjmedia_sdp_session *sdp_remote,
@@ -925 +923 @@
 static pj_status_t transport_media_create(pjmedia_transport *tp,
                                           pj_pool_t *pool,
+                                          unsigned options,
                                           pjmedia_sdp_session *sdp_local,
                                           const pjmedia_sdp_session *sdp_remote,
@@ -938 +937 @@
     pj_str_t attr_value;
     int i, j;
+    unsigned member_tp_option;
 
     PJ_ASSERT_RETURN(tp && pool && sdp_local, PJ_EINVAL);
+    
+    srtp->media_option = options;
+    member_tp_option = options | PJMEDIA_TPMED_NO_TRANSPORT_CHECKING;
 
     pj_bzero(&srtp->rx_policy, sizeof(srtp->tx_policy));
@@ -1131 +1134 @@
 BYPASS_SRTP:
     srtp->bypass_srtp = PJ_TRUE;
+    member_tp_option &= ~PJMEDIA_TPMED_NO_TRANSPORT_CHECKING;
 
 PROPAGATE_MEDIA_CREATE:
-    return pjmedia_transport_media_create(srtp->real_tp, pool, sdp_local, 
-                                           sdp_remote, media_index);
+    return pjmedia_transport_media_create(srtp->real_tp, pool, 
+                            member_tp_option,
+                            sdp_local, sdp_remote, media_index);
 }
 
@@ -1148 +1153 @@
     pjmedia_sdp_media *m_rem, *m_loc;
     pj_status_t status;
-    pjmedia_sdp_attr *attr;
     int i;
 
@@ -1172 +1176 @@
             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)) {