46fb331bc5
Now UDPPort signals PortComplete or PortError when the Bind requests for all STUN servers are responded or failed. If any STUN bind is successful, PortComplete is signaled; otherwise, PortError is signaled. I discovered a bug in SocketAddress while working on this. It didn't consider two addresses unequal if they have unresolved IP and different hosts. It's fixed now. BUG=3310 R=mallinath@webrtc.org Review URL: https://webrtc-codereview.appspot.com/13879004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6707 4adac7df-926f-26a2-2b94-8c16560cd09d
87 lines
3.6 KiB
C++
87 lines
3.6 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2004--2011, Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "talk/app/webrtc/portallocatorfactory.h"
|
|
|
|
#include "talk/base/logging.h"
|
|
#include "talk/base/network.h"
|
|
#include "talk/base/thread.h"
|
|
#include "talk/p2p/base/basicpacketsocketfactory.h"
|
|
#include "talk/p2p/client/basicportallocator.h"
|
|
|
|
namespace webrtc {
|
|
|
|
using talk_base::scoped_ptr;
|
|
|
|
talk_base::scoped_refptr<PortAllocatorFactoryInterface>
|
|
PortAllocatorFactory::Create(
|
|
talk_base::Thread* worker_thread) {
|
|
talk_base::RefCountedObject<PortAllocatorFactory>* allocator =
|
|
new talk_base::RefCountedObject<PortAllocatorFactory>(worker_thread);
|
|
return allocator;
|
|
}
|
|
|
|
PortAllocatorFactory::PortAllocatorFactory(talk_base::Thread* worker_thread)
|
|
: network_manager_(new talk_base::BasicNetworkManager()),
|
|
socket_factory_(new talk_base::BasicPacketSocketFactory(worker_thread)) {
|
|
}
|
|
|
|
PortAllocatorFactory::~PortAllocatorFactory() {}
|
|
|
|
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 relay_server(cricket::RELAY_TURN);
|
|
cricket::ProtocolType protocol;
|
|
if (cricket::StringToProto(turn[i].transport_type.c_str(), &protocol)) {
|
|
relay_server.ports.push_back(cricket::ProtocolAddress(
|
|
turn[i].server, protocol, turn[i].secure));
|
|
relay_server.credentials = credentials;
|
|
allocator->AddRelay(relay_server);
|
|
} else {
|
|
LOG(LS_WARNING) << "Ignoring TURN server " << turn[i].server << ". "
|
|
<< "Reason= Incorrect " << turn[i].transport_type
|
|
<< " transport parameter.";
|
|
}
|
|
}
|
|
return allocator.release();
|
|
}
|
|
|
|
} // namespace webrtc
|