Changeset 3215 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Jun 21, 2010 1:28:55 PM (14 years ago)

Author:

bennylp

Message:

Fixes #1047 (Don't send UPDATE if remote doesn't support it (thanks Bogdan Krakowski for the report)) and fixes #1097 (Support sending UPDATE without SDP). Details:

• Session timer fixes:
  • will look at remote capability in Allow header
  • if UPDATE is supported, will send UPDATE without SDP first. If this fails, will send UPDATE with SDP
  • otherwise will send re-INVITE
• PJSUA-LIB will look at dialog's remote capability to determine whether re-INVITE or UPDATE should be sent to change default addresses after ICE negotiation.
• pjsip_inv_update() now allows NULL offer, in which case the UPDATE will be sent without SDP.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (4 diffs)

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

@@ -2394 +2394 @@
 
     /* Verify arguments. */
-    PJ_ASSERT_RETURN(inv && p_tdata && offer, PJ_EINVAL);
+    PJ_ASSERT_RETURN(inv && p_tdata, PJ_EINVAL);
 
     /* Dialog must have been established */
@@ -2407 +2407 @@
     pjsip_dlg_inc_lock(inv->dlg);
 
-    /* Process offer */
-    if (pjmedia_sdp_neg_get_state(inv->neg)!=PJMEDIA_SDP_NEG_STATE_DONE) {
-        PJ_LOG(4,(inv->dlg->obj_name, 
-                  "Invalid SDP offer/answer state for UPDATE"));
-        status = PJ_EINVALIDOP;
-        goto on_error;
-    }
-
-    /* Notify negotiator about the new offer. This will fix the offer
-     * with correct SDP origin.
-     */
-    status = pjmedia_sdp_neg_modify_local_offer(inv->pool_prov, inv->neg,
-                                                offer);
-    if (status != PJ_SUCCESS)
-        goto on_error;
-
-    /* Retrieve the "fixed" offer from negotiator */
-    pjmedia_sdp_neg_get_neg_local(inv->neg, &offer);
+    /* Process offer, if any */
+    if (offer) {
+        if (pjmedia_sdp_neg_get_state(inv->neg)!=PJMEDIA_SDP_NEG_STATE_DONE) {
+            PJ_LOG(4,(inv->dlg->obj_name,
+                      "Invalid SDP offer/answer state for UPDATE"));
+            status = PJ_EINVALIDOP;
+            goto on_error;
+        }
+
+        /* Notify negotiator about the new offer. This will fix the offer
+         * with correct SDP origin.
+         */
+        status = pjmedia_sdp_neg_modify_local_offer(inv->pool_prov, inv->neg,
+                                                    offer);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+
+        /* Retrieve the "fixed" offer from negotiator */
+        pjmedia_sdp_neg_get_neg_local(inv->neg, &offer);
+    }
 
     /* Update Contact if required */
@@ -2450 +2452 @@
 
     /* Attach SDP body */
-    sdp_copy = pjmedia_sdp_session_clone(tdata->pool, offer);
-    pjsip_create_sdp_body(tdata->pool, sdp_copy, &tdata->msg->body);
+    if (offer) {
+        sdp_copy = pjmedia_sdp_session_clone(tdata->pool, offer);
+        pjsip_create_sdp_body(tdata->pool, sdp_copy, &tdata->msg->body);
+    }
 
     /* Unlock dialog. */
@@ -2880 +2884 @@
     else 
     {
+        /* Session-Timer needs to see any error responses, to determine
+         * whether peer supports UPDATE with empty body.
+         */
+        if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&
+            tsx->role == PJSIP_ROLE_UAC)
+        {
+            status = handle_timer_response(inv, e->body.tsx_state.src.rdata,
+                                           PJ_FALSE);
+        }
+
         tsx_inv_data = (struct tsx_inv_data*)tsx->mod_data[mod_inv.mod.id];
         if (tsx_inv_data == NULL) {