Index: webrtc/p2p/base/relayport.cc |
diff --git a/webrtc/p2p/base/relayport.cc b/webrtc/p2p/base/relayport.cc |
index 795fa5aad4647dcfde0d199630f60d0e2d83bd3c..3187ada399cc8ee6fb3b103a1148315d11cf4ad5 100644 |
--- a/webrtc/p2p/base/relayport.cc |
+++ b/webrtc/p2p/base/relayport.cc |
@@ -209,15 +209,7 @@ RelayPort::~RelayPort() { |
} |
void RelayPort::AddServerAddress(const ProtocolAddress& addr) { |
- // Since HTTP proxies usually only allow 443, |
- // let's up the priority on PROTO_SSLTCP |
- if (addr.proto == PROTO_SSLTCP && |
- (proxy().type == rtc::PROXY_HTTPS || |
- proxy().type == rtc::PROXY_UNKNOWN)) { |
- server_addr_.push_front(addr); |
- } else { |
- server_addr_.push_back(addr); |
- } |
pthatcher1
2016/12/07 21:29:35
Why did you both changing this? RelayPort is depr
hnsl1
2016/12/12 16:08:13
Done.
|
+ server_addr_.push_back(addr); |
} |
void RelayPort::AddExternalAddress(const ProtocolAddress& addr) { |
@@ -243,8 +235,8 @@ void RelayPort::SetReady() { |
// This is due to as mapped address stun attribute is used for allocated |
// address. |
AddAddress(iter->address, iter->address, rtc::SocketAddress(), proto_name, |
- proto_name, "", RELAY_PORT_TYPE, ICE_TYPE_PREFERENCE_RELAY, 0, |
- false); |
+ proto_name, "", RELAY_PORT_TYPE, ICE_TYPE_PREFERENCE_RELAY_UDP, |
+ 0, false); |
} |
ready_ = true; |
SignalPortComplete(this); |