Added DtlsCertificate, a ref counted object owning an SSLIdentity

talk/app/webrtc/peerconnectioninterface.h

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 54 matching lines @@
 // 7. Once a candidate have been found PeerConnection will call the observer
 // function OnIceCandidate. Send these candidates to the remote peer.
 
 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
 #define TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
 
 #include <string>
 #include <vector>
 
 #include "talk/app/webrtc/datachannelinterface.h"
+#include "talk/app/webrtc/dtlscertificate.h"
 #include "talk/app/webrtc/dtlsidentitystore.h"
 #include "talk/app/webrtc/dtmfsenderinterface.h"
 #include "talk/app/webrtc/jsep.h"
 #include "talk/app/webrtc/mediastreaminterface.h"
 #include "talk/app/webrtc/statstypes.h"
 #include "talk/app/webrtc/umametrics.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/network.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/base/socketaddress.h"
@@ skipping 443 matching lines @@
     // Sets the maximum supported protocol version. The highest version
     // supported by both ends will be used for the connection, i.e. if one
     // party supports DTLS 1.0 and the other DTLS 1.2, DTLS 1.0 will be used.
     rtc::SSLProtocolVersion ssl_max_version;
   };
 
   virtual void SetOptions(const Options& options) = 0;
 
   // TODO(hbos): Temporary CreatePeerConnection function while we transition
   // from DTLSIdentityServiceInterface to DtlsIdentityStoreInterface.
+  // This method takes the ownership of |dtls_identity_service|.
   rtc::scoped_refptr<PeerConnectionInterface>
       CreatePeerConnection(
           const PeerConnectionInterface::RTCConfiguration& configuration,
           const MediaConstraintsInterface* constraints,
           PortAllocatorFactoryInterface* allocator_factory,
           DTLSIdentityServiceInterface* dtls_identity_service,
           rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
           PeerConnectionObserver* observer) {
     return CreatePeerConnection(configuration, constraints, allocator_factory,
                                 dtls_identity_service, observer);
   }
 
+  // If a |dtls_identity_service| is provided it will be used for
+  // SSLIdentity/DtlsCertificate generation, otherwise a default service will be
+  // used.
   // This method takes the ownership of |dtls_identity_service|.
   virtual rtc::scoped_refptr<PeerConnectionInterface>
       CreatePeerConnection(
           const PeerConnectionInterface::RTCConfiguration& configuration,
           const MediaConstraintsInterface* constraints,
           PortAllocatorFactoryInterface* allocator_factory,
           DTLSIdentityServiceInterface* dtls_identity_service,
           PeerConnectionObserver* observer) = 0;
 
+  // With the |certificate| already generated, this version of
+  // CreatePeerConnection can skip the need to generate
+  // SSLIdentity/DtlsCertificate. |certificate| must not be a null reference.
+  virtual rtc::scoped_refptr<PeerConnectionInterface>
+      CreatePeerConnection(
+          const PeerConnectionInterface::RTCConfiguration& configuration,
+          const MediaConstraintsInterface* constraints,
+          PortAllocatorFactoryInterface* allocator_factory,
+          rtc::scoped_refptr<DtlsCertificate> certificate,
+          PeerConnectionObserver* observer) = 0;
+
   // TODO(mallinath) : Remove below versions after clients are updated
   // to above method.
   // In latest W3C WebRTC draft, PC constructor will take RTCConfiguration,
   // and not IceServers. RTCConfiguration is made up of ice servers and
   // ice transport type.
   // http://dev.w3.org/2011/webrtc/editor/webrtc.html
   inline rtc::scoped_refptr<PeerConnectionInterface>
       CreatePeerConnection(
           const PeerConnectionInterface::IceServers& servers,
           const MediaConstraintsInterface* constraints,
@@ skipping 57 matching lines @@
 CreatePeerConnectionFactory(
     rtc::Thread* worker_thread,
     rtc::Thread* signaling_thread,
     AudioDeviceModule* default_adm,
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory);
 
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_