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

Timestamp:

Jul 18, 2006 12:10:53 AM (18 years ago)

Author:

bennylp

Message:

Fixed several bugs related to TCP:

File:

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

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

@@ -1241 +1241 @@
     tcp = pj_ioqueue_get_user_data(key);
 
+    /* Mark that pending connect() operation has completed. */
+    tcp->has_pending_connect = PJ_FALSE;
+
+    /* Check connect() status */
+    if (status != PJ_SUCCESS) {
+
+        tcp_perror(tcp->base.obj_name, "TCP connect() error", status);
+
+        /* Cancel all delayed transmits */
+        while (!pj_list_empty(&tcp->delayed_list)) {
+            struct delayed_tdata *pending_tx;
+            pj_ioqueue_op_key_t *op_key;
+
+            pending_tx = tcp->delayed_list.next;
+            pj_list_erase(pending_tx);
+
+            op_key = (pj_ioqueue_op_key_t*)pending_tx->tdata_op_key;
+
+            on_write_complete(tcp->key, op_key, -status);
+        }
+
+        /* We can not destroy the transport since high level objects may
+         * still keep reference to this transport. So we can only 
+         * instruct transport manager to gracefully start the shutdown
+         * procedure for this transport.
+         */
+        if (tcp->close_reason==PJ_SUCCESS) tcp->close_reason = status;
+        pjsip_transport_shutdown(&tcp->base);
+        return;
+    }
+
     PJ_LOG(4,(tcp->base.obj_name, 
               "TCP transport %.*s:%d is connected to %.*s:%d",
@@ -1250 +1281 @@
               tcp->base.remote_name.port));
 
-    /* Mark that pending connect() operation has completed. */
-    tcp->has_pending_connect = PJ_FALSE;
-
-    /* Check connect() status */
-    if (status != PJ_SUCCESS) {
-
-        tcp_perror(tcp->base.obj_name, "TCP connect() error", status);
-
-        /* We can not destroy the transport since high level objects may
-         * still keep reference to this transport. So we can only 
-         * instruct transport manager to gracefully start the shutdown
-         * procedure for this transport.
-         */
-        if (tcp->close_reason==PJ_SUCCESS) tcp->close_reason = status;
-        pjsip_transport_shutdown(&tcp->base);
-        return;
-    }
 
     /* Update (again) local address, just in case local address currently