Changeset 8370 for trunk/src

Timestamp:

May 6, 2002, 11:38:52 AM (23 years ago)

Author:

sandervl

Message:

added WSAAccept

Location:

trunk/src/ws2_32

Files:

• makefile (modified) (2 diffs)
• socket.cpp (modified) (2 diffs)
• ws2_32.def (modified) (2 diffs)

trunk/src/ws2_32/makefile

@@ -1 @@
-# $Id: makefile,v 1.6 2002-03-08 11:36:11 sandervl Exp $
+# $Id: makefile,v 1.7 2002-05-06 09:38:52 sandervl Exp $
 
 #
@@ -41 +41 @@
 $(ODIN32_LIB)/wsock32.lib \
 $(ODIN32_LIB)/$(ODINCRT).lib \
-so32dll.lib \
-tcp32dll.lib \
 OS2386.LIB \
 $(RTLLIB_O)

trunk/src/ws2_32/socket.cpp

@@ -1 @@
-/* $Id: socket.cpp,v 1.12 2002-03-08 11:36:11 sandervl Exp $ */
+/* $Id: socket.cpp,v 1.13 2002-05-06 09:38:52 sandervl Exp $ */
 /*
  * based on Windows Sockets 1.1 specs
@@ -105 +105 @@
    return ( socket (af, type, protocol) );
 }
+/***********************************************************************
+ *              WSAAccept                        (WS2_32.26)
+ */
+SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
+               LPCONDITIONPROC lpfnCondition, DWORD dwCallbackData)
+{
+
+       int ret = 0, size = 0;
+       WSABUF CallerId, CallerData, CalleeId, CalleeData;
+       /*        QOS SQOS, GQOS; */
+       GROUP g;
+       SOCKET cs;
+       SOCKADDR src_addr, dst_addr;
+
+       TRACE("Socket  %u, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n",
+               s, addr, addrlen, lpfnCondition, dwCallbackData);
+
+       
+       size = sizeof(src_addr);
+       cs = accept(s, &src_addr, &size);
+       
+       if (cs == SOCKET_ERROR) return SOCKET_ERROR;
+
+       CallerId.buf = (char *)&src_addr;
+       CallerId.len = sizeof(src_addr);  
+
+       CallerData.buf = NULL;
+       CallerData.len = (ULONG)NULL;   
+
+       getsockname(cs, &dst_addr, &size);
+
+       CalleeId.buf = (char *)&dst_addr;
+       CalleeId.len = sizeof(dst_addr);  
+       
+       ret = (*lpfnCondition)(&CallerId, &CallerData, NULL, NULL,
+                       &CalleeId, &CalleeData, &g, dwCallbackData); 
+
+       switch (ret)
+       {
+               case CF_ACCEPT:
+                       if (addr && addrlen)
+                               addr = (struct WS_sockaddr *)memcpy(addr, &src_addr, (*addrlen > size) ?  size : *addrlen );
+                       return cs;
+               case CF_DEFER:
+                       SetLastError(WSATRY_AGAIN);
+                       return SOCKET_ERROR;
+               case CF_REJECT:
+                       closesocket(cs);
+                       SetLastError(WSAECONNREFUSED);
+                       return SOCKET_ERROR;
+               default:
+                       FIXME("Unknown return type from Condition function\n");
+                       SetLastError(WSAENOTSOCK);
+                       return SOCKET_ERROR;
+               }
+
+       SetLastError(WSAENOTSOCK);
+       return SOCKET_ERROR;
+}
 //******************************************************************************
 //******************************************************************************

trunk/src/ws2_32/ws2_32.def

@@ -1 @@
-; $Id: ws2_32.def,v 1.11 2001-10-17 10:22:37 sandervl Exp $
+; $Id: ws2_32.def,v 1.12 2002-05-06 09:38:52 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -74 +74 @@
 ; WSApSetPostRoutine                               @24
 ; WPUCompleteOverlappedRequest                     @25
-; WSAAccept                                        @26
+  WSAAccept = _WSAAccept@20                        @26
 ; WSAAddressToStringA                              @27
 ; WSAAddressToStringW                              @28