mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
cfba4ffe31
This reverts commit7ded733518. Reason for revert: Found more code calling NetworkMonitorFactory::SetFactory... Original change's description: > Reland "Pass NetworkMonitorFactory through PeerConnectionFactory." > > This is a reland of003c9be817> > 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: Ibf69a22e8f94226908636c7d50ff9eda65bd4129 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180720 > Reviewed-by: Taylor <deadbeef@webrtc.org> > Commit-Queue: Taylor <deadbeef@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#31822} TBR=deadbeef@webrtc.org,sakal@webrtc.org,hta@webrtc.org Change-Id: Iae51b94072cec9abc021eed4e51d1fbeee998adc No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9883 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180721 Reviewed-by: Taylor <deadbeef@webrtc.org> Commit-Queue: Taylor <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31823}
71 lines
2.1 KiB
C++
71 lines
2.1 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.
|
|
*/
|
|
|
|
#include "rtc_base/network_monitor.h"
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/location.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace {
|
|
const uint32_t UPDATE_NETWORKS_MESSAGE = 1;
|
|
|
|
// This is set by NetworkMonitorFactory::SetFactory and the caller of
|
|
// NetworkMonitorFactory::SetFactory must be responsible for calling
|
|
// ReleaseFactory to destroy the factory.
|
|
rtc::NetworkMonitorFactory* network_monitor_factory = nullptr;
|
|
} // namespace
|
|
|
|
namespace rtc {
|
|
NetworkMonitorInterface::NetworkMonitorInterface() {}
|
|
|
|
NetworkMonitorInterface::~NetworkMonitorInterface() {}
|
|
|
|
NetworkMonitorBase::NetworkMonitorBase() : worker_thread_(Thread::Current()) {}
|
|
NetworkMonitorBase::~NetworkMonitorBase() {}
|
|
|
|
void NetworkMonitorBase::OnNetworksChanged() {
|
|
RTC_LOG(LS_VERBOSE) << "Network change is received at the network monitor";
|
|
worker_thread_->Post(RTC_FROM_HERE, this, UPDATE_NETWORKS_MESSAGE);
|
|
}
|
|
|
|
void NetworkMonitorBase::OnMessage(Message* msg) {
|
|
RTC_DCHECK(msg->message_id == UPDATE_NETWORKS_MESSAGE);
|
|
SignalNetworksChanged();
|
|
}
|
|
|
|
AdapterType NetworkMonitorBase::GetVpnUnderlyingAdapterType(
|
|
const std::string& interface_name) {
|
|
return ADAPTER_TYPE_UNKNOWN;
|
|
}
|
|
|
|
NetworkMonitorFactory::NetworkMonitorFactory() {}
|
|
NetworkMonitorFactory::~NetworkMonitorFactory() {}
|
|
|
|
void NetworkMonitorFactory::SetFactory(NetworkMonitorFactory* factory) {
|
|
if (network_monitor_factory != nullptr) {
|
|
delete network_monitor_factory;
|
|
}
|
|
network_monitor_factory = factory;
|
|
}
|
|
|
|
void NetworkMonitorFactory::ReleaseFactory(NetworkMonitorFactory* factory) {
|
|
if (factory == network_monitor_factory) {
|
|
SetFactory(nullptr);
|
|
}
|
|
}
|
|
|
|
NetworkMonitorFactory* NetworkMonitorFactory::GetFactory() {
|
|
return network_monitor_factory;
|
|
}
|
|
|
|
} // namespace rtc
|