Changeset 6201 for trunk/src

Timestamp:

Jul 7, 2001, 4:29:41 PM (24 years ago)

Author:

achimha

Message:

implemented WSAEventSelect

Location:

trunk/src

Files:

• ws2_32/socket.cpp (modified) (2 diffs)
• ws2_32/ws2_32.def (modified) (3 diffs)
• wsock32/asyncapi.cpp (modified) (2 diffs)
• wsock32/asyncthread.cpp (modified) (3 diffs)
• wsock32/asyncthread.h (modified) (2 diffs)
• wsock32/wsock2.cpp (modified) (2 diffs)
• wsock32/wsock32.def (modified) (2 diffs)
• wsock32/wsock32.h (modified) (3 diffs)

trunk/src/ws2_32/socket.cpp

@@ -1 @@
-/* $Id */
+/* $Id: socket.cpp,v 1.9 2001-07-07 14:29:22 achimha Exp $ */
 /*
  * based on Windows Sockets 1.1 specs
@@ -87 +87 @@
    return ( socket (af, type, protocol) );
 }
-
-/***********************************************************************
- *              WSAEnumNetworkEvents
- */
-int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lpEvent)
-{
-    dprintf(("WSAEnumNetworkEvents %x %x %x NOT IMPLEMENTED", s, hEvent, lpEvent));
-    SetLastError(WSAEINVAL);
-    return SOCKET_ERROR;
-}
-

trunk/src/ws2_32/ws2_32.def

@@ -1 @@
-; $Id: ws2_32.def,v 1.6 2001-07-07 10:43:42 achimha Exp $
+; $Id: ws2_32.def,v 1.7 2001-07-07 14:29:22 achimha Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -47 +47 @@
   socket                                           = WSOCK32.23
   WSAEventSelect                                   = WSOCK32.3001
+  WSAEnumNetworkEvents                             = WSOCK32.3002
          
 EXPORTS
@@ -86 +87 @@
 ; WSAEnumNameSpaceProvidersA                       @34
 ; WSAEnumNameSpaceProvidersW                       @35
-  WSAEnumNetworkEvents = _WSAEnumNetworkEvents@12  @36
+  WSAEnumNetworkEvents                             @36
 ; WSAEnumProtocolsA                                @37
 ; WSAEnumProtocolsW                                @38

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.10 2001-07-07 10:44:08 achimha Exp $ */
+/* $Id: asyncapi.cpp,v 1.11 2001-07-07 14:29:40 achimha Exp $ */
 
 /*
@@ -731 +731 @@
 //******************************************************************************
 //******************************************************************************
+int WSAEnumNetworkEventsWorker(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lpEvent)
+{
+   PASYNCTHREADPARM pThreadInfo;
+
+   asyncThreadMutex.enter();
+   pThreadInfo = FindAsyncEvent(s);
+   if (pThreadInfo)
+   {
+        // TODO return correct errors!!!
+        for (int i = 0; i < FD_MAX_EVENTS; i++)
+        {
+           lpEvent->iErrorCode[i] = 0;
+        }
+
+        lpEvent->lNetworkEvents = pThreadInfo->u.asyncselect.lEventsPending;
+
+        // TODO is this correct? API says they're cleared
+        pThreadInfo->u.asyncselect.lEventsPending = 0;
+   }
+   asyncThreadMutex.leave();
+   if (!pThreadInfo)
+   {
+      dprintf(("no async registration for socket %x", s));
+      // TODO: correct behavior?
+      WSASetLastError(WSAEINVAL);
+      return SOCKET_ERROR;
+   }
+
+   // post semaphore if present
+   if (hEvent)
+   {
+//      dprintf(("posting event semaphore 0x%x", hEvent));
+      SetEvent(hEvent);
+   }
+
+   WSASetLastError(NO_ERROR);
+   return NO_ERROR;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/wsock32/asyncthread.cpp

@@ -1 @@
-/* $Id: asyncthread.cpp,v 1.10 2001-07-07 10:44:09 achimha Exp $ */
+/* $Id: asyncthread.cpp,v 1.11 2001-07-07 14:29:40 achimha Exp $ */
 
 /*
@@ -24 +24 @@
 
 static PASYNCTHREADPARM threadList = NULL;
-static VMutex           asyncThreadMutex;
+VMutex asyncThreadMutex;
 
 static void AddToQueue(PASYNCTHREADPARM pThreadParm);
@@ -193 +193 @@
 //Assumes caller owns async thread mutex!
 //******************************************************************************
-static PASYNCTHREADPARM FindAsyncEvent(SOCKET s)
+PASYNCTHREADPARM FindAsyncEvent(SOCKET s)
 {
  PASYNCTHREADPARM pThreadInfo;

trunk/src/wsock32/asyncthread.h

@@ -1 @@
-/* $Id: asyncthread.h,v 1.6 2001-07-07 10:44:09 achimha Exp $ */
+/* $Id: asyncthread.h,v 1.7 2001-07-07 14:29:40 achimha Exp $ */
 
 /*
@@ -78 +78 @@
 } ASYNCTHREADPARM, *PASYNCTHREADPARM;
 
+extern VMutex asyncThreadMutex;
+PASYNCTHREADPARM FindAsyncEvent(SOCKET s);
+
 ULONG QueueAsyncJob(ASYNCTHREADPROC asyncproc, PASYNCTHREADPARM pThreadParm, BOOL fSetBlocking = FALSE);
 void  RemoveFromQueue(PASYNCTHREADPARM pThreadParm);

trunk/src/wsock32/wsock2.cpp

@@ -1 @@
-/* $Id: wsock2.cpp,v 1.1 2001-07-07 10:44:10 achimha Exp $ */
+/* $Id: wsock2.cpp,v 1.2 2001-07-07 14:29:40 achimha Exp $ */
 
 /*
@@ -24 +24 @@
 int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent)
 {
-    TRACE("WS2_32: WSAEventSelect socket %08x, hEvent %08x, event %08x", s, hEvent, (unsigned)lEvent);
+    TRACE("WS2_32: WSAEventSelect socket 0x%x, hEvent 0x%x, event 0x%x", s, hEvent, (unsigned)lEvent);
 
     // forward call to worker function in HEVENT notification mode
     return WSAAsyncSelectWorker(s, WSA_SELECT_HEVENT, (int)hEvent, 0, lEvent);
 }
+
+/***********************************************************************
+ *              WSAEnumNetworkEvents
+ */
+int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lpEvent)
+{
+// called too often in some apps, makes log file grow too fast
+//   dprintf(("WSAEnumNetworkEvents 0x%x 0x%x 0x%x NOT CORRECTLY IMPLEMENTED", s, hEvent, lpEvent));
+
+   if(!fWSAInitialized)
+   {
+        dprintf(("WSA sockets not initialized"));
+        WSASetLastError(WSANOTINITIALISED);
+        return SOCKET_ERROR;
+   }
+   else
+   if(WSAIsBlocking())
+   {
+        dprintf(("blocking call in progress"));
+        WSASetLastError(WSAEINPROGRESS);        // blocking call in progress
+        return SOCKET_ERROR;
+   }
+   else
+   if (!lpEvent)
+   {
+       dprintf(("network event buffer NULL"));
+       WSASetLastError(WSAEINVAL);
+       return SOCKET_ERROR;
+   }
+   // TODO: check if lpEvent is in user address space! (Win32 does)
+
+   // forward call to worker routine
+   return WSAEnumNetworkEventsWorker(s, hEvent, lpEvent);
+}

trunk/src/wsock32/wsock32.def

@@ -1 @@
-; $Id: wsock32.def,v 1.22 2001-07-07 10:44:11 achimha Exp $
+; $Id: wsock32.def,v 1.23 2001-07-07 14:29:41 achimha Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -115 +115 @@
 ; functions for ws2_32 implemented here
    WSAEventSelect              = _WSAEventSelect@12                       @3001
+   WSAEnumNetworkEvents        = _WSAEnumNetworkEvents@12                 @3002

trunk/src/wsock32/wsock32.h

@@ -1 @@
-/* $Id: wsock32.h,v 1.17 2001-07-07 10:44:11 achimha Exp $ */
+/* $Id: wsock32.h,v 1.18 2001-07-07 14:29:41 achimha Exp $ */
 
 /* WSOCK32.H--definitions & conversions for Odin's wsock32.dll.
@@ -52 +52 @@
 // WSAAsyncSelect flags
 // also apply to Winsock 2.0 WSAEventSelect
+#define FD_MAX_EVENTS               10
 #define FD_READ                     0x01
 #define FD_WRITE                    0x02
@@ -249 +250 @@
 int WSAAsyncSelectWorker(SOCKET s, int mode, int notifyHandle, int notifyData, long lEventMask);
 
+typedef struct _WSANETWORKEVENTS 
+{
+  long lNetworkEvents;
+  int iErrorCode[FD_MAX_EVENTS];
+} WSANETWORKEVENTS, *LPWSANETWORKEVENTS;
+int WSAEnumNetworkEventsWorker(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lpEvent);
+
 #endif  /* _WINSOCK32CONST_ */