Changeset 2797 for pjproject

Timestamp:

Jun 25, 2009 10:05:18 AM (15 years ago)

Author:

bennylp

Message:

Ticket #906: Transaction is not destroyed when transport timeout event comes later than transaction timeout (thanks Norma Steveley for the report)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (2 diffs)

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

@@ -1698 +1698 @@
         }
 
-        if (!*cont) {
+        /* Also stop processing if transaction has been flagged with
+         * pending destroy (http://trac.pjsip.org/repos/ticket/906)
+         */
+        if ((!*cont) || (tsx->transport_flag & TSX_HAS_PENDING_DESTROY)) {
             char errmsg[PJ_ERR_MSG_SIZE];
             pjsip_status_code sc;
@@ -1733 +1736 @@
             {
                 tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED, 
+                               PJSIP_EVENT_TRANSPORT_ERROR, send_state->tdata);
+            } 
+            /* Don't forget to destroy if we have pending destroy flag
+             * (http://trac.pjsip.org/repos/ticket/906)
+             */
+            else if (tsx->transport_flag & TSX_HAS_PENDING_DESTROY)
+            {
+                tsx_set_state( tsx, PJSIP_TSX_STATE_DESTROYED, 
                                PJSIP_EVENT_TRANSPORT_ERROR, send_state->tdata);
             }