commit 3b976667fdc97709462edb96cd389d3a314446d0
author Kevin Cernekee <cernekee@chromium.org> Sun May 08 05:11:58 2016
committer Kevin Cernekee <cernekee@chromium.org> Wed May 11 00:48:30 2016
tree 05d945dd61a967c243ef52988a43f36d343dca29
parent ce281633d5e244bbe2e19551f5675f4d520f9bb1

Remove workarounds for missing APIs

The new APIs are now accepted upstream.

Change-Id: Ie0e9d398c621b76a3388a16ac3a921252dca117e
Signed-off-by: Kevin Cernekee <cernekee@chromium.org>

vpn_instance.cc

diff --git a/vpn_instance.cc b/vpn_instance.cc
index e74a9d5..57484f6 100644
--- a/vpn_instance.cc
+++ b/vpn_instance.cc
@@ -31,9 +31,6 @@
 #include "ppapi/cpp/var_array_buffer.h"
 #include "ppapi/cpp/var_dictionary.h"
 
-#define NEW_OC_API 1
-#define GETNAMEINFO_WORKS 1
-
 namespace {
 
 // keys
@@ -698,42 +695,6 @@
   va_end(ap);
 }
 
-// TODO: implement getnameinfo() in libnacl_io so we can remove this hack
-int VpnInstance::GetAddrInfo(const char* node,
-                             const char* service,
-                             const struct addrinfo* hints,
-                             struct addrinfo** res) {
-  int ret = getaddrinfo(node, service, hints, res);
-  if (ret)
-    return ret;
-
-  struct addrinfo* ai;
-  gateway_ips_.clear();
-  for (ai = *res; ai; ai = ai->ai_next) {
-    char str[INET_ADDRSTRLEN];
-
-    if (ai->ai_family == AF_INET) {
-      struct sockaddr_in* s =
-          reinterpret_cast<struct sockaddr_in*>(ai->ai_addr);
-      inet_ntop(AF_INET, &s->sin_addr, str, sizeof(str));
-      gateway_ips_.push_back(str);
-    } else if (ai->ai_family == AF_INET6) {
-      // TODO: support IPv6
-    }
-  }
-
-  return 0;
-}
-
-int VpnInstance::GetAddrInfo(void* privdata,
-                             const char* node,
-                             const char* service,
-                             const struct addrinfo* hints,
-                             struct addrinfo** res) {
-  VpnInstance* self = static_cast<VpnInstance*>(privdata);
-  return self->GetAddrInfo(node, service, hints, res);
-}
-
 void VpnInstance::SendIpInfo(const struct oc_ip_info* ip_info)
 {
   pp::VarDictionary dict;
@@ -786,13 +747,7 @@
   dict.Set(kSplitExcludes, split_excludes);
 
   pp::VarArray gateway_ips;
-#if NEW_OC_API && GETNAMEINFO_WORKS
   gateway_ips.Set(0, ip_info->gateway_addr);
-#else
-  std::vector<std::string>::iterator it;
-  for (it = gateway_ips_.begin(), i = 0; it != gateway_ips_.end(); it++)
-    gateway_ips.Set(i++, *it);
-#endif
   dict.Set(kGatewayIps, gateway_ips);
 
   PostMessage(dict);
@@ -839,12 +794,8 @@
     return;
   }
 
-#if NEW_OC_API
   openconnect_set_setup_tun_handler(oc_, SetupTunCb);
   openconnect_set_reconnected_handler(oc_, ReconnectedCb);
-#else
-  SetupTunCb();
-#endif
 
   while (1) {
     pthread_mutex_lock(&desired_state_mutex_);
@@ -894,9 +845,6 @@
     return;
   }
 
-  if (!NEW_OC_API || !GETNAMEINFO_WORKS)
-    openconnect_override_getaddrinfo(oc_, &GetAddrInfo);
-
   connect_options_ = dict;
   gateway_ips_.clear();
   rx_dropped_ = 0;

vpn_instance.h

diff --git a/vpn_instance.h b/vpn_instance.h
index 255b96b..88d4194 100644
--- a/vpn_instance.h
+++ b/vpn_instance.h
@@ -146,16 +146,6 @@
 
   void ProgressCb(int level, const char* fmt, va_list ap);
   static void ProgressCb(void* privdata, int level, const char* fmt, ...);
-
-  int GetAddrInfo(const char* node,
-                  const char* service,
-                  const struct addrinfo* hints,
-                  struct addrinfo** res);
-  static int GetAddrInfo(void* privdata,
-                         const char* node,
-                         const char* service,
-                         const struct addrinfo* hints,
-                         struct addrinfo** res);
 };
 
 }  // namespace vpn_nacl