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

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

Issue 2757893003: Add MakeUnique from chromium and change StunMessage::AddAttribute to take a unique_ptr. (Closed)
Patch Set: add ptr_util.h to rtc_base_approved build target 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/stun_unittest.cc ('k') | webrtc/p2p/base/stunserver.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/p2p/base/stunrequest.h" 11 #include "webrtc/p2p/base/stunrequest.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/base/checks.h" 16 #include "webrtc/base/checks.h"
17 #include "webrtc/base/helpers.h" 17 #include "webrtc/base/helpers.h"
18 #include "webrtc/base/logging.h" 18 #include "webrtc/base/logging.h"
19 #include "webrtc/base/ptr_util.h"
19 #include "webrtc/base/stringencode.h" 20 #include "webrtc/base/stringencode.h"
20 21
21 namespace cricket { 22 namespace cricket {
22 23
23 const uint32_t MSG_STUN_SEND = 1; 24 const uint32_t MSG_STUN_SEND = 1;
24 25
25 // RFC 5389 says SHOULD be 500ms. 26 // RFC 5389 says SHOULD be 500ms.
26 // For years, this was 100ms, but for networks that 27 // For years, this was 100ms, but for networks that
27 // experience moments of high RTT (such as 2G networks), this doesn't 28 // experience moments of high RTT (such as 2G networks), this doesn't
28 // work well. 29 // work well.
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 if (manager_) { 183 if (manager_) {
183 manager_->Remove(this); 184 manager_->Remove(this);
184 manager_->thread_->Clear(this); 185 manager_->thread_->Clear(this);
185 } 186 }
186 delete msg_; 187 delete msg_;
187 } 188 }
188 189
189 void StunRequest::Construct() { 190 void StunRequest::Construct() {
190 if (msg_->type() == 0) { 191 if (msg_->type() == 0) {
191 if (!origin_.empty()) { 192 if (!origin_.empty()) {
192 msg_->AddAttribute(new StunByteStringAttribute(STUN_ATTR_ORIGIN, 193 msg_->AddAttribute(
193 origin_)); 194 rtc::MakeUnique<StunByteStringAttribute>(STUN_ATTR_ORIGIN, origin_));
194 } 195 }
195 Prepare(msg_); 196 Prepare(msg_);
196 RTC_DCHECK(msg_->type() != 0); 197 RTC_DCHECK(msg_->type() != 0);
197 } 198 }
198 } 199 }
199 200
200 int StunRequest::type() { 201 int StunRequest::type() {
201 RTC_DCHECK(msg_ != NULL); 202 RTC_DCHECK(msg_ != NULL);
202 return msg_->type(); 203 return msg_->type();
203 } 204 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 int StunRequest::resend_delay() { 251 int StunRequest::resend_delay() {
251 if (count_ == 0) { 252 if (count_ == 0) {
252 return 0; 253 return 0;
253 } 254 }
254 int retransmissions = (count_ - 1); 255 int retransmissions = (count_ - 1);
255 int rto = STUN_INITIAL_RTO << retransmissions; 256 int rto = STUN_INITIAL_RTO << retransmissions;
256 return std::min(rto, STUN_MAX_RTO); 257 return std::min(rto, STUN_MAX_RTO);
257 } 258 }
258 259
259 } // namespace cricket 260 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/stun_unittest.cc ('k') | webrtc/p2p/base/stunserver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698