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

Timestamp:

Jun 20, 2007 10:03:46 AM (17 years ago)

Author:

bennylp

Message:

More on ticket #399: a)send full offer on 200/OK response when re-INVITE does not have SDP, b) added on_create_offer() callback, c) handle some error cases

File:

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

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

@@ -1226 +1226 @@
      */
 
-    if (tsx_inv_data->sdp_done)
+    if (tsx_inv_data->sdp_done) {
+        if (rdata->msg_info.msg->body) {
+            PJ_LOG(4,(inv->obj_name, "SDP negotiation done, message "
+                      "body is ignored"));
+        }
         return PJ_SUCCESS;
+    }
 
     /* Check if SDP is present in the message. */
@@ -1384 +1389 @@
                    pjmedia_sdp_neg_has_local_answer(inv->neg) )
         {
+            struct tsx_inv_data *tsx_inv_data;
+
+            /* Get invite session's transaction data */
+            tsx_inv_data = (struct tsx_inv_data*) 
+                           inv->invite_tsx->mod_data[mod_inv.mod.id];
 
             status = inv_negotiate_sdp(inv);
@@ -1389 +1399 @@
                 return status;
             
+            /* Mark this transaction has having SDP offer/answer done. */
+            tsx_inv_data->sdp_done = 1;
+
             status = pjmedia_sdp_neg_get_active_local(inv->neg, &sdp);
         }
@@ -2504 +2517 @@
                 status = process_answer(inv, 200, tdata, NULL);
             } else {
-                const pjmedia_sdp_session *active_sdp;
-                status = pjmedia_sdp_neg_send_local_offer(dlg->pool, 
-                                                          inv->neg, 
-                                                          &active_sdp);
-                if (status == PJ_SUCCESS) {
-                    tdata->msg->body = create_sdp_body(tdata->pool, active_sdp);
+                /* INVITE does not have SDP. 
+                 * If on_create_offer() callback is implemented, ask app.
+                 * to generate an offer, otherwise just send active local
+                 * SDP to signal that nothing gets modified.
+                 */
+                pjmedia_sdp_session *sdp = NULL;
+
+                if (mod_inv.cb.on_create_offer)  {
+                    (*mod_inv.cb.on_create_offer)(inv, &sdp);
+                    if (sdp) {
+                        status = pjmedia_sdp_neg_modify_local_offer(dlg->pool,
+                                                                    inv->neg,
+                                                                    sdp);
+                    }
+                } 
+                
+                if (sdp == NULL) {
+                    const pjmedia_sdp_session *active_sdp = NULL;
+                    status = pjmedia_sdp_neg_send_local_offer(dlg->pool, 
+                                                              inv->neg, 
+                                                              &active_sdp);
+                    if (status == PJ_SUCCESS)
+                        sdp = (pjmedia_sdp_session*) active_sdp;
+                }
+
+                if (sdp) {
+                    tdata->msg->body = create_sdp_body(tdata->pool, sdp);
                 }
             }
@@ -2605 +2639 @@
             inv_set_cause(inv, tsx->status_code, &tsx->status_text);
             inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
+
+        } else if (tsx->status_code >= 300 && tsx->status_code < 700) {
+
+            pjmedia_sdp_neg_state neg_state;
+
+            /* Outgoing INVITE transaction has failed, cancel SDP nego */
+            neg_state = pjmedia_sdp_neg_get_state(inv->neg);
+            if (neg_state == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER) {
+                pjmedia_sdp_neg_cancel_offer(inv->neg);
+            }
         }
     }