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/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 456 matching lines @@
     int network_ignore_mask;
 
     // 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): Remove default implementation when all child classes use this
+  // new function signature.

[Henrik Grunell WebRTC, 2015/08/05 07:41:20]

Can that be done right away? If not, when is that planned to be done? Would be
nice to skip the intermediate step if possible.

[hbos, 2015/08/06 12:11:34]

Removing this function and the the blocking identity generation in favor of
allowing DTLSIdentityServiceInterface* to be used just like prior to this patch.
This CL will be backwards-compatible with how it was before, the new certificate
parameter being an optional parameter. Only if a cert is specified do we skip
identity generation in WebRtcSessionDescriptionFactory, otherwise it will
functionally be the same as before.

[Henrik Grunell WebRTC, 2015/08/06 14:06:52]

Acknowledged.

+  virtual rtc::scoped_refptr<PeerConnectionInterface>
+        CreatePeerConnection(
+            const PeerConnectionInterface::RTCConfiguration& configuration,
+            const MediaConstraintsInterface* constraints,
+            PortAllocatorFactoryInterface* allocator_factory,
+            rtc::scoped_refptr<DtlsCertificate> certificate,
+            PeerConnectionObserver* observer) {
+    return nullptr;
+  }
+
   // This method takes the ownership of |dtls_identity_service|.
+  // --- Deprecated. ---
+  // TODO(hbos): Remove this function signature in favor of the one taking
+  // DtlsCertificate input.
   virtual rtc::scoped_refptr<PeerConnectionInterface>
       CreatePeerConnection(
           const PeerConnectionInterface::RTCConfiguration& configuration,
           const MediaConstraintsInterface* constraints,
           PortAllocatorFactoryInterface* allocator_factory,
           DTLSIdentityServiceInterface* dtls_identity_service,
           PeerConnectionObserver* observer) = 0;
 
   // TODO(mallinath) : Remove below versions after clients are updated
   // to above method.
@@ skipping 65 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_