Changeset 7992 for trunk/src/wsock32/wsock32.cpp

Timestamp:

Feb 23, 2002, 5:39:10 PM (24 years ago)

Author:

sandervl

Message:

Don't send FD_CONNECT for sockets that are returned by accept

File:

• trunk/src/wsock32/wsock32.cpp (modified) (14 diffs)

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.48 2002-02-20 16:08:03 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.49 2002-02-23 16:39:10 sandervl Exp $ */
 
 /*
@@ -65 +65 @@
 #include "dbglocal.h"
 
-//kso: dirty fix to make this compile! not permanent!
-BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER *p);
-#define LowPart u.LowPart
-
+//
+#define DUMP_PACKETS
 
 ODINDEBUGCHANNEL(WSOCK32-WSOCK32)
-
 
 /*****************************************************************************
@@ -209 +206 @@
             strcpy(msg, "WSAHOST_NOT_FOUND");
             break;
+        case WSAENOPROTOOPT:
+            strcpy(msg, "WSAENOPROTOOPT");
+            break;
+        case WSAEHOSTUNREACH:
+            strcpy(msg, "WSAEHOSTUNREACH");
+            break;
         default:
             strcpy(msg, "unknown");
@@ -326 +329 @@
         return SOCKET_ERROR;
    }
+   dprintf(("connect to %s", inet_ntoa(((sockaddr_in*)name)->sin_addr)));
+
    ret = connect(s, (sockaddr *)name, namelen);
    // map BSD error codes
@@ -550 +555 @@
         //with the same parameters for the new socket (see docs)
         if(QueryAsyncEvent(s, &mode, &notifyHandle, &notifyData, &lEvent) == TRUE) {
+                dprintf(("Setting async select for socket %x, mode %d, %x %x %x", ret, mode, notifyHandle, notifyData, lEvent));
                 if(WSAAsyncSelectWorker(ret, mode, notifyHandle, notifyData, lEvent) == SOCKET_ERROR) {
                         ret = SOCKET_ERROR;
@@ -584 +590 @@
         return SOCKET_ERROR;
    }
+   dprintf(("bind to %s", inet_ntoa(((sockaddr_in*)addr)->sin_addr)));
    ret = bind(s, (struct sockaddr *)addr, namelen);
 
@@ -682 +689 @@
         }
    }
-   else WSASetLastError(NO_ERROR);
+   else {
+#ifdef DUMP_PACKETS
+       dprintf(("Packet length %d", ret));
+       for(int i=0;i<(ret+7)/8;i++) {
+           dprintf(("%02x %02x %02x %02x %02x %02x %02x %02x %c %c %c %c %c %c %c %c", buf[i*8], buf[i*8+1], buf[i*8+2], buf[i*8+3], buf[i*8+4], buf[i*8+5], buf[i*8+6], buf[i*8+7], buf[i*8], buf[i*8+1], buf[i*8+2], buf[i*8+3], buf[i*8+4], buf[i*8+5], buf[i*8+6], buf[i*8+7]));
+       }
+#endif
+       WSASetLastError(NO_ERROR);
+   }
 
    //Reset FD_READ event flagfor  WSAAsyncSelect thread if one was created for this socket
@@ -714 +729 @@
         return SOCKET_ERROR;
    }
+   dprintf(("recvfrom to %s", inet_ntoa(((sockaddr_in*)from)->sin_addr)));
+
    ret = recvfrom(s, buf, len, flags, from, fromlen);
 
@@ -719 +736 @@
         WSASetLastError(wsaErrno());
    }
-   else WSASetLastError(NO_ERROR);
+   else {
+#ifdef DUMP_PACKETS
+       dprintf(("Packet length %d", ret));
+       for(int i=0;i<(ret+7)/8;i++) {
+           dprintf(("%02x %02x %02x %02x %02x %02x %02x %02x %c %c %c %c %c %c %c %c", buf[i*8], buf[i*8+1], buf[i*8+2], buf[i*8+3], buf[i*8+4], buf[i*8+5], buf[i*8+6], buf[i*8+7], buf[i*8], buf[i*8+1], buf[i*8+2], buf[i*8+3], buf[i*8+4], buf[i*8+5], buf[i*8+6], buf[i*8+7]));
+       }
+#endif
+       WSASetLastError(NO_ERROR);
+   }
 
    //Reset FD_READ event flagfor  WSAAsyncSelect thread if one was created for this socket
@@ -734 +759 @@
 {
    int ret;
+   int optlen;
+   int option;
 
    if(!fWSAInitialized) {
@@ -744 +771 @@
         return SOCKET_ERROR;
    }
+   // check if the socket is a raw socket and has the IP_HDRINCL switch
+   // if this is the case, we overwrite the IP header length field with
+   // the actual length because some apps tend to put garbage in there
+   // and rely on Windows to correct this
+   optlen = sizeof(option);
+   option = 0;
+   ret = getsockopt(s, IPPROTO_IP, IP_HDRINCL_OS2, (char *)&option, &optlen);
+   if(ret == 0 && option != FALSE) {
+       *(u_short *)&buf[2] = len;
+   }
+
+#ifdef DUMP_PACKETS
+   dprintf(("Packet length %d", len));
+   for(int i=0;i<(len+7)/8;i++) {
+           dprintf(("%02x %02x %02x %02x %02x %02x %02x %02x %c %c %c %c %c %c %c %c", buf[i*8], buf[i*8+1], buf[i*8+2], buf[i*8+3], buf[i*8+4], buf[i*8+5], buf[i*8+6], buf[i*8+7], buf[i*8], buf[i*8+1], buf[i*8+2], buf[i*8+3], buf[i*8+4], buf[i*8+5], buf[i*8+6], buf[i*8+7]));
+   }
+#endif
    ret = send(s, (char *)buf, len, flags);
 
@@ -785 +829 @@
    // check if the socket is a raw socket and has the IP_HDRINCL switch
    // if this is the case, we overwrite the IP header length field with
-   // the actual length because some apps tend to put in garbage in there
-   // and rely on Windows correcting this
+   // the actual length because some apps tend to put garbage in there
+   // and rely on Windows to correct this
    optlen = sizeof(option);
    option = 0;
@@ -794 +838 @@
    }
    dprintf(("sending to %s", inet_ntoa(((sockaddr_in*)to)->sin_addr)));
+#ifdef DUMP_PACKETS
+   dprintf(("Packet length %d", len));
+   for(int i=0;i<(len+7)/8;i++) {
+           dprintf(("%02x %02x %02x %02x %02x %02x %02x %02x %c %c %c %c %c %c %c %c", buf[i*8], buf[i*8+1], buf[i*8+2], buf[i*8+3], buf[i*8+4], buf[i*8+5], buf[i*8+6], buf[i*8+7], buf[i*8], buf[i*8+1], buf[i*8+2], buf[i*8+3], buf[i*8+4], buf[i*8+5], buf[i*8+6], buf[i*8+7]));
+   }
+#endif
    ret = sendto(s, (char *)buf, len, flags, (struct sockaddr *)to, tolen);
 
@@ -1052 +1102 @@
                         return SOCKET_ERROR;
                 }
+                dprintf(("IPPROTO_TCP, TCP_NODELAY 0x%x", *optval));
                 ret = setsockopt(s, level, optname, (char *)optval, optlen);
         }