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

Timestamp:

Feb 10, 2006 2:04:05 PM (18 years ago)

Author:

bennylp

Message:

Added more logging, and fixed bug when ACK is responded!

File:

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

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

@@ -131 +131 @@
 
     if (inv->state == PJSIP_INV_STATE_DISCONNECTED)
-        pjsip_dlg_dec_session(inv->dlg);
+        pjsip_dlg_dec_session(inv->dlg, &mod_inv.mod);
 }
 
@@ -142 +142 @@
     pjsip_tx_data *tdata;
     pj_status_t status;
+
+    PJ_LOG(5,(inv->obj_name, "Received %s, sending ACK",
+              pjsip_rx_data_get_info(rdata)));
 
     status = pjsip_dlg_create_request(inv->dlg, &pjsip_ack_method, 
@@ -371 +374 @@
     inv->options = options;
 
+    /* Object name will use the same dialog pointer. */
+    pj_snprintf(inv->obj_name, PJ_MAX_OBJ_NAME, "inv%p", dlg);
+
     /* Create negotiator if local_sdp is specified. */
     if (local_sdp) {
@@ -385 +391 @@
 
     /* Increment dialog session */
-    pjsip_dlg_inc_session(dlg);
+    pjsip_dlg_inc_session(dlg, &mod_inv.mod);
 
     /* Done */
     *p_inv = inv;
+
+    PJ_LOG(5,(inv->obj_name, "UAC invite session created for dialog %s",
+              dlg->obj_name));
+
     return PJ_SUCCESS;
 }
@@ -760 +770 @@
     inv->options = options;
 
+    /* Object name will use the same dialog pointer. */
+    pj_snprintf(inv->obj_name, PJ_MAX_OBJ_NAME, "inv%p", dlg);
+
     /* Parse SDP in message body, if present. */
     if (msg->body) {
@@ -795 +808 @@
 
     /* Increment session in the dialog. */
-    pjsip_dlg_inc_session(dlg);
+    pjsip_dlg_inc_session(dlg, &mod_inv.mod);
 
     /* Save the invite transaction. */
@@ -808 +821 @@
     /* Done */
     *p_inv = inv;
+
+    PJ_LOG(5,(inv->obj_name, "UAS invite session created for dialog %s",
+              dlg->obj_name));
+
     return PJ_SUCCESS;
 }
@@ -912 +929 @@
 
     status = pjmedia_sdp_neg_negotiate(inv->pool, inv->neg, 0);
+
+    PJ_LOG(5,(inv->obj_name, "SDP negotiation done, status=%d", status));
 
     if (mod_inv.cb.on_media_update)
@@ -982 +1001 @@
         /* This is an offer. */
 
+        PJ_LOG(5,(inv->obj_name, "Got SDP offer in %s", 
+                  pjsip_rx_data_get_info(rdata)));
+
         if (inv->neg == NULL) {
             status=pjmedia_sdp_neg_create_w_remote_offer(inv->pool, NULL, 
@@ -1009 +1031 @@
          * Process and negotiate remote answer.
          */
+
+        PJ_LOG(5,(inv->obj_name, "Got SDP answer in %s", 
+                  pjsip_rx_data_get_info(rdata)));
 
         status = pjmedia_sdp_neg_set_remote_answer(inv->pool, inv->neg, sdp);
@@ -1260 +1285 @@
     /* Verify arguments. */
     PJ_ASSERT_RETURN(inv && tdata, PJ_EINVAL);
+
+    PJ_LOG(5,(inv->obj_name, "Sending %s", 
+              pjsip_tx_data_get_info(tdata)));
 
     if (tdata->msg->type == PJSIP_REQUEST_MSG) {
@@ -1582 +1610 @@
             break;
         }
+
+    } else if (inv->role == PJSIP_ROLE_UAC &&
+               tsx->role == PJSIP_ROLE_UAC &&
+               tsx->method.id == PJSIP_CANCEL_METHOD)
+    {
+        /*
+         * Handle case when outgoing CANCEL is answered with 481 (Call/
+         * Transaction Does Not Exist), 408, or when it's timed out. In these
+         * cases, disconnect session (i.e. dialog usage only).
+         */
+        if (tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST ||
+            tsx->status_code == PJSIP_SC_REQUEST_TIMEOUT ||
+            tsx->status_code == PJSIP_SC_TSX_TIMEOUT ||
+            PJSIP_SC_TSX_TRANSPORT_ERROR)
+        {
+            inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
+        }
     }
 }
@@ -1738 +1783 @@
         inv_respond_incoming_cancel(inv, tsx, e->body.tsx_state.src.rdata);
 
+    } else if (inv->role == PJSIP_ROLE_UAC &&
+               tsx->role == PJSIP_ROLE_UAC &&
+               tsx->method.id == PJSIP_CANCEL_METHOD)
+    {
+        /*
+         * Handle case when outgoing CANCEL is answered with 481 (Call/
+         * Transaction Does Not Exist), 408, or when it's timed out. In these
+         * cases, disconnect session (i.e. dialog usage only).
+         */
+        if (tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST ||
+            tsx->status_code == PJSIP_SC_REQUEST_TIMEOUT ||
+            tsx->status_code == PJSIP_SC_TSX_TIMEOUT ||
+            PJSIP_SC_TSX_TRANSPORT_ERROR)
+        {
+            inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
+        }
     }
 }