Changeset 610 for pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

Timestamp:

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

Author:

bennylp

Message:

Fixed several bugs related to TCP:

File:

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

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

@@ -210 +210 @@
           int value;
           socklen_t vallen = sizeof(value);
-          int gs_rc = getsockopt(h->fd, SOL_SOCKET, SO_ERROR, 
-                               &value, &vallen);
+          int gs_rc = pj_sock_getsockopt(h->fd, SOL_SOCKET, SO_ERROR, 
+                                         &value, &vallen);
           if (gs_rc != 0) {
             /* Argh!! What to do now??? 
@@ -525 +525 @@
 
     /* Call callback. */
-    if (h->cb.on_connect_complete && !IS_CLOSING(h))
-        (*h->cb.on_connect_complete)(h, -1);
+    if (h->cb.on_connect_complete && !IS_CLOSING(h)) {
+        pj_status_t status = -1;
+#if (defined(PJ_HAS_SO_ERROR) && PJ_HAS_SO_ERROR!=0)
+        int value;
+        socklen_t vallen = sizeof(value);
+        int gs_rc = pj_sock_getsockopt(h->fd, SOL_SOCKET, SO_ERROR, 
+                                       &value, &vallen);
+        if (gs_rc == 0) {
+            status = PJ_RETURN_OS_ERROR(value);
+        }
+#endif
+
+        (*h->cb.on_connect_complete)(h, status);
+    }
 }