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

Side by Side Diff: talk/app/webrtc/dtlscertificate.cc

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Trying to get iOS to compile Created 5 years, 4 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2013 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/audiotrackrenderer.h" 28 #include "talk/app/webrtc/dtlscertificate.h"
29 #include "webrtc/base/common.h" 29
30 #include "webrtc/base/checks.h"
30 31
31 namespace webrtc { 32 namespace webrtc {
32 33
33 AudioTrackRenderer::AudioTrackRenderer() : channel_id_(-1) { 34 rtc::scoped_refptr<DtlsCertificate> DtlsCertificate::Create(
35 rtc::scoped_ptr<rtc::SSLIdentity> identity) {
36 // TODO(hbos): |expires| should be specified (what is the right type for
37 // date?), and maybe tied to the identity generation?
Henrik Grunell WebRTC 2015/08/12 14:46:29 Do you plan on fixing the todo before landing? Not
hbos 2015/08/14 14:09:38 That hints for an integer type, but I think blink
38 return new rtc::RefCountedObject<DtlsCertificate>(identity.release(), 0.0);
Henrik Grunell WebRTC 2015/08/12 14:46:29 identity.Pass()
hbos 2015/08/14 14:09:38 The DtlsCertificate constructor takes SSLIdentity*
34 } 39 }
35 40
36 AudioTrackRenderer::~AudioTrackRenderer() { 41 DtlsCertificate::DtlsCertificate(rtc::SSLIdentity* identity, double expires)
42 : identity_(identity), expires_(expires) {
43 DCHECK(identity_);
37 } 44 }
38 45
39 void AudioTrackRenderer::AddChannel(int channel_id) { 46 DtlsCertificate::~DtlsCertificate() {
40 ASSERT(channel_id_ == -1 || channel_id_ == channel_id);
41 channel_id_ = channel_id;
42 } 47 }
43 48
44 void AudioTrackRenderer::RemoveChannel(int channel_id) { 49 rtc::SSLIdentity* DtlsCertificate::identity() const {
45 ASSERT(channel_id_ == -1 || channel_id_ == channel_id); 50 return identity_.get();
46 channel_id_ = -1; 51 }
52
53 double DtlsCertificate::expires() const {
54 return expires_;
47 } 55 }
48 56
49 } // namespace webrtc 57 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698