[PATCH v2 07/11] iphlpapi: Implement Icmp6ParseReplies().

[Paul Gofman]

From: Paul Gofman

---
 dlls/iphlpapi/iphlpapi.spec    |  2 +-
 dlls/iphlpapi/iphlpapi_main.c  | 12 ++++++++++++
 dlls/iphlpapi/tests/iphlpapi.c | 19 +++++++++++++++++++
 include/ipexport.h             | 31 +++++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec
index c04560ad656..ed2214c99ce 100644
--- a/dlls/iphlpapi/iphlpapi.spec
+++ b/dlls/iphlpapi/iphlpapi.spec
@@ -153,7 +153,7 @@
 @ stdcall GetUnicastIpAddressTable(long ptr)
 @ stdcall GetUniDirectionalAdapterInfo( ptr ptr )
 @ stdcall Icmp6CreateFile()
-#@ stub Icmp6ParseReplies
+@ stdcall Icmp6ParseReplies( ptr long )
 @ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long)
 @ stdcall IcmpCloseHandle(ptr)
 @ stdcall IcmpCreateFile()
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 3ca0ed26ca4..f68ac36f2eb 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -4967,6 +4967,18 @@ HANDLE WINAPI Icmp6CreateFile( void )
     return INVALID_HANDLE_VALUE;
 }

+/******************************************************************
+ *    Icmp6ParseReplies (IPHLPAPI.@)
+ */
+DWORD WINAPI Icmp6ParseReplies( void *reply, DWORD reply_size )
+{
+    ICMPV6_ECHO_REPLY *icmp_reply = reply;
+
+    if (!icmp_reply->Status) return 1;
+    SetLastError( icmp_reply->Status );
+    return 0;
+}
+
 /***********************************************************************
  *    Icmp6SendEcho2 (IPHLPAPI.@)
  */
diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index b2312c76f2f..10457a4310f 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -1406,6 +1406,24 @@ static void testIcmpParseReplies( void )
     ok( !reply.Reserved, "reserved %d\n", reply.Reserved );
 }

+static void testIcmp6ParseReplies( void )
+{
+    ICMPV6_ECHO_REPLY reply = { 0 };
+    DWORD ret;
+
+    SetLastError( 0xdeadbeef );
+    ret = Icmp6ParseReplies( &reply, sizeof(reply) );
+    ok( ret == 1, "got %ld.\n", ret );
+    ok( GetLastError() == 0xdeadbeef, "got error %ld.\n", GetLastError() );
+
+    reply.Status = 12345;
+    SetLastError( 0xdeadbeef );
+    ret = Icmp6ParseReplies( &reply, sizeof(reply) );
+    ok( ret == 0, "ret %ld\n", ret );
+    ok( GetLastError() == 12345, "got error %ld.\n", GetLastError() );
+    ok( reply.Status == 12345, "got %ld,\n", reply.Status );
+}
+
 static void testWinNT4Functions(void)
 {
   testGetNumberOfInterfaces();
@@ -1426,6 +1444,7 @@ static void testWinNT4Functions(void)
   testSetTcpEntry();
   testIcmpSendEcho();
   testIcmpParseReplies();
+  testIcmp6ParseReplies();
 }

static void testGetInterfaceInfo(void)
diff --git a/include/ipexport.h b/include/ipexport.h
index a0e30ba1533..1a93a0136b3 100644
--- a/include/ipexport.h
+++ b/include/ipexport.h
@@ -66,6 +66,23 @@ typedef struct ip_option_information IP_OPTION_INFORMATION, *PIP_OPTION_INFORMAT

typedef struct icmp_echo_reply ICMP_ECHO_REPLY, *PICMP_ECHO_REPLY;

+#pragma pack(push,1)
+typedef struct _IPV6_ADDRESS_EX {
+    USHORT sin6_port;
+    ULONG  sin6_flowinfo;
+    USHORT sin6_addr[8];
+    ULONG  sin6_scope_id;
+} IPV6_ADDRESS_EX, *PIPV6_ADDRESS_EX;
+#pragma pack(pop)
+
+struct icmpv6_echo_reply_lh
+{
+    IPV6_ADDRESS_EX Address;
+    ULONG           Status;
+    unsigned int    RoundTripTime;
+};
+
+typedef struct icmpv6_echo_reply_lh ICMPV6_ECHO_REPLY, *PICMPV6_ECHO_REPLY;

#define IP_STATUS_BASE              11000

@@ -98,6 +115,20 @@ typedef struct icmp_echo_reply ICMP_ECHO_REPLY, *PICMP_ECHO_REPLY;
 #define MAX_IP_STATUS               IP_GENERAL_FAILURE
 #define IP_PENDING                  (IP_STATUS_BASE + 255)

+/* IPv6 status codes */
+#define IP_DEST_NO_ROUTE            (IP_STATUS_BASE + 2)
+#define IP_DEST_ADDR_UNREACHABLE    (IP_STATUS_BASE + 3)
+#define IP_DEST_PROHIBITED          (IP_STATUS_BASE + 4)
+#define IP_DEST_PORT_UNREACHABLE    (IP_STATUS_BASE + 5)
+#define IP_HOP_LIMIT_EXCEEDED       (IP_STATUS_BASE + 13)
+#define IP_REASSEMBLY_TIME_EXCEEDED (IP_STATUS_BASE + 14)
+#define IP_PARAMETER_PROBLEM        (IP_STATUS_BASE + 15)
+#define IP_DEST_UNREACHABLE         (IP_STATUS_BASE + 40)
+#define IP_TIME_EXCEEDED            (IP_STATUS_BASE + 41)
+#define IP_BAD_HEADER               (IP_STATUS_BASE + 42)
+#define IP_UNRECOGNIZED_NEXT_HEADER (IP_STATUS_BASE + 43)
+#define IP_ICMP_ERROR               (IP_STATUS_BASE + 44)
+#define IP_DEST_SCOPE_MISMATCH      (IP_STATUS_BASE + 45)

#define MAX_ADAPTER_NAME 128