From 1ddad6f70ea85483c9807ba9f0e98ffa8d3f98eb Mon Sep 17 00:00:00 2001
From: Jeffrey Brill <jbrill@blizzard.com>
Date: Thu, 13 Jul 2017 10:57:01 -0700
Subject: [PATCH] Apply patch file from spooky000 for ZOOKEEPER-2490 Resolves
 issue where memcmp always returns false in windows release builds

---
 src/c/src/addrvec.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/c/src/addrvec.c b/src/c/src/addrvec.c
index e641a46f226..37e3aac712e 100644
--- a/src/c/src/addrvec.c
+++ b/src/c/src/addrvec.c
@@ -124,8 +124,18 @@ int addrvec_contains(const addrvec_t *avec, const struct sockaddr_storage *addr)
 
     for (i = 0; i < avec->count; i++)
     {
-        if(memcmp(&avec->data[i], addr, INET_ADDRSTRLEN) == 0)
+#if defined(AF_INET6)
+        if (ep->ss_family == AF_INET6) {
+            if (memcmp(&avec->data[i], addr, sizeof(struct sockaddr_in6)) == 0)
+                return 1;
+        }
+        else {
+#endif
+        if(memcmp(&avec->data[i], addr, sizeof(struct sockaddr_in)) == 0)
             return 1;
+#if defined(AF_INET6)
+        }
+#endif
     }
 
     return 0;