Changeset 2180

Timestamp:

Jul 28, 2008 8:17:04 PM (16 years ago)

Author:

bennylp

Message:

Ticket #538: Closed TCP connection should be removed from the hash table immediately

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_transport.c (modified) (1 diff)
• sip_transport_tcp.c (modified) (2 diffs)
• sip_transport_tls_ossl.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -937 +937 @@
         tp->is_shutdown = PJ_TRUE;
 
+    /* If transport reference count is zero, start timer count-down */
+    if (pj_atomic_get(tp->ref_cnt) == 0) {
+        pjsip_transport_add_ref(tp);
+        pjsip_transport_dec_ref(tp);
+    }
+
     pj_lock_release(tp->lock);
     pj_lock_release(mgr->lock);

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -1068 +1068 @@
     tdata_op_key->tdata = NULL;
 
-    /* Check for error/closure */
-    if (bytes_sent <= 0) {
-        pj_status_t status;
-
-        PJ_LOG(5,(tcp->base.obj_name, "TCP send() error, sent=%d", 
-                  bytes_sent));
-
-        status = (bytes_sent == 0) ? PJ_RETURN_OS_ERROR(OSERR_ENOTCONN) :
-                                     -bytes_sent;
-        if (tcp->close_reason==PJ_SUCCESS) tcp->close_reason = status;
-        pjsip_transport_shutdown(&tcp->base);
-    }
-
     if (tdata_op_key->callback) {
         /*
@@ -1093 +1080 @@
         pj_gettimeofday(&tcp->last_activity);
     }
+
+    /* Check for error/closure */
+    if (bytes_sent <= 0) {
+        pj_status_t status;
+
+        PJ_LOG(5,(tcp->base.obj_name, "TCP send() error, sent=%d", 
+                  bytes_sent));
+
+        status = (bytes_sent == 0) ? PJ_RETURN_OS_ERROR(OSERR_ENOTCONN) :
+                                     -bytes_sent;
+        if (tcp->close_reason==PJ_SUCCESS) tcp->close_reason = status;
+        pjsip_transport_shutdown(&tcp->base);
+    }
+
 }
 

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls_ossl.c

@@ -1840 +1840 @@
     tdata_op_key->tdata = NULL;
 
+    if (tdata_op_key->callback) {
+        /*
+         * Notify sip_transport.c that packet has been sent.
+         */
+        if (bytes_sent == 0)
+            bytes_sent = -PJ_RETURN_OS_ERROR(OSERR_ENOTCONN);
+
+        tdata_op_key->callback(&tls->base, tdata_op_key->token, bytes_sent);
+    }
+
     /* Check for error/closure */
     if (bytes_sent <= 0) {
@@ -1854 +1864 @@
         /* Mark last activity */
         pj_gettimeofday(&tls->last_activity);
-    }
-
-    if (tdata_op_key->callback) {
-        /*
-         * Notify sip_transport.c that packet has been sent.
-         */
-        if (bytes_sent == 0)
-            bytes_sent = -PJ_RETURN_OS_ERROR(OSERR_ENOTCONN);
-
-        tdata_op_key->callback(&tls->base, tdata_op_key->token, bytes_sent);
     }
 }