cbecd358e0
Reason for revert: This CL just landed: https://codereview.chromium.org/1323243006/ Which fixes the FYI bots for the original CL, and breaks them for this revert. Original issue's description: > Revert of TransportController refactoring. (patchset #6 id:100001 of https://codereview.webrtc.org/1350523003/ ) > > Reason for revert: > This CL causes problems with the WebRTC-in-Chromium FYI bots. Presumably it needs to be done in several steps, where removed files are emptied instead of removed in the first step. > > Original issue's description: > > TransportController refactoring. > > > > Getting rid of TransportProxy, and in its place adding a > > TransportController class which will facilitate access to and manage > > the lifetimes of Transports. These Transports will now be accessed > > solely from the worker thread, simplifying their implementation. > > > > This refactoring also pulls Transport-related code out of BaseSession. > > Which means that BaseChannels will now rely on the TransportController > > interface to create channels, rather than BaseSession. > > > > Committed: https://crrev.com/47ee2f3b9f33e8938948c482c921d4e13a3acd83 > > Cr-Commit-Position: refs/heads/master@{#10022} > > TBR=pthatcher@webrtc.org,deadbeef@webrtc.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Committed: https://crrev.com/a81a42f584baa0d93a4b93da9632415e8922450c > Cr-Commit-Position: refs/heads/master@{#10024} TBR=pthatcher@webrtc.org,torbjorng@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.webrtc.org/1361773005 Cr-Commit-Position: refs/heads/master@{#10036}
115 lines
3.2 KiB
C++
115 lines
3.2 KiB
C++
/*
|
|
* Copyright 2009 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 WEBRTC_BASE_FAKENETWORK_H_
|
|
#define WEBRTC_BASE_FAKENETWORK_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "webrtc/base/network.h"
|
|
#include "webrtc/base/messagehandler.h"
|
|
#include "webrtc/base/socketaddress.h"
|
|
#include "webrtc/base/stringencode.h"
|
|
#include "webrtc/base/thread.h"
|
|
|
|
namespace rtc {
|
|
|
|
const int kFakeIPv4NetworkPrefixLength = 24;
|
|
const int kFakeIPv6NetworkPrefixLength = 64;
|
|
|
|
// Fake network manager that allows us to manually specify the IPs to use.
|
|
class FakeNetworkManager : public NetworkManagerBase,
|
|
public MessageHandler {
|
|
public:
|
|
FakeNetworkManager() : thread_(Thread::Current()) {}
|
|
|
|
typedef std::vector<SocketAddress> IfaceList;
|
|
|
|
void AddInterface(const SocketAddress& iface) {
|
|
// ensure a unique name for the interface
|
|
SocketAddress address("test" + rtc::ToString(next_index_++), 0);
|
|
address.SetResolvedIP(iface.ipaddr());
|
|
ifaces_.push_back(address);
|
|
DoUpdateNetworks();
|
|
}
|
|
|
|
void RemoveInterface(const SocketAddress& iface) {
|
|
for (IfaceList::iterator it = ifaces_.begin();
|
|
it != ifaces_.end(); ++it) {
|
|
if (it->EqualIPs(iface)) {
|
|
ifaces_.erase(it);
|
|
break;
|
|
}
|
|
}
|
|
DoUpdateNetworks();
|
|
}
|
|
|
|
virtual void StartUpdating() {
|
|
++start_count_;
|
|
if (start_count_ == 1) {
|
|
sent_first_update_ = false;
|
|
thread_->Post(this);
|
|
} else {
|
|
if (sent_first_update_) {
|
|
SignalNetworksChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
virtual void StopUpdating() { --start_count_; }
|
|
|
|
// MessageHandler interface.
|
|
virtual void OnMessage(Message* msg) {
|
|
DoUpdateNetworks();
|
|
}
|
|
|
|
using NetworkManagerBase::set_enumeration_permission;
|
|
|
|
private:
|
|
void DoUpdateNetworks() {
|
|
if (start_count_ == 0)
|
|
return;
|
|
std::vector<Network*> networks;
|
|
for (IfaceList::iterator it = ifaces_.begin();
|
|
it != ifaces_.end(); ++it) {
|
|
int prefix_length = 0;
|
|
if (it->ipaddr().family() == AF_INET) {
|
|
prefix_length = kFakeIPv4NetworkPrefixLength;
|
|
} else if (it->ipaddr().family() == AF_INET6) {
|
|
prefix_length = kFakeIPv6NetworkPrefixLength;
|
|
}
|
|
IPAddress prefix = TruncateIP(it->ipaddr(), prefix_length);
|
|
scoped_ptr<Network> net(new Network(it->hostname(),
|
|
it->hostname(),
|
|
prefix,
|
|
prefix_length));
|
|
net->AddIP(it->ipaddr());
|
|
networks.push_back(net.release());
|
|
}
|
|
bool changed;
|
|
MergeNetworkList(networks, &changed);
|
|
if (changed || !sent_first_update_) {
|
|
SignalNetworksChanged();
|
|
sent_first_update_ = true;
|
|
}
|
|
}
|
|
|
|
Thread* thread_;
|
|
IfaceList ifaces_;
|
|
int next_index_ = 0;
|
|
int start_count_ = 0;
|
|
bool sent_first_update_ = false;
|
|
};
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // WEBRTC_BASE_FAKENETWORK_H_
|