Changeset 1810 for pjproject/trunk/pjmedia/src/pjmedia/transport_ice.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_ice.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -25 +25 @@
 #define THIS_FILE   "transport_ice.c"
 
+static const pj_str_t ID_RTP_AVP  = { "RTP/AVP", 7 };
+
 struct transport_ice
 {
@@ -30 +32 @@
     pj_ice_strans       *ice_st;
     pjmedia_ice_cb       cb;
+    unsigned             media_option;
 
     pj_time_val          start_ice;
@@ -75 +78 @@
 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,
@@ -259 +263 @@
 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,
@@ -270 +275 @@
     unsigned i, cand_cnt;
     pj_status_t status;
+
+    tp_ice->media_option = options;
+
+    /* Validate media transport */
+    /* By now, this transport only support RTP/AVP transport */
+    if ((tp_ice->media_option & PJMEDIA_TPMED_NO_TRANSPORT_CHECKING) == 0) {
+        pjmedia_sdp_media *m_rem, *m_loc;
+
+        m_rem = sdp_remote? sdp_remote->media[media_index] : NULL;
+        m_loc = sdp_local->media[media_index];
+
+        if (pj_stricmp(&m_loc->desc.transport, &ID_RTP_AVP) ||
+           (m_rem && pj_stricmp(&m_rem->desc.transport, &ID_RTP_AVP)))
+        {
+            pjmedia_sdp_media_deactivate(pool, m_loc);
+            return PJMEDIA_SDP_EINPROTO;
+        }
+    }
 
     /* Init ICE */
@@ -500 +523 @@
     pj_status_t status;
 
-    PJ_UNUSED_ARG(sdp_local);
-
     PJ_ASSERT_RETURN(tp && pool && sdp_remote, PJ_EINVAL);
     PJ_ASSERT_RETURN(media_index < sdp_remote->media_count, PJ_EINVAL);
 
     sdp_med = sdp_remote->media[media_index];
+
+    /* Validate media transport */
+    /* By now, this transport only support RTP/AVP transport */
+    if ((tp_ice->media_option & PJMEDIA_TPMED_NO_TRANSPORT_CHECKING) == 0) {
+        pjmedia_sdp_media *m_rem, *m_loc;
+
+        m_rem = sdp_remote->media[media_index];
+        m_loc = sdp_local->media[media_index];
+
+        if (pj_stricmp(&m_loc->desc.transport, &ID_RTP_AVP) ||
+           (pj_stricmp(&m_rem->desc.transport, &ID_RTP_AVP)))
+        {
+            pjmedia_sdp_media_deactivate(pool, m_loc);
+            return PJMEDIA_SDP_EINPROTO;
+        }
+    }
 
     /* Get the SDP connection for the media stream.