Changeset 2643 for pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

Timestamp:

Apr 23, 2009 11:50:25 AM (15 years ago)

Author:

bennylp

Message:

Fixed ticket #794: Bug with generating SDP version in origin line (thanks Joel Dodson for the report)

• the INVITE session now correctly uses the SDP offer "fixed" by the negotiator, hence it will have the correct origin fields.
• removed update_sdp_version() from PJSUA-LIB
• the negotiator now also fixes the session ID of subsequent answer so that it's identical to the previous SDP

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c (modified) (1 diff)

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

@@ -423 +423 @@
     neg->state = PJMEDIA_SDP_NEG_STATE_WAIT_NEGO;
     if (local) {
-        if (!neg->initial_sdp) {
+        neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
+        if (neg->initial_sdp) {
+            /* I don't think there is anything in RFC 3264 that mandates
+             * answerer to place the same origin (and increment version)
+             * in the answer, but probably it won't hurt either.
+             * Note that the version will be incremented in 
+             * pjmedia_sdp_neg_negotiate()
+             */
+            neg->neg_local_sdp->origin.id = neg->initial_sdp->origin.id;
+        } else {
             neg->initial_sdp = pjmedia_sdp_session_clone(pool, local);
         }
-        neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
     } else {
         PJ_ASSERT_RETURN(neg->initial_sdp, PJMEDIA_SDPNEG_ENOINITIAL);