Changeset 5619

Timestamp:

Jul 5, 2017 3:57:53 AM (7 years ago)

Author:

riza

Message:

Fix #2026: Add option to for the SDP version to not increment when there's no
change from previous answer/offer.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/config.h (modified) (1 diff)
• src/pjmedia/sdp_neg.c (modified) (3 diffs)
• src/test/sdp_neg_test.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -744 +744 @@
 
 /**
+ * This specifies if the SDP negotiator should compare its content before 
+ * incrementing the origin version on the subsequent offer/answer. 
+ * If this is set to 1, origin version will only by incremented if the 
+ * new offer/answer is different than the previous one. For backward 
+ * compatibility and performance this is set to 0.
+ *
+ * Default is 0 (No)
+ */
+#ifndef PJMEDIA_SDP_NEG_COMPARE_BEFORE_INC_VERSION
+#   define PJMEDIA_SDP_NEG_COMPARE_BEFORE_INC_VERSION   0
+#endif
+
+
+/**
  * Support for sending and decoding RTCP port in SDP (RFC 3605).
  * Default is equal to PJMEDIA_ADVERTISE_RTCP setting.

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

@@ -335 +335 @@
     pj_strdup(pool, &new_offer->origin.user, &old_offer->origin.user);
     new_offer->origin.id = old_offer->origin.id;
-    new_offer->origin.version = old_offer->origin.version + 1;
+
     pj_strdup(pool, &new_offer->origin.net_type, &old_offer->origin.net_type);
     pj_strdup(pool, &new_offer->origin.addr_type,&old_offer->origin.addr_type);
@@ -400 +400 @@
 
     /* New_offer fixed */
+#if PJMEDIA_SDP_NEG_COMPARE_BEFORE_INC_VERSION
+    new_offer->origin.version = old_offer->origin.version;
+
+    if (pjmedia_sdp_session_cmp(new_offer, neg->initial_sdp, 0) != PJ_SUCCESS)
+    {
+        ++new_offer->origin.version;
+    }    
+#else
+    new_offer->origin.version = old_offer->origin.version + 1;
+#endif
+    
     neg->initial_sdp_tmp = neg->initial_sdp;
     neg->initial_sdp = new_offer;
@@ -1475 +1486 @@
                 active_ver = neg->initial_sdp->origin.version;
 
+#if PJMEDIA_SDP_NEG_COMPARE_BEFORE_INC_VERSION
+            answer->origin.version = active_ver;
+
+            if ((neg->active_local_sdp == NULL) || 
+                (pjmedia_sdp_session_cmp(answer, neg->active_local_sdp, 0) 
+                                                                != PJ_SUCCESS))
+            {
+                ++answer->origin.version;
+            }
+#else
+            answer->origin.version = active_ver + 1;
+#endif      
             /* Only update active SDPs when negotiation is successfull */
             neg->active_local_sdp = answer;
             neg->active_remote_sdp = neg->neg_remote_sdp;
-
-            /* Increment SDP version */
-            neg->active_local_sdp->origin.version = ++active_ver;
         }
     }

pjproject/trunk/pjmedia/src/test/sdp_neg_test.c

@@ -662 +662 @@
             /* This is how Bob's answer should look like: */
             "v=0\r\n"
+#if PJMEDIA_SDP_NEG_COMPARE_BEFORE_INC_VERSION
+            "o=bob 2808844564 2808844564 IN IP4 host.biloxi.example.com\r\n"
+#else
             "o=bob 2808844564 2808844565 IN IP4 host.biloxi.example.com\r\n"
+#endif
             "s=bob\r\n"
             "c=IN IP4 host.biloxi.example.com\r\n"