Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: webrtc/base/ifaddrs_converter.cc

Issue 1547883002: Revert "Enable IPv6 temporary address filtering on iOS." (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/ifaddrs_converter.h ('k') | webrtc/base/macifaddrs_converter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/ifaddrs_converter.cc
diff --git a/webrtc/base/ifaddrs_converter.cc b/webrtc/base/ifaddrs_converter.cc
deleted file mode 100644
index e5bd3276e60bbc1cbcf3e1b44fbb4ca569805cc2..0000000000000000000000000000000000000000
--- a/webrtc/base/ifaddrs_converter.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2015 The WebRTC Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/base/ifaddrs_converter.h"
-
-#include "webrtc/base/logging.h"
-
-namespace rtc {
-
-IfAddrsConverter::IfAddrsConverter() {}
-
-IfAddrsConverter::~IfAddrsConverter() {}
-
-bool IfAddrsConverter::ConvertIfAddrsToIPAddress(
- const struct ifaddrs* interface,
- InterfaceAddress* ip,
- IPAddress* mask) {
- switch (interface->ifa_addr->sa_family) {
- case AF_INET: {
- *ip = IPAddress(
- reinterpret_cast<sockaddr_in*>(interface->ifa_addr)->sin_addr);
- *mask = IPAddress(
- reinterpret_cast<sockaddr_in*>(interface->ifa_netmask)->sin_addr);
- return true;
- }
- case AF_INET6: {
- int ip_attributes = IPV6_ADDRESS_FLAG_NONE;
- if (!ConvertNativeAttributesToIPAttributes(interface, &ip_attributes)) {
- return false;
- }
- *ip = InterfaceAddress(
- reinterpret_cast<sockaddr_in6*>(interface->ifa_addr)->sin6_addr,
- ip_attributes);
- *mask = IPAddress(
- reinterpret_cast<sockaddr_in6*>(interface->ifa_netmask)->sin6_addr);
- return true;
- }
- default: { return false; }
- }
-}
-
-bool IfAddrsConverter::ConvertNativeAttributesToIPAttributes(
- const struct ifaddrs* interface,
- int* ip_attributes) {
- *ip_attributes = IPV6_ADDRESS_FLAG_NONE;
- return true;
-}
-
-#if !defined(WEBRTC_MAC)
-// For MAC and IOS, it's defined in macifaddrs_converter.cc
-IfAddrsConverter* CreateIfAddrsConverter() {
- return new IfAddrsConverter();
-}
-#endif
-} // namespace rtc
« no previous file with comments | « webrtc/base/ifaddrs_converter.h ('k') | webrtc/base/macifaddrs_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698