Changeset 2795 for pjproject/branches/1.0/pjmedia/src/pjmedia/sdp_neg.c

Timestamp:

Jun 24, 2009 6:52:57 PM (15 years ago)

Author:

bennylp

Message:

Ticket #795: merged changes from ticket #794

Location:

pjproject/branches/1.0

Files:

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

pjproject/branches/1.0/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);