Changes in pjproject/main/pjlib/src/pj/ioqueue_select.c [1:3]

File:

• pjproject/main/pjlib/src/pj/ioqueue_select.c (modified) (5 diffs, 1 prop)

pjproject/main/pjlib/src/pj/ioqueue_select.c

@@ -1 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/ioqueue_select.c 15    10/29/05 10:27p Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/ioqueue_select.c $
- * 
- * 15    10/29/05 10:27p Bennylp
- * Fixed misc warnings.
- * 
- * 14    10/29/05 11:31a Bennylp
- * Changed accept and lock.
- * 
- * 13    10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 12    9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 11    9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
- */
-
+/* $Id$
+ *
+ */
 /*
  * sock_select.c
@@ -499 +481 @@
 #               if defined(PJ_WIN32) && PJ_WIN32 != 0
                 rc = pj_sock_recv(h->fd, h->rd_buf, &bytes_read, 0);
-#               elif defined(PJ_LINUX) && PJ_LINUX != 0
+#               elif (defined(PJ_LINUX) && PJ_LINUX != 0) || \
+                     (defined(PJ_SUNOS) && PJ_SUNOS != 0)
                 bytes_read = read(h->fd, h->rd_buf, bytes_read);
                 rc = (bytes_read >= 0) ? PJ_SUCCESS : pj_get_os_error();
@@ -506 +489 @@
                 rc = (bytes_read >= 0) ? PJ_SUCCESS : -bytes_read;
 #               else
-#               error "Check this man!"
+#               error "Implement read() for this platform!"
 #               endif
             }
@@ -560 +543 @@
                   PJ_IOQUEUE_IS_CONNECT_OP(h->op));
 
-#if PJ_HAS_TCP
+#if defined(PJ_HAS_TCP) && PJ_HAS_TCP!=0
         if ((h->op & PJ_IOQUEUE_OP_CONNECT)) {
             /* Completion of connect() operation */
             pj_ssize_t bytes_transfered;
 
-#if defined(PJ_LINUX) || defined(PJ_LINUX_KERNEL)
+#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
+    (defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL!=0)
             /* from connect(2): 
                 * On Linux, use getsockopt to read the SO_ERROR option at
@@ -585 +569 @@
                 bytes_transfered = value;
             }
-#elif defined(PJ_WIN32)
+#elif defined(PJ_WIN32) && PJ_WIN32!=0
             bytes_transfered = 0; /* success */
 #else
-#  error "Got to check this one!"
+            /* Excellent information in D.J. Bernstein page:
+             * http://cr.yp.to/docs/connect.html
+             *
+             * Seems like the most portable way of detecting connect()
+             * failure is to call getpeername(). If socket is connected,
+             * getpeername() will return 0. If the socket is not connected,
+             * it will return ENOTCONN, and read(fd, &ch, 1) will produce
+             * the right errno through error slippage. This is a combination
+             * of suggestions from Douglas C. Schmidt and Ken Keys.
+             */
+            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;
 #endif