Changeset 21322 for trunk/src

Timestamp:

Jul 3, 2009, 11:07:32 PM (16 years ago)

Author:

ydario

Message:

ws2_32 implemented WSAAddressToString.

Location:

trunk/src/ws2_32

Files:

• socket.cpp (modified) (1 diff)
• ws2_32.def (modified) (1 diff)

trunk/src/ws2_32/socket.cpp

@@ -281 +281 @@
                         NULL, NULL, lpOverlapped, lpCompletionRoutine);
 }
+
+/***********************************************************************
+ *              WSAAddressToStringA                      (WS2_32.27)
+ *
+ *  See WSAAddressToStringW
+ */
+INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len,
+                                LPWSAPROTOCOL_INFOA info, LPSTR string,
+                                LPDWORD lenstr )
+{
+    INT size;
+    CHAR buffer[22]; /* 12 digits + 3 dots + ':' + 5 digits + '\0' */
+    CHAR *p;
+
+    TRACE( "(%p, %d, %p, %p, %p)\n", sockaddr, len, info, string, lenstr );
+
+    if (!sockaddr || len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR;
+    if (!string || !lenstr) return SOCKET_ERROR;
+
+    /* sin_family is guaranteed to be the first u_short */
+    if (((SOCKADDR_IN *)sockaddr)->sin_family != AF_INET) return SOCKET_ERROR;
+
+    sprintf( buffer, "%u.%u.%u.%u:%u",
+             (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.s_addr ) >> 24 & 0xff),
+             (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.s_addr ) >> 16 & 0xff),
+             (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.s_addr ) >> 8 & 0xff),
+             (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.s_addr ) & 0xff),
+             ntohs( ((SOCKADDR_IN *)sockaddr)->sin_port ) );
+
+    p = strchr( buffer, ':' );
+    if (!((SOCKADDR_IN *)sockaddr)->sin_port) *p = 0;
+
+    size = strlen( buffer );
+
+    if (*lenstr <  size)
+    {
+        *lenstr = size;
+        WSASetLastError(WSAEFAULT);
+        return SOCKET_ERROR;
+    }
+
+    strcpy( string, buffer );
+    return 0;
+}

trunk/src/ws2_32/ws2_32.def

@@ -45 +45 @@
 ; WPUCompleteOverlappedRequest                     @25
   WSAAccept = _WSAAccept@20                        @26
-; WSAAddressToStringA                              @27
+  WSAAddressToStringA  = _WSAAddressToStringA@20   @27
 ; WSAAddressToStringW                              @28