* lib/ws2_32.def (getaddrinfo, freeaddrinfo and getnameinfo):

	Add stubs.
	* include/ws2tcpip.h (IPV6_*) Add IPPROTO_IPV6 level socket
	options.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index cabcf26..142083d 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-23  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * lib/ws2_32.def (getaddrinfo, freeaddrinfo and getnameinfo):
+       Add stubs.
+       * include/ws2tcpip.h (IPV6_*) Add IPPROTO_IPV6 level socket
+       options.
+
 2003-01-11  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/winnt.h (IMAGE_FILE_AGGRESIVE_WS_TRIM

diff --git a/winsup/w32api/include/ws2tcpip.h b/winsup/w32api/include/ws2tcpip.h
index 97680f0..ac66fb0 100644 (file)
--- a/winsup/w32api/include/ws2tcpip.h
+++ b/winsup/w32api/include/ws2tcpip.h
@@ -56,6 +56,20 @@ extern "C" {
 #define IP_UNBLOCK_SOURCE              18
 #define IP_PKTINFO                     19
 
+/*
+ * As with BSD implementation, IPPROTO_IPV6 level socket options have
+ * same values as IPv4 counterparts.
+ */
+#define IPV6_UNICAST_HOPS      4
+#define IPV6_MULTICAST_IF      9
+#define IPV6_MULTICAST_HOPS    10
+#define IPV6_MULTICAST_LOOP    11
+#define IPV6_ADD_MEMBERSHIP    12
+#define IPV6_DROP_MEMBERSHIP   13
+#define IPV6_JOIN_GROUP                IPV6_ADD_MEMBERSHIP
+#define IPV6_LEAVE_GROUP       IPV6_DROP_MEMBERSHIP
+#define IPV6_PKTINFO           19
+
 #define IP_DEFAULT_MULTICAST_TTL 1 
 #define IP_DEFAULT_MULTICAST_LOOP 1 
 #define IP_MAX_MEMBERSHIPS 20 

diff --git a/winsup/w32api/lib/ws2_32.def b/winsup/w32api/lib/ws2_32.def
index f78313e..50e68b3 100644 (file)
--- a/winsup/w32api/lib/ws2_32.def
+++ b/winsup/w32api/lib/ws2_32.def
@@ -80,9 +80,12 @@ accept@12
 bind@12
 closesocket@4
 connect@12
+freeaddrinfo@4
+getaddrinfo@16
 gethostbyaddr@12
 gethostbyname@4
 gethostname@8
+getnameinfo@28
 getpeername@12
 getprotobyname@4
 getprotobynumber@4