Changeset 2180 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

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

File:

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

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);
+    }
+
 }