Changeset 3071 for pjproject

Timestamp:

Jan 25, 2010 1:42:56 PM (15 years ago)

Author:

bennylp

Message:

Initial commit for #1033: Assertion error when shutting down PJSIP while TCP/TLS connect is in progress and a transaction is waiting

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transaction.h (modified) (2 diffs)
• include/pjsip/sip_transport.h (modified) (1 diff)
• src/pjsip/sip_transaction.c (modified) (6 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transaction.h

@@ -98 +98 @@
     pj_uint32_t                 hashed_key;     /**< Key's hashed value.    */
     pj_str_t                    branch;         /**< The branch Id.         */
-    pjsip_tpselector            tp_sel;         /**< Transport selector.    */
 
     /*
@@ -122 +121 @@
     unsigned                    transport_flag; /**< Miscelaneous flag.     */
     pj_status_t                 transport_err;  /**< Internal error code.   */
+    pjsip_tpselector            tp_sel;         /**< Transport selector.    */
+    pjsip_tx_data              *pending_tx;     /**< Tdata which caused
+                                                     pending transport flag
+                                                     to be set on tsx.      */
 
     /*

pjproject/trunk/pjsip/include/pjsip/sip_transport.h

@@ -570 +570 @@
     pjsip_tpselector        tp_sel;
 
+    /**
+     * Arbitrary data attached by PJSIP modules.
+     */
+    void                    *mod_data[PJSIP_MAX_MODULE];
 };
 

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -582 +582 @@
 static void mod_tsx_layer_unregister_tsx( pjsip_transaction *tsx)
 {
+    if (mod_tsx_layer.mod.id == -1) {
+        /* The transaction layer has been unregistered. This could happen
+         * if the transaction was pending on transport and the application
+         * is shutdown. See http://trac.pjsip.org/repos/ticket/1033. In
+         * this case just do nothing.
+         */
+        return;
+    }
+
     pj_assert(tsx->transaction_key.slen != 0);
     //pj_assert(tsx->state != PJSIP_TSX_STATE_NULL);
@@ -1116 +1125 @@
         pj_time_val timeout = {0, 0};
 
-        /* Reschedule timeout timer to destroy this transaction. */
+        /* If we're still waiting for a message to be sent.. */
         if (tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT) {
-            tsx->transport_flag |= TSX_HAS_PENDING_DESTROY;
-        } else {
-            /* Cancel timeout timer. */
-            if (tsx->timeout_timer.id != 0) {
-                pjsip_endpt_cancel_timer(tsx->endpt, &tsx->timeout_timer);
-                tsx->timeout_timer.id = 0;
-            }
-
-            tsx->timeout_timer.id = TIMER_ACTIVE;
-            pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, 
-                                        &timeout);
-        }
+            /* Disassociate ourselves from the outstanding transmit data
+             * so that when the send callback is called we will be able
+             * to ignore that (otherwise we'll get assertion, see
+             * http://trac.pjsip.org/repos/ticket/1033)
+             */
+            tsx->pending_tx->mod_data[mod_tsx_layer.mod.id] = NULL;
+            tsx->pending_tx = NULL;
+            tsx->transport_flag &= ~(TSX_HAS_PENDING_TRANSPORT);
+        }
+
+        /* Cancel timeout timer. */
+        if (tsx->timeout_timer.id != 0) {
+            pjsip_endpt_cancel_timer(tsx->endpt, &tsx->timeout_timer);
+            tsx->timeout_timer.id = 0;
+        }
+
+        tsx->timeout_timer.id = TIMER_ACTIVE;
+        pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer,
+                                    &timeout);
 
 
@@ -1637 +1653 @@
     pjsip_tx_data *tdata = send_state->tdata;
     struct tsx_lock_data lck;
+
+    /* Check if transaction has cancelled itself from this transmit
+     * notification (https://trac.pjsip.org/repos/ticket/1033).
+     */
+    if (tdata->mod_data[mod_tsx_layer.mod.id] == NULL) {
+        return;
+    }
+
+    /* Reset */
+    tdata->mod_data[mod_tsx_layer.mod.id] = NULL;
+    tsx->pending_tx = NULL;
 
     lock_tsx(tsx, &lck);
@@ -1907 +1934 @@
     pjsip_tx_data_add_ref(tdata);
 
+    /* Also attach ourselves to the transmit data so that we'll be able
+     * to unregister ourselves from the send notification of this
+     * transmit data.
+     */
+    tdata->mod_data[mod_tsx_layer.mod.id] = tsx;
+    tsx->pending_tx = tdata;
+
     /* Begin resolving destination etc to send the message. */
     if (tdata->msg->type == PJSIP_REQUEST_MSG) {
@@ -1915 +1949 @@
         if (status == PJ_EPENDING)
             status = PJ_SUCCESS;
-        if (status != PJ_SUCCESS)
+        if (status != PJ_SUCCESS) {
             pjsip_tx_data_dec_ref(tdata);
+            tdata->mod_data[mod_tsx_layer.mod.id] = NULL;
+            tsx->pending_tx = NULL;
+        }
         
         /* Check if transaction is terminated. */
@@ -1930 +1967 @@
         if (status == PJ_EPENDING)
             status = PJ_SUCCESS;
-        if (status != PJ_SUCCESS)
+        if (status != PJ_SUCCESS) {
             pjsip_tx_data_dec_ref(tdata);
+            tdata->mod_data[mod_tsx_layer.mod.id] = NULL;
+            tsx->pending_tx = NULL;
+        }
 
         /* Check if transaction is terminated. */