From f34c65393622878e9610939193fd9c754b7c0a74 Mon Sep 17 00:00:00 2001
From: Alexander Polcyn <apolcyn@google.com>
Date: Thu, 26 Jul 2018 14:32:07 -0700
Subject: Revert "Merge pull request #15797 from
 apolcyn/windows_compile_and_sort"

This reverts commit ae8d3efc3a360b289f0b33e1c53c8c73960cb31f, reversing
changes made to e41215e181564a61320b9b69ae5feb7f7c3625fe.
---
 third_party/address_sorting/address_sorting.c      |  9 +----
 .../address_sorting/address_sorting_windows.c      | 46 ++--------------------
 .../include/address_sorting/address_sorting.h      |  3 --
 3 files changed, 5 insertions(+), 53 deletions(-)

(limited to 'third_party')

diff --git a/third_party/address_sorting/address_sorting.c b/third_party/address_sorting/address_sorting.c
index 9aee0a5419..e4f3b53799 100644
--- a/third_party/address_sorting/address_sorting.c
+++ b/third_party/address_sorting/address_sorting.c
@@ -55,17 +55,12 @@ static const int kIPv6AddrScopeGlobal = 3;
 static address_sorting_source_addr_factory* g_current_source_addr_factory =
     NULL;
 
-static bool address_sorting_get_source_addr(const address_sorting_address* dest,
-                                            address_sorting_address* source) {
+static int address_sorting_get_source_addr(const address_sorting_address* dest,
+                                           address_sorting_address* source) {
   return g_current_source_addr_factory->vtable->get_source_addr(
       g_current_source_addr_factory, dest, source);
 }
 
-bool address_sorting_get_source_addr_for_testing(
-    const address_sorting_address* dest, address_sorting_address* source) {
-  return address_sorting_get_source_addr(dest, source);
-}
-
 static int ipv6_prefix_match_length(const struct sockaddr_in6* sa,
                                     const struct sockaddr_in6* sb) {
   unsigned char* a = (unsigned char*)&sa->sin6_addr;
diff --git a/third_party/address_sorting/address_sorting_windows.c b/third_party/address_sorting/address_sorting_windows.c
index 662a88248e..b2f5708649 100644
--- a/third_party/address_sorting/address_sorting_windows.c
+++ b/third_party/address_sorting/address_sorting_windows.c
@@ -42,54 +42,14 @@
 
 #if defined(ADDRESS_SORTING_WINDOWS)
 
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 
-static bool windows_source_addr_factory_get_source_addr(
-    address_sorting_source_addr_factory* factory,
-    const address_sorting_address* dest_addr,
-    address_sorting_address* source_addr) {
-  bool source_addr_exists = false;
-  SOCKET s = socket(((struct sockaddr_in6*)dest_addr)->sin6_family, SOCK_DGRAM,
-                    IPPROTO_UDP);
-  if (s != INVALID_SOCKET) {
-    if (connect(s, (struct sockaddr*)dest_addr, (int)dest_addr->len) == 0) {
-      address_sorting_address found_source_addr;
-      memset(&found_source_addr, 0, sizeof(found_source_addr));
-      found_source_addr.len = sizeof(found_source_addr.addr);
-      if (getsockname(s, (struct sockaddr*)&found_source_addr.addr,
-                      (socklen_t*)&found_source_addr.len) == 0) {
-        source_addr_exists = true;
-        *source_addr = found_source_addr;
-      }
-    }
-    closesocket(s);
-  }
-  return source_addr_exists;
-}
-
-static void windows_source_addr_factory_destroy(
-    address_sorting_source_addr_factory* self) {
-  free(self);
-}
-
-static const address_sorting_source_addr_factory_vtable
-    windows_source_addr_factory_vtable = {
-        windows_source_addr_factory_get_source_addr,
-        windows_source_addr_factory_destroy,
-};
+/* TODO : Add address sorting functionality to work on windows. */
 
 address_sorting_source_addr_factory*
 address_sorting_create_source_addr_factory_for_current_platform() {
-  address_sorting_source_addr_factory* factory =
-      malloc(sizeof(address_sorting_source_addr_factory));
-  memset(factory, 0, sizeof(address_sorting_source_addr_factory));
-  factory->vtable = &windows_source_addr_factory_vtable;
-  return factory;
+  abort();
+  return NULL;
 }
 
 #endif  // defined(ADDRESS_SORTING_WINDOWS)
diff --git a/third_party/address_sorting/include/address_sorting/address_sorting.h b/third_party/address_sorting/include/address_sorting/address_sorting.h
index c58fafe3f7..f11cd424b5 100644
--- a/third_party/address_sorting/include/address_sorting/address_sorting.h
+++ b/third_party/address_sorting/include/address_sorting/address_sorting.h
@@ -103,9 +103,6 @@ address_sorting_family address_sorting_abstract_get_family(
 void address_sorting_override_source_addr_factory_for_testing(
     address_sorting_source_addr_factory* factory);
 
-bool address_sorting_get_source_addr_for_testing(
-    const address_sorting_address* dest, address_sorting_address* source);
-
 #ifdef __cplusplus
 }
 #endif
-- 
cgit v1.2.3