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

Unified Diff: talk/app/webrtc/peerconnection.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 side-by-side diff with in-line comments
Download patch
Index: talk/app/webrtc/peerconnection.h
diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h
index bea9c2f61b610c83129c01f76af2f8f1080b57d2..8ebb8994a3a7476975993091c54a9a297421edd7 100644
--- a/talk/app/webrtc/peerconnection.h
+++ b/talk/app/webrtc/peerconnection.h
@@ -30,6 +30,7 @@
#include <string>
+#include "talk/app/webrtc/dtlsidentitystore.h"
#include "talk/app/webrtc/mediastreamsignaling.h"
#include "talk/app/webrtc/peerconnectionfactory.h"
#include "talk/app/webrtc/peerconnectioninterface.h"
@@ -37,6 +38,7 @@
#include "talk/app/webrtc/streamcollection.h"
#include "talk/app/webrtc/webrtcsession.h"
#include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/sslidentity.h"
namespace webrtc {
class MediaStreamHandlerContainer;
@@ -61,8 +63,9 @@ class PeerConnection : public PeerConnectionInterface,
const PeerConnectionInterface::RTCConfiguration& configuration,
const MediaConstraintsInterface* constraints,
PortAllocatorFactoryInterface* allocator_factory,
- DTLSIdentityServiceInterface* dtls_identity_service,
- PeerConnectionObserver* observer);
+ PeerConnectionObserver* observer,
+ DtlsIdentityStoreInterface* dtls_identity_store,
+ rtc::KeyType key_type);
virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams();
virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams();
virtual bool AddStream(MediaStreamInterface* local_stream);
@@ -155,14 +158,6 @@ class PeerConnection : public PeerConnectionInterface,
cricket::BaseSession::State state);
void ChangeSignalingState(SignalingState signaling_state);
- bool DoInitialize(IceTransportsType type,
- const StunConfigurations& stun_config,
- const TurnConfigurations& turn_config,
- const MediaConstraintsInterface* constraints,
- PortAllocatorFactoryInterface* allocator_factory,
- DTLSIdentityServiceInterface* dtls_identity_service,
- PeerConnectionObserver* observer);
hbos 2015/06/12 12:46:55 Declared, not defined. Removing.
-
rtc::Thread* signaling_thread() const {
return factory_->signaling_thread();
}

Powered by Google App Engine
This is Rietveld 408576698