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

Side by Side Diff: webrtc/p2p/base/portallocator.cc

Issue 1982513002: Revert of Relanding: Implement RTCConfiguration.iceCandidatePoolSize. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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/portallocator.h ('k') | webrtc/p2p/base/portallocator_unittest.cc » ('j') | 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
11 #include "webrtc/base/checks.h" 11 #include "webrtc/base/checks.h"
12 #include "webrtc/p2p/base/portallocator.h" 12 #include "webrtc/p2p/base/portallocator.h"
13 13
14 namespace cricket { 14 namespace cricket {
15 15
16 PortAllocatorSession::PortAllocatorSession(const std::string& content_name, 16 PortAllocatorSession::PortAllocatorSession(const std::string& content_name,
17 int component, 17 int component,
18 const std::string& ice_ufrag, 18 const std::string& ice_ufrag,
19 const std::string& ice_pwd, 19 const std::string& ice_pwd,
20 uint32_t flags) 20 uint32_t flags)
21 : flags_(flags), 21 : content_name_(content_name),
22 component_(component),
23 flags_(flags),
22 generation_(0), 24 generation_(0),
23 content_name_(content_name),
24 component_(component),
25 ice_ufrag_(ice_ufrag), 25 ice_ufrag_(ice_ufrag),
26 ice_pwd_(ice_pwd) { 26 ice_pwd_(ice_pwd) {
27 // Pooled sessions are allowed to be created with empty content name, 27 RTC_DCHECK(!ice_ufrag.empty());
28 // component, ufrag and password. 28 RTC_DCHECK(!ice_pwd.empty());
29 RTC_DCHECK(ice_ufrag.empty() == ice_pwd.empty());
30 } 29 }
31 30
32 void PortAllocator::SetConfiguration( 31 PortAllocatorSession* PortAllocator::CreateSession(
33 const ServerAddresses& stun_servers,
34 const std::vector<RelayServerConfig>& turn_servers,
35 int candidate_pool_size) {
36 bool ice_servers_changed =
37 (stun_servers != stun_servers_ || turn_servers != turn_servers_);
38 stun_servers_ = stun_servers;
39 turn_servers_ = turn_servers;
40
41 // If ICE servers changed, throw away any existing pooled sessions and create
42 // new ones.
43 if (ice_servers_changed) {
44 pooled_sessions_.clear();
45 allocated_pooled_session_count_ = 0;
46 }
47
48 // If |size| is less than the number of allocated sessions, get rid of the
49 // extras.
50 while (allocated_pooled_session_count_ > candidate_pool_size &&
51 !pooled_sessions_.empty()) {
52 pooled_sessions_.front().reset(nullptr);
53 pooled_sessions_.pop_front();
54 --allocated_pooled_session_count_;
55 }
56 // If |size| is greater than the number of allocated sessions, create new
57 // sessions.
58 while (allocated_pooled_session_count_ < candidate_pool_size) {
59 PortAllocatorSession* pooled_session = CreateSessionInternal("", 0, "", "");
60 pooled_session->StartGettingPorts();
61 pooled_sessions_.push_back(
62 std::unique_ptr<PortAllocatorSession>(pooled_session));
63 ++allocated_pooled_session_count_;
64 }
65 target_pooled_session_count_ = candidate_pool_size;
66 }
67
68 std::unique_ptr<PortAllocatorSession> PortAllocator::CreateSession(
69 const std::string& sid, 32 const std::string& sid,
70 const std::string& content_name, 33 const std::string& content_name,
71 int component, 34 int component,
72 const std::string& ice_ufrag, 35 const std::string& ice_ufrag,
73 const std::string& ice_pwd) { 36 const std::string& ice_pwd) {
74 return std::unique_ptr<PortAllocatorSession>( 37 return CreateSessionInternal(content_name, component, ice_ufrag, ice_pwd);
75 CreateSessionInternal(content_name, component, ice_ufrag, ice_pwd));
76 }
77
78 std::unique_ptr<PortAllocatorSession> PortAllocator::TakePooledSession(
79 const std::string& content_name,
80 int component,
81 const std::string& ice_ufrag,
82 const std::string& ice_pwd) {
83 RTC_DCHECK(!ice_ufrag.empty());
84 RTC_DCHECK(!ice_pwd.empty());
85 if (pooled_sessions_.empty()) {
86 return nullptr;
87 }
88 std::unique_ptr<PortAllocatorSession> ret =
89 std::move(pooled_sessions_.front());
90 ret->SetIceParameters(content_name, component, ice_ufrag, ice_pwd);
91 pooled_sessions_.pop_front();
92 return ret;
93 }
94
95 const PortAllocatorSession* PortAllocator::GetPooledSession() const {
96 if (pooled_sessions_.empty()) {
97 return nullptr;
98 }
99 return pooled_sessions_.front().get();
100 } 38 }
101 39
102 } // namespace cricket 40 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/portallocator.h ('k') | webrtc/p2p/base/portallocator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698