Removing PORTALLOCATOR_ENABLE_SHAKER.
It's not used by anything, and is obsoleted by connection pruning,
candidate pruning, timeouts, etc.
R=pthatcher@webrtc.org
Review URL: https://codereview.webrtc.org/1992253005 .
Cr-Commit-Position: refs/heads/master@{#12834}
diff --git a/webrtc/p2p/base/portallocator.h b/webrtc/p2p/base/portallocator.h
index 8796570..89a0e0a 100644
--- a/webrtc/p2p/base/portallocator.h
+++ b/webrtc/p2p/base/portallocator.h
@@ -40,7 +40,6 @@
// Disable local TCP ports. This doesn't impact how we connect to relay
// servers.
PORTALLOCATOR_DISABLE_TCP = 0x08,
- PORTALLOCATOR_ENABLE_SHAKER = 0x10,
PORTALLOCATOR_ENABLE_IPV6 = 0x40,
// TODO(pthatcher): Remove this once it's no longer used in:
// remoting/client/plugin/pepper_port_allocator.cc
diff --git a/webrtc/p2p/client/basicportallocator.cc b/webrtc/p2p/client/basicportallocator.cc
index 143b036..bf61bc8 100644
--- a/webrtc/p2p/client/basicportallocator.cc
+++ b/webrtc/p2p/client/basicportallocator.cc
@@ -36,7 +36,6 @@
MSG_CONFIG_READY,
MSG_ALLOCATE,
MSG_ALLOCATION_PHASE,
- MSG_SHAKE,
MSG_SEQUENCEOBJECTS_CREATED,
MSG_CONFIG_STOP,
};
@@ -48,14 +47,6 @@
const int kNumPhases = 4;
-const int SHAKE_MIN_DELAY = 45 * 1000; // 45 seconds
-const int SHAKE_MAX_DELAY = 90 * 1000; // 90 seconds
-
-int ShakeDelay() {
- int range = SHAKE_MAX_DELAY - SHAKE_MIN_DELAY + 1;
- return SHAKE_MIN_DELAY + CreateRandomId() % range;
-}
-
} // namespace
namespace cricket {
@@ -186,9 +177,6 @@
running_ = true;
network_thread_->Post(this, MSG_CONFIG_START);
-
- if (flags() & PORTALLOCATOR_ENABLE_SHAKER)
- network_thread_->PostDelayed(ShakeDelay(), this, MSG_SHAKE);
}
void BasicPortAllocatorSession::StopGettingPorts() {
@@ -265,21 +253,14 @@
ASSERT(rtc::Thread::Current() == network_thread_);
GetPortConfigurations();
break;
-
case MSG_CONFIG_READY:
ASSERT(rtc::Thread::Current() == network_thread_);
OnConfigReady(static_cast<PortConfiguration*>(message->pdata));
break;
-
case MSG_ALLOCATE:
ASSERT(rtc::Thread::Current() == network_thread_);
OnAllocate();
break;
-
- case MSG_SHAKE:
- ASSERT(rtc::Thread::Current() == network_thread_);
- OnShake();
- break;
case MSG_SEQUENCEOBJECTS_CREATED:
ASSERT(rtc::Thread::Current() == network_thread_);
OnAllocationSequenceObjectsCreated();
@@ -713,36 +694,6 @@
ASSERT(false);
}
-void BasicPortAllocatorSession::OnShake() {
- LOG(INFO) << ">>>>> SHAKE <<<<< >>>>> SHAKE <<<<< >>>>> SHAKE <<<<<";
-
- std::vector<Port*> ports;
- std::vector<Connection*> connections;
-
- for (size_t i = 0; i < ports_.size(); ++i) {
- if (ports_[i].ready())
- ports.push_back(ports_[i].port());
- }
-
- for (size_t i = 0; i < ports.size(); ++i) {
- Port::AddressMap::const_iterator iter;
- for (iter = ports[i]->connections().begin();
- iter != ports[i]->connections().end();
- ++iter) {
- connections.push_back(iter->second);
- }
- }
-
- LOG(INFO) << ">>>>> Destroying " << ports.size() << " ports and "
- << connections.size() << " connections";
-
- for (size_t i = 0; i < connections.size(); ++i)
- connections[i]->Destroy();
-
- if (running_ || (ports.size() > 0) || (connections.size() > 0))
- network_thread_->PostDelayed(ShakeDelay(), this, MSG_SHAKE);
-}
-
BasicPortAllocatorSession::PortData* BasicPortAllocatorSession::FindPort(
Port* port) {
for (std::vector<PortData>::iterator it = ports_.begin();
diff --git a/webrtc/p2p/client/basicportallocator.h b/webrtc/p2p/client/basicportallocator.h
index fd189c1..6a719c7 100644
--- a/webrtc/p2p/client/basicportallocator.h
+++ b/webrtc/p2p/client/basicportallocator.h
@@ -162,7 +162,6 @@
void OnPortError(Port* port);
void OnProtocolEnabled(AllocationSequence* seq, ProtocolType proto);
void OnPortDestroyed(PortInterface* port);
- void OnShake();
void MaybeSignalCandidatesAllocationDone();
void OnPortAllocationComplete(AllocationSequence* seq);
PortData* FindPort(Port* port);
