Changeset 2795 for pjproject/branches/1.0/pjsip/src/pjsip-ua/sip_inv.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)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (3 diffs)

pjproject/branches/1.0/pjsip/src/pjsip-ua/sip_inv.c

@@ -2247 +2247 @@
     }
 
+    /* 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);
@@ -2252 +2255 @@
         goto on_error;
 
+    /* Retrieve the "fixed" offer from negotiator */
+    pjmedia_sdp_neg_get_neg_local(inv->neg, &offer);
 
     /* Update Contact if required */
@@ -3618 +3623 @@
                     (*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) {
+                            const pjmedia_sdp_session *lsdp = NULL;
+                            pjmedia_sdp_neg_get_neg_local(inv->neg, &lsdp);
+                            sdp = (pjmedia_sdp_session*)lsdp;
+                        }
                     }
                 }