Index: talk/app/webrtc/portallocatorfactory.cc |
diff --git a/talk/app/webrtc/portallocatorfactory.cc b/talk/app/webrtc/portallocatorfactory.cc |
index 33e0e63102051ab539e032e14e2472cca4194fd2..64d714cd500d5ace1ceea49bf27353cb62ccea41 100644 |
--- a/talk/app/webrtc/portallocatorfactory.cc |
+++ b/talk/app/webrtc/portallocatorfactory.cc |
@@ -1,6 +1,6 @@ |
/* |
* libjingle |
- * Copyright 2004--2011 Google Inc. |
+ * Copyright 2011 Google Inc. |
* |
* Redistribution and use in source and binary forms, with or without |
* modification, are permitted provided that the following conditions are met: |
@@ -24,69 +24,7 @@ |
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
+// TODO(deadbeef): Remove this file once chromium build files no longer |
+// reference it. |
#include "talk/app/webrtc/portallocatorfactory.h" |
- |
-#include "webrtc/p2p/base/basicpacketsocketfactory.h" |
-#include "webrtc/p2p/client/basicportallocator.h" |
-#include "webrtc/base/logging.h" |
-#include "webrtc/base/network.h" |
-#include "webrtc/base/thread.h" |
- |
-namespace webrtc { |
- |
-using rtc::scoped_ptr; |
- |
-rtc::scoped_refptr<PortAllocatorFactoryInterface> |
-PortAllocatorFactory::Create( |
- rtc::Thread* worker_thread) { |
- rtc::RefCountedObject<PortAllocatorFactory>* allocator = |
- new rtc::RefCountedObject<PortAllocatorFactory>(worker_thread); |
- return allocator; |
-} |
- |
-PortAllocatorFactory::PortAllocatorFactory(rtc::Thread* worker_thread) |
- : network_manager_(new rtc::BasicNetworkManager()), |
- socket_factory_(new rtc::BasicPacketSocketFactory(worker_thread)) { |
-} |
- |
-PortAllocatorFactory::~PortAllocatorFactory() {} |
- |
-void PortAllocatorFactory::SetNetworkIgnoreMask(int network_ignore_mask) { |
- network_manager_->set_network_ignore_mask(network_ignore_mask); |
-} |
- |
-cricket::PortAllocator* PortAllocatorFactory::CreatePortAllocator( |
- const std::vector<StunConfiguration>& stun, |
- const std::vector<TurnConfiguration>& turn) { |
- cricket::ServerAddresses stun_hosts; |
- typedef std::vector<StunConfiguration>::const_iterator StunIt; |
- for (StunIt stun_it = stun.begin(); stun_it != stun.end(); ++stun_it) { |
- stun_hosts.insert(stun_it->server); |
- } |
- |
- scoped_ptr<cricket::BasicPortAllocator> allocator( |
- new cricket::BasicPortAllocator( |
- network_manager_.get(), socket_factory_.get(), stun_hosts)); |
- |
- for (size_t i = 0; i < turn.size(); ++i) { |
- cricket::RelayCredentials credentials(turn[i].username, turn[i].password); |
- cricket::RelayServerConfig turn_server(cricket::RELAY_TURN); |
- cricket::ProtocolType protocol; |
- if (cricket::StringToProto(turn[i].transport_type.c_str(), &protocol)) { |
- turn_server.ports.push_back( |
- cricket::ProtocolAddress(turn[i].server, protocol, turn[i].secure)); |
- turn_server.credentials = credentials; |
- // First in the list gets highest priority. |
- turn_server.priority = static_cast<int>(turn.size() - i - 1); |
- allocator->AddTurnServer(turn_server); |
- } else { |
- LOG(LS_WARNING) << "Ignoring TURN server " << turn[i].server << ". " |
- << "Reason= Incorrect " << turn[i].transport_type |
- << " transport parameter."; |
- } |
- } |
- return allocator.release(); |
-} |
- |
-} // namespace webrtc |