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

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

Issue 1353713002: Remove GICE (again). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Undo .gclient Created 5 years, 3 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/portinterface.h » ('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/p2p/base/portallocator.h" 11 #include "webrtc/p2p/base/portallocator.h"
12 12
13 namespace cricket { 13 namespace cricket {
14 14
15 PortAllocatorSession::PortAllocatorSession(const std::string& content_name, 15 PortAllocatorSession::PortAllocatorSession(const std::string& content_name,
16 int component, 16 int component,
17 const std::string& ice_ufrag, 17 const std::string& ice_ufrag,
18 const std::string& ice_pwd, 18 const std::string& ice_pwd,
19 uint32 flags) 19 uint32 flags)
20 : content_name_(content_name), 20 : content_name_(content_name),
21 component_(component), 21 component_(component),
22 flags_(flags), 22 flags_(flags),
23 generation_(0), 23 generation_(0),
24 // If PORTALLOCATOR_ENABLE_SHARED_UFRAG flag is not enabled, ignore the 24 username_(ice_ufrag),
25 // incoming ufrag and pwd, which will cause each Port to generate one 25 password_(ice_pwd) {
26 // by itself.
27 username_(flags_ & PORTALLOCATOR_ENABLE_SHARED_UFRAG ? ice_ufrag : ""),
28 password_(flags_ & PORTALLOCATOR_ENABLE_SHARED_UFRAG ? ice_pwd : "") {
29 } 26 }
30 27
31 PortAllocatorSession* PortAllocator::CreateSession( 28 PortAllocatorSession* PortAllocator::CreateSession(
32 const std::string& sid, 29 const std::string& sid,
33 const std::string& content_name, 30 const std::string& content_name,
34 int component, 31 int component,
35 const std::string& ice_ufrag, 32 const std::string& ice_ufrag,
36 const std::string& ice_pwd) { 33 const std::string& ice_pwd) {
37 return CreateSessionInternal(content_name, component, ice_ufrag, ice_pwd); 34 return CreateSessionInternal(content_name, component, ice_ufrag, ice_pwd);
38 } 35 }
39 36
40 } // namespace cricket 37 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/portallocator.h ('k') | webrtc/p2p/base/portinterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698