Changeset 3088 for pjproject

Timestamp:

Feb 5, 2010 11:11:52 AM (15 years ago)

Author:

bennylp

Message:

Misc (#1026): PJLIB does not return the correct error code when TCP connection fails on Linux

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

@@ -200 +200 @@
     if (h->connecting) {
         /* Completion of connect() operation */
-        pj_ssize_t bytes_transfered;
+        pj_status_t status;
         pj_bool_t has_lock;
 
@@ -227 +227 @@
              * the socket to send/receive.
              */
-            bytes_transfered = 0;
+              status = PJ_SUCCESS;
           } else {
-            bytes_transfered = value;
+              status = PJ_STATUS_FROM_OS(value);
           }
         }
 #elif defined(PJ_WIN32) && PJ_WIN32!=0
-        bytes_transfered = 0; /* success */
+        status = PJ_SUCCESS; /* success */
 #else
         /* Excellent information in D.J. Bernstein page:
@@ -246 +246 @@
          */
         {
-            int gp_rc;
             struct sockaddr_in addr;
-            socklen_t addrlen = sizeof(addr);
-
-            gp_rc = getpeername(h->fd, (struct sockaddr*)&addr, &addrlen);
-            bytes_transfered = (gp_rc < 0) ? gp_rc : -gp_rc;
+            int addrlen = sizeof(addr);
+
+            status = pj_sock_getpeername(h->fd, (struct sockaddr*)&addr,
+                                         &addrlen);
         }
 #endif
@@ -270 +269 @@
         /* Call callback. */
         if (h->cb.on_connect_complete && !IS_CLOSING(h))
-            (*h->cb.on_connect_complete)(h, bytes_transfered);
+            (*h->cb.on_connect_complete)(h, status);
 
         /* Unlock if we still hold the lock */