Changeset 4367 for pjproject/trunk

Timestamp:

Feb 21, 2013 8:49:19 PM (12 years ago)

Author:

nanang

Message:

Close #1625: Introduced new API pjmedia_sdp_validate2() for allowing SDP media without c= line when port is zero, currently it is only applied in validating remote SDP.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/sdp.h (modified) (1 diff)
• pjmedia/src/pjmedia/sdp.c (modified) (3 diffs)
• pjmedia/src/pjmedia/sdp_neg.c (modified) (1 diff)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/sdp.h

@@ -687 +687 @@
 
 /**
+ * Perform semantic validation for the specified SDP session descriptor.
+ * This function perform validation beyond just syntactic verification,
+ * such as to verify the value of network type and address type, check
+ * the connection line, and verify that \a rtpmap attribute is present
+ * when dynamic payload type is used.
+ *
+ * @param sdp       The SDP session descriptor to validate.
+ * @param strict    Flag whether the check should be strict, i.e: allow
+ *                  media without connection line when port is zero.
+ *
+ * @return          PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_sdp_validate2(const pjmedia_sdp_session *sdp,
+                                           pj_bool_t strict);
+
+
+/**
  * Clone SDP session descriptor.
  *

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -1424 +1424 @@
 PJ_DEF(pj_status_t) pjmedia_sdp_validate(const pjmedia_sdp_session *sdp)
 {
+    return pjmedia_sdp_validate2(sdp, PJ_TRUE);
+}
+
+
+/* Validate SDP session descriptor. */
+PJ_DEF(pj_status_t) pjmedia_sdp_validate2(const pjmedia_sdp_session *sdp,
+                                          pj_bool_t strict)
+{
     unsigned i;
     const pj_str_t STR_RTPMAP = { "rtpmap", 6 };
@@ -1472 +1480 @@
         if (m->conn == NULL) {
             if (sdp->conn == NULL)
-                return PJMEDIA_SDP_EMISSINGCONN;
+                if (strict || m->desc.port != 0)
+                    return PJMEDIA_SDP_EMISSINGCONN;
         }
 
@@ -1506 +1515 @@
 }
 
+
 PJ_DEF(pj_status_t) pjmedia_sdp_transport_cmp( const pj_str_t *t1,
                                                const pj_str_t *t2)

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -139 +139 @@
 
     /* Validate remote offer and initial answer */
-    status = pjmedia_sdp_validate(remote);
+    status = pjmedia_sdp_validate2(remote, PJ_FALSE);
     if (status != PJ_SUCCESS)
         return status;

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -830 +830 @@
                                    &sdp_info->sdp);
         if (status == PJ_SUCCESS)
-            status = pjmedia_sdp_validate(sdp_info->sdp);
+            status = pjmedia_sdp_validate2(sdp_info->sdp, PJ_FALSE);
 
         if (status != PJ_SUCCESS) {