Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: webrtc/p2p/client/basicportallocator.cc

Issue 2766063005: Revert of Removing HTTPS and SOCKS proxy server code. (Closed)
Patch Set: Merge with master Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/p2p/base/relayport.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 void BasicPortAllocatorSession::AddAllocatedPort(Port* port, 692 void BasicPortAllocatorSession::AddAllocatedPort(Port* port,
693 AllocationSequence * seq, 693 AllocationSequence * seq,
694 bool prepare_address) { 694 bool prepare_address) {
695 if (!port) 695 if (!port)
696 return; 696 return;
697 697
698 LOG(LS_INFO) << "Adding allocated port for " << content_name(); 698 LOG(LS_INFO) << "Adding allocated port for " << content_name();
699 port->set_content_name(content_name()); 699 port->set_content_name(content_name());
700 port->set_component(component()); 700 port->set_component(component());
701 port->set_generation(generation()); 701 port->set_generation(generation());
702 if (allocator_->proxy().type != rtc::PROXY_NONE)
703 port->set_proxy(allocator_->user_agent(), allocator_->proxy());
702 port->set_send_retransmit_count_attribute( 704 port->set_send_retransmit_count_attribute(
703 (flags() & PORTALLOCATOR_ENABLE_STUN_RETRANSMIT_ATTRIBUTE) != 0); 705 (flags() & PORTALLOCATOR_ENABLE_STUN_RETRANSMIT_ATTRIBUTE) != 0);
704 706
705 PortData data(port, seq); 707 PortData data(port, seq);
706 ports_.push_back(data); 708 ports_.push_back(data);
707 709
708 port->SignalCandidateReady.connect( 710 port->SignalCandidateReady.connect(
709 this, &BasicPortAllocatorSession::OnCandidateReady); 711 this, &BasicPortAllocatorSession::OnCandidateReady);
710 port->SignalPortComplete.connect(this, 712 port->SignalPortComplete.connect(this,
711 &BasicPortAllocatorSession::OnPortComplete); 713 &BasicPortAllocatorSession::OnPortComplete);
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 ServerAddresses servers; 1527 ServerAddresses servers;
1526 for (size_t i = 0; i < relays.size(); ++i) { 1528 for (size_t i = 0; i < relays.size(); ++i) {
1527 if (relays[i].type == turn_type && SupportsProtocol(relays[i], type)) { 1529 if (relays[i].type == turn_type && SupportsProtocol(relays[i], type)) {
1528 servers.insert(relays[i].ports.front().address); 1530 servers.insert(relays[i].ports.front().address);
1529 } 1531 }
1530 } 1532 }
1531 return servers; 1533 return servers;
1532 } 1534 }
1533 1535
1534 } // namespace cricket 1536 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/relayport.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698