Changeset 2643 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.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/pjsip/src/pjsip-ua/sip_inv.c (modified) (3 diffs)

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

@@ -2249 +2249 @@
     }
 
+    /* Notify negotiator about the new offer. This will fix the offer
+     * with correct SDP origin.
+     */
     status = pjmedia_sdp_neg_modify_local_offer(inv->pool,inv->neg,
                                                 offer);
@@ -2254 +2257 @@
         goto on_error;
 
+    /* Retrieve the "fixed" offer from negotiator */
+    pjmedia_sdp_neg_get_neg_local(inv->neg, &offer);
 
     /* Update Contact if required */
@@ -3620 +3625 @@
                     (*mod_inv.cb.on_create_offer)(inv, &sdp);
                     if (sdp) {
+                        /* Notify negotiator about the new offer. This will
+                         * fix the offer with correct SDP origin.
+                         */
                         status = pjmedia_sdp_neg_modify_local_offer(dlg->pool,
                                                                     inv->neg,
                                                                     sdp);
+
+                        /* Retrieve the "fixed" offer from negotiator */
+                        if (status==PJ_SUCCESS)
+                            pjmedia_sdp_neg_get_neg_local(inv->neg, &sdp);
                     }
                 }