mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-12 21:30:45 +01:00
239ac8a4e2
This is a reland of 003c9be817
Found some downstream code that relies on
NetworkMonitorFactory::SetFactory, so I'm adding those methods back
temporarily. BasicNetworkManager will fall back to the static factory
if the one passed into PeerConnectionFactory is null.
Original change's description:
> Pass NetworkMonitorFactory through PeerConnectionFactory.
>
> Previously the instance was set through a static method, which was
> really only done because it was difficult to add new
> PeerConnectionFactory construction arguments at the time.
>
> Now that we have PeerConnectionFactoryDependencies it's easy to clean
> this up.
>
> I'm doing this because I plan to add a NetworkMonitor implementation
> for iOS, and don't want to inherit this ugliness.
>
> Bug: webrtc:9883
> Change-Id: Id94dc061ab1c7186b81af8547393a6e336ff04c2
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180241
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Commit-Queue: Taylor <deadbeef@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#31815}
TBR=hta@webrtc.org, sakal@webrtc.org
Bug: webrtc:9883
Change-Id: I2e817c423f21936f87532a9694eb9a0a1b70c212
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180722
Reviewed-by: Taylor <deadbeef@webrtc.org>
Commit-Queue: Taylor <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31824}
106 lines
3.4 KiB
C++
106 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"
|
|
// TODO(deadbeef): Remove this include when downstream code stops using
|
|
// NetworkMonitorFactory::SetFactory.
|
|
#include "rtc_base/network_monitor_factory.h"
|
|
#include "rtc_base/third_party/sigslot/sigslot.h"
|
|
#include "rtc_base/thread.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
|
|
};
|
|
|
|
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 factory itself but needs to be released from
|
|
* the factory creator.
|
|
*/
|
|
// 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;
|
|
|
|
// Implementations should call this method on the base when networks change,
|
|
// and the base will fire SignalNetworksChanged on the right thread.
|
|
virtual void OnNetworksChanged() = 0;
|
|
|
|
virtual AdapterType GetAdapterType(const std::string& interface_name) = 0;
|
|
virtual AdapterType GetVpnUnderlyingAdapterType(
|
|
const std::string& interface_name) = 0;
|
|
};
|
|
|
|
class NetworkMonitorBase : public NetworkMonitorInterface,
|
|
public MessageHandler,
|
|
public sigslot::has_slots<> {
|
|
public:
|
|
NetworkMonitorBase();
|
|
~NetworkMonitorBase() override;
|
|
|
|
void OnNetworksChanged() override;
|
|
|
|
void OnMessage(Message* msg) override;
|
|
|
|
AdapterType GetVpnUnderlyingAdapterType(
|
|
const std::string& interface_name) override;
|
|
|
|
protected:
|
|
Thread* worker_thread() { return worker_thread_; }
|
|
|
|
private:
|
|
Thread* worker_thread_;
|
|
};
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // RTC_BASE_NETWORK_MONITOR_H_
|