003-connect_using_hostname.patch is no longer needed

This commit is contained in:
Cheng Zhao 2018-01-30 11:39:57 +09:00 коммит произвёл Aleksei Kuzmin
Родитель 33c1d065eb
Коммит c5af73c02f
1 изменённых файлов: 0 добавлений и 24 удалений

Просмотреть файл

@ -1,24 +0,0 @@
diff --git a/p2p/base/turnport.cc b/p2p/base/turnport.cc
index 901516922..52280c4a3 100644
--- a/p2p/base/turnport.cc
+++ b/p2p/base/turnport.cc
@@ -686,7 +686,8 @@ void TurnPort::OnResolveResult(rtc::AsyncResolverInterface* resolver) {
// one of the reason could be due to DNS queries blocked by firewall.
// In such cases we will try to connect to the server with hostname, assuming
// socket layer will resolve the hostname through a HTTP proxy (if any).
- if (resolver_->GetError() != 0 && server_address_.proto == PROTO_TCP) {
+ if (resolver_->GetError() != 0 && (server_address_.proto == PROTO_TCP ||
+ server_address_.proto == PROTO_TLS)) {
if (!CreateTurnClientSocket()) {
OnAllocateError();
}
@@ -805,7 +806,8 @@ void TurnPort::OnMessage(rtc::Message* message) {
// Since it's TCP, we have to delete the connected socket and reconnect
// with the alternate server. PrepareAddress will send stun binding once
// the new socket is connected.
- RTC_DCHECK(server_address().proto == PROTO_TCP);
+ RTC_DCHECK(server_address().proto == PROTO_TCP ||
+ server_address().proto == PROTO_TLS);
RTC_DCHECK(!SharedSocket());
delete socket_;
socket_ = NULL;