zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

address comments from https://codereview.webrtc.org/1277263002/

Browse Source 
TBR=juberti@webrtc.org,pthather@webrtc.org

Review URL: https://codereview.webrtc.org/1305113002

Cr-Commit-Position: refs/heads/master@{#9757}
This commit is contained in:
guoweis
2015-08-21 09:06:28 -07:00
committed by Commit bot
parent 5bdafd44c8
commit ea1012b2a4
7 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
talk/app/webrtc/fakemetricsobserver.cc
View File

@ -36,7 +36,7 @@ FakeMetricsObserver::FakeMetricsObserver() {
void FakeMetricsObserver::Reset() {
DCHECK(thread_checker_.CalledOnValidThread());
counters_ = std::vector<std::vector<int>>();
counters_.clear();
memset(int_histogram_samples_, 0, sizeof(int_histogram_samples_));
for (std::string& type : string_histogram_samples_) {
type.clear();

4
webrtc/base/network.cc
View File

@ -165,11 +165,11 @@ NetworkManager::~NetworkManager() {
NetworkManager::EnumerationPermission NetworkManager::enumeration_permission()
const {
return kEnumerationAllowed;
return ENUMERATION_ALLOWED;
}
NetworkManagerBase::NetworkManagerBase()
: enumeration_permission_(NetworkManager::kEnumerationAllowed),
: enumeration_permission_(NetworkManager::ENUMERATION_ALLOWED),
max_ipv6_networks_(kMaxIPv6Networks),
ipv6_enabled_(true) {
}

11
webrtc/base/network.h
View File

@ -58,12 +58,11 @@ class NetworkManager {
// This enum indicates whether adapter enumeration is allowed.
enum EnumerationPermission {
kEnumerationAllowed, // Adapter enumeration is allowed. Getting 0
// network from GetNetworks means that there is no
// network available.
kEnumerationDisallowed, // Adapter enumeration is
// disabled. GetAnyAddressNetworks() should be used
// instead.
ENUMERATION_ALLOWED, // Adapter enumeration is allowed. Getting 0 network
// from GetNetworks means that there is no network
// available.
ENUMERATION_BLOCKED, // Adapter enumeration is disabled.
// GetAnyAddressNetworks() should be used instead.
};
NetworkManager();

8
webrtc/base/network_unittest.cc
View File

@ -183,8 +183,8 @@ TEST_F(NetworkTest, TestUpdateNetworks) {
BasicNetworkManager manager;
manager.SignalNetworksChanged.connect(
static_cast<NetworkTest*>(this), &NetworkTest::OnNetworksChanged);
EXPECT_EQ(manager.enumeration_permission(),
NetworkManager::kEnumerationAllowed);
EXPECT_EQ(NetworkManager::ENUMERATION_ALLOWED,
manager.enumeration_permission());
manager.StartUpdating();
Thread::Current()->ProcessMessages(0);
EXPECT_TRUE(callback_called_);
@ -198,8 +198,8 @@ TEST_F(NetworkTest, TestUpdateNetworks) {
manager.StopUpdating();
EXPECT_TRUE(manager.started());
manager.StopUpdating();
EXPECT_EQ(manager.enumeration_permission(),
NetworkManager::kEnumerationAllowed);
EXPECT_EQ(NetworkManager::ENUMERATION_ALLOWED,
manager.enumeration_permission());
EXPECT_FALSE(manager.started());
manager.StopUpdating();
EXPECT_FALSE(manager.started());

8
webrtc/p2p/base/turnport_unittest.cc
View File

@ -734,8 +734,8 @@ TEST_F(TurnPortTest, TestTurnSendDataTurnUdpToUdp) {
// Create ports and prepare addresses.
CreateTurnPort(kTurnUsername, kTurnPassword, kTurnUdpProtoAddr);
TestTurnSendData();
EXPECT_EQ(turn_port_->Candidates()[0].relay_protocol(),
cricket::UDP_PROTOCOL_NAME);
EXPECT_EQ(cricket::UDP_PROTOCOL_NAME,
turn_port_->Candidates()[0].relay_protocol());
}
// Do a TURN allocation, establish a TCP connection, and send some data.
@ -744,8 +744,8 @@ TEST_F(TurnPortTest, TestTurnSendDataTurnTcpToUdp) {
// Create ports and prepare addresses.
CreateTurnPort(kTurnUsername, kTurnPassword, kTurnTcpProtoAddr);
TestTurnSendData();
EXPECT_EQ(turn_port_->Candidates()[0].relay_protocol(),
cricket::TCP_PROTOCOL_NAME);
EXPECT_EQ(cricket::TCP_PROTOCOL_NAME,
turn_port_->Candidates()[0].relay_protocol());
}
// Test TURN fails to make a connection from IPv6 address to a server which has

2
webrtc/p2p/client/basicportallocator.cc
View File

@ -307,7 +307,7 @@ void BasicPortAllocatorSession::DoAllocate() {
// If the network permission state is BLOCKED, we just act as if the flag has
// been passed in.
if (allocator_->network_manager()->enumeration_permission() ==
rtc::NetworkManager::kEnumerationDisallowed) {
rtc::NetworkManager::ENUMERATION_BLOCKED) {
set_flags(flags() | PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION);
}

12
webrtc/p2p/client/portallocator_unittest.cc
View File

@ -1184,19 +1184,17 @@ TEST_F(PortAllocatorTest, TestSharedSocketNoUdpAllowed) {
TEST_F(PortAllocatorTest, TestNetworkPermissionBlocked) {
AddInterface(kClientAddr);
network_manager_.set_enumeration_permission(
rtc::NetworkManager::kEnumerationDisallowed);
rtc::NetworkManager::ENUMERATION_BLOCKED);
allocator().set_flags(allocator().flags() |
cricket::PORTALLOCATOR_DISABLE_RELAY |
cricket::PORTALLOCATOR_DISABLE_TCP |
cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG |
cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET);
EXPECT_EQ(
allocator_->flags() & cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION,
0U);
EXPECT_EQ(0U, allocator_->flags() &
cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION);
EXPECT_TRUE(CreateSession(cricket::ICE_CANDIDATE_COMPONENT_RTP));
EXPECT_EQ(
session_->flags() & cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION,
0U);
EXPECT_EQ(0U, session_->flags() &
cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION);
session_->StartGettingPorts();
EXPECT_EQ_WAIT(1U, ports_.size(), kDefaultAllocationTimeout);
EXPECT_EQ(0U, candidates_.size());