mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-12 21:30:45 +01:00
Restore proxy support broken by RingRTC m126 merge fixes
This commit is contained in:
parent
c868f226e4
commit
a5e9692673
2 changed files with 3 additions and 0 deletions
|
@ -282,6 +282,7 @@ BasicPortAllocator::CreateIceGatherer(const std::string& name) {
|
|||
|
||||
// 4. User setters to set flags and other settings
|
||||
new_allocator->set_flags(flags());
|
||||
new_allocator->set_proxy(user_agent(), proxy());
|
||||
new_allocator->SetPortRange(min_port(), max_port());
|
||||
new_allocator->set_max_ipv6_networks(max_ipv6_networks());
|
||||
new_allocator->set_step_delay(step_delay());
|
||||
|
|
|
@ -320,6 +320,8 @@ class InjectableNetworkImpl : public InjectableNetwork, public rtc::NetworkManag
|
|||
rtc::AsyncPacketSocket* CreateClientTcpSocket(
|
||||
const rtc::SocketAddress& local_address,
|
||||
const rtc::SocketAddress& remote_address,
|
||||
const rtc::ProxyInfo& proxy_info,
|
||||
const std::string& user_agent,
|
||||
const rtc::PacketSocketTcpOptions& tcp_options) override {
|
||||
// TODO: Support TCP for TURN
|
||||
return nullptr;
|
||||
|
|
Loading…
Reference in a new issue