This reverts commit da2fd2a2b25ee4bd7b383424cb26d51fb6cc7716, as well as follow-up b7227a5a10f233cec04642f15a0233e7355bd340, "Fix handling of partial match for GetVpnUnderlyingAdapterType". Reason for revert: Breaks downstream test. First change's description: > Fix problem with ipv4 over ipv6 on Android > > This patch fixes a problem with using ipv4 over ipv6 > addresses on Android. These addresses are discovered > using 'getifaddr' with interfaces called 'v4-wlan0' or > 'v4-rmnet' but the Android API does not report them. > > This leads to failure when BasicPortAllocator tries > to bind a socket to the ip-address, making the ipv4 > address unusable. > > This solution does the following > 1) Insert BasicNetworkManager as NetworkBinderInterface > rather than AndroidNetworkManager. > > 2) When SocketServer calls BindSocketToNetwork, > BasicNetworkManager first lookup the interface name, > and then calls AndroidNetworkManager. > > 3) AndroidNetworkManager will then first try to bind > using the known ip-addresses, and if it can't find the network > it will instead match the interface names. > > The patch has been tested on real android devices, and works fine. > And everything is disabled by default, and is enabled by field trial. > > My plan is to rollout the feature, checking that it does not introduce > any problems, and if so, enabled for all. > > Bug: webrtc:10707 > Change-Id: I7081ba43d4ce17077acfa5fbab44eda127ac3971 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211003 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#33422} Second change's description: > Fix handling of partial match for GetVpnUnderlyingAdapterType > > This is a followup to https://webrtc-review.googlesource.com/c/src/+/211003 > and fixes the problem pointed out by deadbeef@, thanks! > > Bug: webrtc:10707 > Change-Id: I8dea842b25ba15416353ce4002356183087873c7 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211344 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#33436} TBR=hta@webrtc.org,jonaso@webrtc.org NOTRY=True Bug: webrtc:10707 Change-Id: Ib13127fbf087c7f34ca0ccc6ce1805706f01d19d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211740 Reviewed-by: Taylor <deadbeef@webrtc.org> Commit-Queue: Taylor <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33453}
103 lines
3.4 KiB
C++
103 lines
3.4 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef RTC_BASE_NETWORK_MONITOR_H_
|
|
#define RTC_BASE_NETWORK_MONITOR_H_
|
|
|
|
#include "rtc_base/network_constants.h"
|
|
#include "rtc_base/third_party/sigslot/sigslot.h"
|
|
|
|
namespace rtc {
|
|
|
|
class IPAddress;
|
|
|
|
enum class NetworkBindingResult {
|
|
SUCCESS = 0, // No error
|
|
FAILURE = -1, // Generic error
|
|
NOT_IMPLEMENTED = -2,
|
|
ADDRESS_NOT_FOUND = -3,
|
|
NETWORK_CHANGED = -4
|
|
};
|
|
|
|
// NetworkPreference property set by operating system/firmware that has
|
|
// information about connection strength to e.g WIFI router or CELL base towers.
|
|
// GENERATED_JAVA_ENUM_PACKAGE: org.webrtc
|
|
enum class NetworkPreference {
|
|
NEUTRAL = 0,
|
|
NOT_PREFERRED = -1,
|
|
};
|
|
|
|
const char* NetworkPreferenceToString(NetworkPreference preference);
|
|
|
|
class NetworkBinderInterface {
|
|
public:
|
|
// Binds a socket to the network that is attached to |address| so that all
|
|
// packets on the socket |socket_fd| will be sent via that network.
|
|
// This is needed because some operating systems (like Android) require a
|
|
// special bind call to put packets on a non-default network interface.
|
|
virtual NetworkBindingResult BindSocketToNetwork(
|
|
int socket_fd,
|
|
const IPAddress& address) = 0;
|
|
virtual ~NetworkBinderInterface() {}
|
|
};
|
|
|
|
/*
|
|
* Receives network-change events via |OnNetworksChanged| and signals the
|
|
* networks changed event.
|
|
*
|
|
* Threading consideration:
|
|
* It is expected that all upstream operations (from native to Java) are
|
|
* performed from the worker thread. This includes creating, starting and
|
|
* stopping the monitor. This avoids the potential race condition when creating
|
|
* the singleton Java NetworkMonitor class. Downstream operations can be from
|
|
* any thread, but this class will forward all the downstream operations onto
|
|
* the worker thread.
|
|
*
|
|
* Memory consideration:
|
|
* NetworkMonitor is owned by the caller (NetworkManager). The global network
|
|
* monitor factory is owned by the PeerConnectionFactory.
|
|
*/
|
|
// Generic network monitor interface. It starts and stops monitoring network
|
|
// changes, and fires the SignalNetworksChanged event when networks change.
|
|
class NetworkMonitorInterface {
|
|
public:
|
|
NetworkMonitorInterface();
|
|
virtual ~NetworkMonitorInterface();
|
|
|
|
sigslot::signal0<> SignalNetworksChanged;
|
|
|
|
virtual void Start() = 0;
|
|
virtual void Stop() = 0;
|
|
|
|
virtual AdapterType GetAdapterType(const std::string& interface_name) = 0;
|
|
virtual AdapterType GetVpnUnderlyingAdapterType(
|
|
const std::string& interface_name) = 0;
|
|
|
|
virtual NetworkPreference GetNetworkPreference(
|
|
const std::string& interface_name) = 0;
|
|
|
|
// Is this interface available to use? WebRTC shouldn't attempt to use it if
|
|
// this returns false.
|
|
//
|
|
// It's possible for this status to change, in which case
|
|
// SignalNetworksChanged will be fired.
|
|
//
|
|
// These specific use case this was added for was a phone with two SIM cards,
|
|
// where attempting to use all interfaces returned from getifaddrs caused the
|
|
// connection to be dropped.
|
|
virtual bool IsAdapterAvailable(const std::string& interface_name) {
|
|
return true;
|
|
}
|
|
};
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // RTC_BASE_NETWORK_MONITOR_H_
|