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

Side by Side Diff: talk/app/webrtc/webrtcsession.h

Issue 1151943005: Ability to specify KeyType (RSA, ECDSA) for SSLIdentity generation in libjingle (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressing ASAN, LSAN issues in unittests Created 5 years, 6 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 2012 Google Inc. 3 * Copyright 2012 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,
(...skipping 21 matching lines...) Expand all
32 32
33 #include "talk/app/webrtc/datachannel.h" 33 #include "talk/app/webrtc/datachannel.h"
34 #include "talk/app/webrtc/dtmfsender.h" 34 #include "talk/app/webrtc/dtmfsender.h"
35 #include "talk/app/webrtc/mediastreamprovider.h" 35 #include "talk/app/webrtc/mediastreamprovider.h"
36 #include "talk/app/webrtc/peerconnectioninterface.h" 36 #include "talk/app/webrtc/peerconnectioninterface.h"
37 #include "talk/app/webrtc/statstypes.h" 37 #include "talk/app/webrtc/statstypes.h"
38 #include "talk/media/base/mediachannel.h" 38 #include "talk/media/base/mediachannel.h"
39 #include "webrtc/p2p/base/session.h" 39 #include "webrtc/p2p/base/session.h"
40 #include "talk/session/media/mediasession.h" 40 #include "talk/session/media/mediasession.h"
41 #include "webrtc/base/sigslot.h" 41 #include "webrtc/base/sigslot.h"
42 #include "webrtc/base/sslidentity.h"
42 #include "webrtc/base/thread.h" 43 #include "webrtc/base/thread.h"
43 44
44 namespace cricket { 45 namespace cricket {
45 46
46 class BaseChannel; 47 class BaseChannel;
47 class ChannelManager; 48 class ChannelManager;
48 class DataChannel; 49 class DataChannel;
49 class StatsReport; 50 class StatsReport;
50 class Transport; 51 class Transport;
51 class VideoCapturer; 52 class VideoCapturer;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 WebRtcSession(cricket::ChannelManager* channel_manager, 114 WebRtcSession(cricket::ChannelManager* channel_manager,
114 rtc::Thread* signaling_thread, 115 rtc::Thread* signaling_thread,
115 rtc::Thread* worker_thread, 116 rtc::Thread* worker_thread,
116 cricket::PortAllocator* port_allocator, 117 cricket::PortAllocator* port_allocator,
117 MediaStreamSignaling* mediastream_signaling); 118 MediaStreamSignaling* mediastream_signaling);
118 virtual ~WebRtcSession(); 119 virtual ~WebRtcSession();
119 120
120 bool Initialize( 121 bool Initialize(
121 const PeerConnectionFactoryInterface::Options& options, 122 const PeerConnectionFactoryInterface::Options& options,
122 const MediaConstraintsInterface* constraints, 123 const MediaConstraintsInterface* constraints,
123 DTLSIdentityServiceInterface* dtls_identity_service, 124 const PeerConnectionInterface::RTCConfiguration& rtc_configuration,
124 const PeerConnectionInterface::RTCConfiguration& rtc_configuration); 125 DtlsIdentityStoreInterface* dtls_identity_store,
126 rtc::KeyType key_type);
125 // Deletes the voice, video and data channel and changes the session state 127 // Deletes the voice, video and data channel and changes the session state
126 // to STATE_RECEIVEDTERMINATE. 128 // to STATE_RECEIVEDTERMINATE.
127 void Terminate(); 129 void Terminate();
128 130
129 void RegisterIceObserver(IceObserver* observer) { 131 void RegisterIceObserver(IceObserver* observer) {
130 ice_observer_ = observer; 132 ice_observer_ = observer;
131 } 133 }
132 134
133 virtual cricket::VoiceChannel* voice_channel() { 135 virtual cricket::VoiceChannel* voice_channel() {
134 return voice_channel_.get(); 136 return voice_channel_.get();
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 PeerConnectionInterface::BundlePolicy bundle_policy_; 416 PeerConnectionInterface::BundlePolicy bundle_policy_;
415 417
416 // Declares the RTCP mux policy for the WebRTCSession. 418 // Declares the RTCP mux policy for the WebRTCSession.
417 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 419 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
418 420
419 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 421 DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
420 }; 422 };
421 } // namespace webrtc 423 } // namespace webrtc
422 424
423 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 425 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698