[ros-diffs] [gedmurphy] 34545: - Implement freeaddrinfo and getaddrinfo. - Implement bare boned getprotobyname and getprotobynumber. - Make winsock functions return proper error codes instead of success (will help to identify any probs with network apps) - patch by Yuri Sidorov <jura at cp-lab dot com> For future reference, freeaddrinfo and getaddrinfo should really call GetAddrInfoW and FreeAddrInfoW which should do the work, but our umode network layers are a mess anyway and by no means XP compatible See issue #3523 for more details.
gedmurphy at svn.reactos.org
gedmurphy at svn.reactos.org
Wed Jul 16 14:49:15 CEST 2008
Author: gedmurphy
Date: Wed Jul 16 07:49:15 2008
New Revision: 34545
URL: http://svn.reactos.org/svn/reactos?rev=34545&view=rev
Log:
- Implement freeaddrinfo and getaddrinfo.
- Implement bare boned getprotobyname and getprotobynumber.
- Make winsock functions return proper error codes instead of success (will help to identify any probs with network apps)
- patch by Yuri Sidorov <jura at cp-lab dot com>
For future reference, freeaddrinfo and getaddrinfo should really call GetAddrInfoW and FreeAddrInfoW which should do the work, but our umode network layers are a mess anyway and by no means XP compatible
See issue #3523 for more details.
Modified:
trunk/reactos/dll/win32/ws2_32/misc/ns.c
trunk/reactos/dll/win32/ws2_32/misc/stubs.c
Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c?rev=34545&r1=34544&r2=34545&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Wed Jul 16 07:49:15 2008
@@ -35,7 +35,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -52,7 +53,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -66,7 +68,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -80,7 +83,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -96,7 +100,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -112,7 +117,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -127,7 +133,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -142,7 +149,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -155,7 +163,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -168,7 +177,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -183,7 +193,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -198,7 +209,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -211,7 +223,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -227,7 +240,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -243,7 +257,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -256,7 +271,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -271,7 +287,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -286,7 +303,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -798,25 +816,27 @@
*
* @unimplemented
*/
+
+static CHAR *no_aliases = 0;
+static PROTOENT protocols[] =
+{
+ {"icmp",&no_aliases, IPPROTO_ICMP},
+ {"tcp", &no_aliases, IPPROTO_TCP},
+ {"udp", &no_aliases, IPPROTO_UDP},
+ {NULL, NULL, 0}
+};
+
LPPROTOENT
EXPORT
getprotobyname(IN CONST CHAR FAR* name)
{
- static CHAR *udp_aliases = 0;
- static PROTOENT udp = { "udp", &udp_aliases, 17 };
- static CHAR *tcp_aliases = 0;
- static PROTOENT tcp = { "tcp", &tcp_aliases, 6 };
-
- if(!_stricmp(name, "udp"))
- {
- return &udp;
- }
- else if (!_stricmp( name, "tcp"))
- {
- return &tcp;
- }
-
- return 0;
+ UINT i;
+ for (i = 0; protocols[i].p_name; i++)
+ {
+ if (_stricmp(protocols[i].p_name, name) == 0)
+ return &protocols[i];
+ }
+ return NULL;
}
/*
@@ -826,9 +846,13 @@
EXPORT
getprotobynumber(IN INT number)
{
- UNIMPLEMENTED
-
- return (LPPROTOENT)NULL;
+ UINT i;
+ for (i = 0; protocols[i].p_name; i++)
+ {
+ if (protocols[i].p_proto == number)
+ return &protocols[i];
+ }
+ return NULL;
}
#define SKIPWS(ptr,act) \
@@ -1324,5 +1348,189 @@
}
+/*
+ * @implemented
+ */
+VOID
+EXPORT
+freeaddrinfo(struct addrinfo *pAddrInfo)
+{
+ struct addrinfo *next, *cur;
+ cur = pAddrInfo;
+ while (cur)
+ {
+ next = cur->ai_next;
+ if (cur->ai_addr)
+ HeapFree(GetProcessHeap(), 0, cur->ai_addr);
+ if (cur->ai_canonname)
+ HeapFree(GetProcessHeap(), 0, cur->ai_canonname);
+ HeapFree(GetProcessHeap(), 0, cur);
+ cur = next;
+ }
+}
+
+
+struct addrinfo *
+new_addrinfo(struct addrinfo *prev)
+{
+ struct addrinfo *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct addrinfo));
+ if (prev)
+ prev->ai_next = ret;
+ return ret;
+}
+
+/*
+ * @implemented
+ */
+INT
+EXPORT
+getaddrinfo(const char FAR * nodename,
+ const char FAR * servname,
+ const struct addrinfo FAR * hints,
+ struct addrinfo FAR * FAR * res)
+{
+ struct addrinfo *ret = NULL, *ai;
+ ULONG addr;
+ USHORT port;
+ struct servent *se;
+ char *proto;
+ LPPROTOENT pent;
+ DNS_STATUS dns_status;
+ PDNS_RECORD dp, currdns;
+ struct sockaddr_in *sin;
+
+ if (res == NULL)
+ return WSAEINVAL;
+ if (nodename == NULL && servname == NULL)
+ return WSAHOST_NOT_FOUND;
+
+ if (!WSAINITIALIZED)
+ return WSANOTINITIALISED;
+
+ /* converting port number */
+ port = strtoul(servname, NULL, 10);
+ /* service name was specified? */
+ if (port == 0)
+ {
+ /* protocol was specified? */
+ if (hints && hints->ai_protocol)
+ {
+ pent = getprotobynumber(hints->ai_protocol);
+ if (pent == NULL)
+ return WSAEINVAL;
+ proto = pent->p_name;
+ }
+ else
+ proto = NULL;
+ se = getservbyname(servname, proto);
+ if (se == NULL)
+ return WSAHOST_NOT_FOUND;
+ port = se->s_port;
+ }
+
+ if (nodename)
+ {
+ /* Is it an IPv6 address? */
+ if (strstr(nodename, ":"))
+ return WSAHOST_NOT_FOUND;
+
+ /* Is it an IPv4 address? */
+ addr = inet_addr(nodename);
+ if (addr != INADDR_NONE)
+ {
+ ai = new_addrinfo(NULL);
+ ai->ai_family = PF_INET;
+ ai->ai_addrlen = sizeof(struct sockaddr_in);
+ ai->ai_addr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ai->ai_addrlen);
+ sin = (struct sockaddr_in *)ai->ai_addr;
+ sin->sin_family = AF_INET;
+ sin->sin_port = port;
+ RtlCopyMemory(&sin->sin_addr, &addr, sizeof(sin->sin_addr));
+ if (hints)
+ {
+ if (ai->ai_socktype == 0)
+ ai->ai_socktype = hints->ai_socktype;
+ if (ai->ai_protocol == 0)
+ ai->ai_protocol = hints->ai_protocol;
+ }
+ ret = ai;
+ }
+ else
+ {
+ /* resolving host name */
+ dns_status = DnsQuery_A(nodename,
+ DNS_TYPE_A,
+ DNS_QUERY_STANDARD,
+ 0,
+ /* extra dns servers */ &dp,
+ 0);
+
+ if (dns_status == 0)
+ {
+ ai = NULL;
+ for (currdns = dp; currdns; currdns = currdns->pNext )
+ {
+ /* accept only A records */
+ if (currdns->wType != DNS_TYPE_A) continue;
+
+ ai = new_addrinfo(ai);
+ if (ret == NULL)
+ ret = ai;
+ ai->ai_family = PF_INET;
+ ai->ai_addrlen = sizeof(struct sockaddr_in);
+ ai->ai_addr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ai->ai_addrlen);
+ sin = (struct sockaddr_in *)ret->ai_addr;
+ sin->sin_family = AF_INET;
+ sin->sin_port = port;
+ RtlCopyMemory(&sin->sin_addr, &currdns->Data.A.IpAddress, sizeof(sin->sin_addr));
+ if (hints)
+ {
+ if (ai->ai_socktype == 0)
+ ai->ai_socktype = hints->ai_socktype;
+ if (ai->ai_protocol == 0)
+ ai->ai_protocol = hints->ai_protocol;
+ }
+ }
+ DnsRecordListFree(dp, DnsFreeRecordList);
+ }
+ }
+ }
+ else
+ {
+ ai = new_addrinfo(NULL);
+ ai->ai_family = PF_INET;
+ ai->ai_addrlen = sizeof(struct sockaddr_in);
+ ai->ai_addr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ai->ai_addrlen);
+ sin = (struct sockaddr_in *)ret->ai_addr;
+ sin->sin_family = AF_INET;
+ sin->sin_port = port;
+ if (hints)
+ {
+ if (!(hints->ai_flags & AI_PASSIVE))
+ {
+ sin->sin_addr.S_un.S_un_b.s_b1 = 127;
+ sin->sin_addr.S_un.S_un_b.s_b2 = 0;
+ sin->sin_addr.S_un.S_un_b.s_b3 = 0;
+ sin->sin_addr.S_un.S_un_b.s_b4 = 1;
+ }
+ if (ai->ai_socktype == 0)
+ ai->ai_socktype = hints->ai_socktype;
+ if (ai->ai_protocol == 0)
+ ai->ai_protocol = hints->ai_protocol;
+ }
+ }
+
+ if (ret == NULL)
+ return WSAHOST_NOT_FOUND;
+
+ if (hints && hints->ai_family != PF_UNSPEC && hints->ai_family != PF_INET)
+ {
+ freeaddrinfo(ret);
+ return WSAEAFNOSUPPORT;
+ }
+
+ *res = ret;
+ return 0;
+}
+
/* EOF */
-
Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stubs.c?rev=34545&r1=34544&r2=34545&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Wed Jul 16 07:49:15 2008
@@ -307,7 +307,8 @@
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -340,7 +341,8 @@
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -396,7 +398,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -411,7 +414,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -470,6 +474,7 @@
{
UNIMPLEMENTED
+ WSASetLastError(WSASYSCALLFAILURE);
return FALSE;
}
@@ -485,7 +490,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -500,7 +506,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -533,6 +540,7 @@
{
UNIMPLEMENTED
+ WSASetLastError(WSASYSCALLFAILURE);
return INVALID_SOCKET;
}
@@ -548,7 +556,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -563,7 +572,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -604,7 +614,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -617,7 +628,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
/* WinSock Service Provider support functions */
@@ -635,7 +647,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -652,7 +665,7 @@
{
UNIMPLEMENTED
- return 0;
+ return WSASYSCALLFAILURE;
}
@@ -666,7 +679,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -682,7 +696,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -698,7 +713,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -715,7 +731,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -729,7 +746,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -746,7 +764,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -759,7 +778,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -773,7 +793,7 @@
{
UNIMPLEMENTED
- return 0;
+ return WSASYSCALLFAILURE;
}
/*
@@ -790,9 +810,10 @@
LPDWORD lpcbBytesReturned,
LPWSACOMPLETION lpCompletion)
{
- //UNIMPLEMENTED
-
- return 0;
+ UNIMPLEMENTED
+
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -809,7 +830,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
/*
@@ -822,32 +844,7 @@
{
UNIMPLEMENTED
- return 0;
-}
-
-/*
- * @unimplemented
- */
-VOID
-EXPORT
-freeaddrinfo(struct addrinfo *pAddrInfo)
-{
- UNIMPLEMENTED
-}
-
-/*
- * @unimplemented
- */
-INT
-EXPORT
-getaddrinfo(const char FAR * nodename,
- const char FAR * servname,
- const struct addrinfo FAR * hints,
- struct addrinfo FAR * FAR * res)
-{
- UNIMPLEMENTED
-
- return EAI_NONAME;
+ return WSASYSCALLFAILURE;
}
/*
@@ -865,7 +862,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
/*
@@ -883,7 +881,7 @@
{
UNIMPLEMENTED
- return 0;
+ return FALSE;
}
/* EOF */
More information about the Ros-diffs
mailing list