Changeset 1810 for pjproject/trunk/pjmedia/src/pjmedia/transport_udp.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_udp.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -36 +36 @@
 #define MAX_PENDING 4
 
+static const pj_str_t ID_RTP_AVP  = { "RTP/AVP", 7 };
+
 /* Pending write buffer */
 typedef struct pending_write
@@ -50 +52 @@
     pj_pool_t          *pool;           /**< Memory pool                    */
     unsigned            options;        /**< Transport options.             */
+    unsigned            media_options;  /**< Transport media options.       */
     void               *user_data;      /**< Only valid when attached       */
     pj_bool_t           attached;       /**< Has attachment?                */
@@ -121 +124 @@
 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,
@@ -765 +769 @@
 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,
                                   unsigned media_index)
 {
-    PJ_UNUSED_ARG(tp);
-    PJ_UNUSED_ARG(pool);
-    PJ_UNUSED_ARG(sdp_local);
-    PJ_UNUSED_ARG(sdp_remote);
-    PJ_UNUSED_ARG(media_index);
+    struct transport_udp *udp = (struct transport_udp*)tp;
+
+    PJ_ASSERT_RETURN(tp && pool && sdp_local, PJ_EINVAL);
+    udp->media_options = options;
+
+    /* Validate media transport */
+    /* By now, this transport only support RTP/AVP transport */
+    if ((udp->media_options & 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;
+        }
+    }
 
     return PJ_SUCCESS;
@@ -784 +804 @@
                                   unsigned media_index)
 {
-    PJ_UNUSED_ARG(tp);
-    PJ_UNUSED_ARG(pool);
-    PJ_UNUSED_ARG(sdp_local);
-    PJ_UNUSED_ARG(sdp_remote);
-    PJ_UNUSED_ARG(media_index);
+    struct transport_udp *udp = (struct transport_udp*)tp;
+
+    PJ_ASSERT_RETURN(tp && pool && sdp_local, PJ_EINVAL);
+
+    /* Validate media transport */
+    /* By now, this transport only support RTP/AVP transport */
+    if ((udp->media_options & 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;
+        }
+    }
 
     return PJ_SUCCESS;