Changeset 18920 for trunk/FACT++/dim/src/tcpip.c

Timestamp:

10/18/17 13:54:41 (7 years ago)

Author:

tbretz

Message:

Updated to v20r20 - This also includes some minor fixes, I requested.

File:

• trunk/FACT++/dim/src/tcpip.c (modified) (10 diffs)

trunk/FACT++/dim/src/tcpip.c

@@ -16 +16 @@
 #ifdef WIN32
 #define FD_SETSIZE      16384
-#define poll(pfd,nfds,timeout)  WSAPoll(pfd,nfds,timeout)
+#endif
+
+#include <stdio.h>
+#include <time.h>
+#define DIMLIB
+#include <dim.h>
+
+#ifdef WIN32
+//#define poll(pfd,nfds,timeout)        WSAPoll(pfd,nfds,timeout)
 #define ioctl ioctlsocket
 
@@ -26 +34 @@
 #define EADDRNOTAVAIL WSAEADDRNOTAVAIL
 #define EWOULDBLOCK WSAEWOULDBLOCK
+#define EINPROGRESS WSAEINPROGRESS
 #define ECONNREFUSED WSAECONNREFUSED
+#define ETIMEDOUT WSAETIMEDOUT
 #define HOST_NOT_FOUND  WSAHOST_NOT_FOUND
 #define NO_DATA WSANO_DATA
@@ -80 +90 @@
 #define MY_FD_ISSET(fd, set)    FD_ISSET(fd, set)
 #endif
-
-#include <stdio.h>
-#include <time.h>
-#define DIMLIB
-#include <dim.h>
 
 #define ushort unsigned short
@@ -813 +818 @@
     fd_set      rfds;
     int conn_id, ret, selret, count;
+#ifndef __linux__
         struct timeval  timeout;
+#endif
 
         if(num){}
         do
         {
-                timeout.tv_sec = 0;             /* Don't wait, just poll */
-                timeout.tv_usec = 0;
                 list_to_fds( &rfds );
 #ifdef __linux__
                 selret = poll(Pollfds, Pollfd_size, 0);
 #else
+                timeout.tv_sec = 0;             /* Don't wait, just poll */
+                timeout.tv_usec = 0;
                 selret = select(FD_SETSIZE, &rfds, NULL, NULL, &timeout);
 #endif
@@ -890 +897 @@
 #endif
                 if(ret <= 0)
-                  {
-                    printf("poll returned %d, errno %d\n", ret, errno);
-                  }
+                {
+                    printf("poll/select returned %d, errno %d\n", ret, errno);
+                }
                 if(ret > 0)
                 {
@@ -1023 +1030 @@
         int host_addr;
 #endif
-        int path, val, ret_code, ret;
+        int path, val, ret_code, ret, retcon, selret;
         int a,b,c,d;
 /* Fix for gcc 4.6 "dereferencing type-punned pointer will break strict-aliasing rules"?!*/
@@ -1029 +1036 @@
         unsigned char *ipaddr = ipaddr_buff;
         int host_number = 0;
+        int tcpip_would_block();
+#ifdef __linux__
+        struct pollfd pollitem;
+#else
+        struct timeval  timeout;
+        fd_set rfds, wfds, efds;
+#endif
+        int so_error = ETIMEDOUT;
+        int so_error_len = sizeof(so_error);
 
     dim_tcpip_init(0);
@@ -1161 +1177 @@
 #endif
         sockname.sin_port = htons((ushort) port); /* port number to send to */
-        while((ret = connect(path, (struct sockaddr*)&sockname, sizeof(sockname))) == -1 )
-        {
-                if(errno != EINTR)
+        /*
+        while ((ret = connect(path, (struct sockaddr*)&sockname, sizeof(sockname))) == -1)
+        {
+                if (errno != EINTR)
                 {
                         closesock(path);
@@ -1169 +1186 @@
                 }
         }
-        strcpy( Net_conns[conn_id].node, node );
+        */
+        set_non_blocking(path);
+        retcon = connect(path, (struct sockaddr*)&sockname, sizeof(sockname));
+#ifndef WIN32
+        ret = errno;
+#else
+        ret = WSAGetLastError();
+#endif
+        set_blocking(path);
+        if (retcon == -1)
+        {
+                if (tcpip_would_block(ret))
+                {
+#ifdef __linux__
+                        pollitem.fd = path;
+                        pollitem.events = POLLIN | POLLOUT | POLLERR;
+                        pollitem.revents = 0;
+                        selret = poll(&pollitem, 1, CONNECT_TMOUT * 1000);
+#else
+                        timeout.tv_sec = CONNECT_TMOUT;
+                        timeout.tv_usec = 0;
+                        FD_ZERO(&wfds);
+                        FD_SET(path, &wfds);
+                        FD_ZERO(&rfds);
+                        FD_SET(path, &rfds);
+                        FD_ZERO(&efds);
+                        FD_SET(path, &efds);
+                        selret = select(FD_SETSIZE, &rfds, &wfds, &efds, &timeout);
+#endif
+                        if (selret > 0)
+                        {
+                                getsockopt(path, SOL_SOCKET, SO_ERROR, (void *)&so_error, &so_error_len);
+                        }
+                }
+                if (so_error != 0)
+                {
+#ifndef WIN32
+                        errno = so_error;
+#else
+                        WSASetLastError(so_error);
+#endif
+                        closesock(path);
+                        return(0);
+                }
+        }
+        strcpy(Net_conns[conn_id].node, node);
         strcpy( Net_conns[conn_id].task, task );
         Net_conns[conn_id].channel = path;
@@ -1547 +1609 @@
    if(code == EWOULDBLOCK)
                 return(1);
-    return(0);
+   else if (code == EINPROGRESS)
+           return(1);
+   return(0);
 }