Changeset 2781

Timestamp:

Jun 22, 2009 2:06:40 PM (15 years ago)

Author:

nanang

Message:

Ticket #758:

• fixed transport TCP to call on_connect_complete when connect() returns PJ_SUCCESS.
• added option to enable transport TCP in symbian_ua.

Location:

pjproject/trunk

Files:

• pjsip-apps/src/symbian_ua/ua.cpp (modified) (2 diffs)
• pjsip/src/pjsip/sip_transport_tcp.c (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/symbian_ua/ua.cpp

@@ -52 +52 @@
 //#define SIP_PROXY     "<sip:192.168.0.8;lr>"
 
+//
+// Set to 1 if TCP is desired (experimental)
+//
+#define ENABLE_SIP_TCP  0
 
 //
@@ -379 +383 @@
     status = pjsua_transport_create(PJSIP_TRANSPORT_UDP, &tcfg, &tid);
     if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Error creating transport", status);
+            pjsua_perror(THIS_FILE, "Error creating UDP transport", status);
             pjsua_destroy();
             return status;
     }
 
+    /* Add TCP transport */
+#if ENABLE_SIP_TCP
+    pjsua_transport_config_default(&tcfg);
+    tcfg.port = SIP_PORT;
+    status = pjsua_transport_create(PJSIP_TRANSPORT_TCP, &tcfg, &tid);
+    if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error creating TCP transport", status);
+            pjsua_destroy();
+            return status;
+    }
+#endif
+    
     /* Add account for the transport */
     pjsua_acc_add_local(tid, PJ_TRUE, &g_acc_id);

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

@@ -806 +806 @@
                                          sizeof(pj_sockaddr_in));
     if (status == PJ_SUCCESS) {
-        tcp->has_pending_connect = PJ_FALSE;
+        on_connect_complete(tcp->asock, PJ_SUCCESS);
     } else if (status != PJ_EPENDING) {
         tcp_destroy(&tcp->base, status);
@@ -812 +812 @@
     }
 
-    /* Update (again) local address, just in case local address currently
-     * set is different now that asynchronous connect() is started.
-     */
-    addr_len = sizeof(pj_sockaddr_in);
-    if (pj_sock_getsockname(sock, &local_addr, &addr_len)==PJ_SUCCESS) {
-        pj_sockaddr_in *tp_addr = (pj_sockaddr_in*)&tcp->base.local_addr;
-
-        /* Some systems (like old Win32 perhaps) may not set local address
-         * properly before socket is fully connected.
+    if (tcp->has_pending_connect) {
+        /* Update (again) local address, just in case local address currently
+         * set is different now that asynchronous connect() is started.
          */
-        if (tp_addr->sin_addr.s_addr != local_addr.sin_addr.s_addr &&
-            local_addr.sin_addr.s_addr != 0) 
-        {
-            tp_addr->sin_addr.s_addr = local_addr.sin_addr.s_addr;
-            tp_addr->sin_port = local_addr.sin_port;
-            sockaddr_to_host_port(tcp->base.pool, &tcp->base.local_name,
-                                  &local_addr);
+        addr_len = sizeof(pj_sockaddr_in);
+        if (pj_sock_getsockname(sock, &local_addr, &addr_len)==PJ_SUCCESS) {
+            pj_sockaddr_in *tp_addr = (pj_sockaddr_in*)&tcp->base.local_addr;
+
+            /* Some systems (like old Win32 perhaps) may not set local address
+             * properly before socket is fully connected.
+             */
+            if (tp_addr->sin_addr.s_addr != local_addr.sin_addr.s_addr &&
+                local_addr.sin_addr.s_addr != 0) 
+            {
+                tp_addr->sin_addr.s_addr = local_addr.sin_addr.s_addr;
+                tp_addr->sin_port = local_addr.sin_port;
+                sockaddr_to_host_port(tcp->base.pool, &tcp->base.local_name,
+                                      &local_addr);
+            }
         }
-    }
-
-    if (tcp->has_pending_connect) {
+        
         PJ_LOG(4,(tcp->base.obj_name, 
                   "TCP transport %.*s:%d is connecting to %.*s:%d...",