Replacing SSLIdentity* with scoped_refptr<RTCCertificate> in TransportChannel layer

webrtc/p2p/base/fakesession.h

 /*
  *  Copyright 2009 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 29 matching lines @@
 // SetDestination.
 // TODO(hbos): Move implementation to .cc file, this and other classes in file.
 class FakeTransportChannel : public TransportChannelImpl,
                              public rtc::MessageHandler {
  public:
   explicit FakeTransportChannel(Transport* transport,
                                 const std::string& content_name,
                                 int component)
       : TransportChannelImpl(content_name, component),
         transport_(transport),
-        dest_(NULL),
+        dest_(nullptr),
         state_(STATE_INIT),
         async_(false),
-        identity_(NULL),
         do_dtls_(false),
         role_(ICEROLE_UNKNOWN),
         tiebreaker_(0),
         remote_ice_mode_(ICEMODE_FULL),
-        dtls_fingerprint_("", NULL, 0),
+        dtls_fingerprint_("", nullptr, 0),
         ssl_role_(rtc::SSL_CLIENT),
         connection_count_(0) {
   }
   ~FakeTransportChannel() {
     Reset();
   }
 
   uint64 IceTiebreaker() const { return tiebreaker_; }
   IceMode remote_ice_mode() const { return remote_ice_mode_; }
   const std::string& ice_ufrag() const { return ice_ufrag_; }
   const std::string& ice_pwd() const { return ice_pwd_; }
   const std::string& remote_ice_ufrag() const { return remote_ice_ufrag_; }
   const std::string& remote_ice_pwd() const { return remote_ice_pwd_; }
   const rtc::SSLFingerprint& dtls_fingerprint() const {
     return dtls_fingerprint_;
   }
 
   void SetAsync(bool async) {
     async_ = async;
   }
 
-  virtual Transport* GetTransport() {
+  Transport* GetTransport() override {
     return transport_;
   }
 
-  virtual TransportChannelState GetState() const {
+  TransportChannelState GetState() const override {
     if (connection_count_ == 0) {
       return TransportChannelState::STATE_FAILED;
     }
 
     if (connection_count_ == 1) {
       return TransportChannelState::STATE_COMPLETED;
     }
 
     return TransportChannelState::STATE_FAILED;
   }
 
-  virtual void SetIceRole(IceRole role) { role_ = role; }
-  virtual IceRole GetIceRole() const { return role_; }
-  virtual void SetIceTiebreaker(uint64 tiebreaker) { tiebreaker_ = tiebreaker; }
-  virtual void SetIceCredentials(const std::string& ice_ufrag,
-                                 const std::string& ice_pwd) {
+  void SetIceRole(IceRole role) override { role_ = role; }
+  IceRole GetIceRole() const override { return role_; }
+  void SetIceTiebreaker(uint64 tiebreaker) override {
+    tiebreaker_ = tiebreaker;
+  }
+  void SetIceCredentials(const std::string& ice_ufrag,
+                         const std::string& ice_pwd) override {
     ice_ufrag_ = ice_ufrag;
     ice_pwd_ = ice_pwd;
   }
-  virtual void SetRemoteIceCredentials(const std::string& ice_ufrag,
-                                       const std::string& ice_pwd) {
+  void SetRemoteIceCredentials(const std::string& ice_ufrag,
+                               const std::string& ice_pwd) override {
     remote_ice_ufrag_ = ice_ufrag;
     remote_ice_pwd_ = ice_pwd;
   }
 
-  virtual void SetRemoteIceMode(IceMode mode) { remote_ice_mode_ = mode; }
-  virtual bool SetRemoteFingerprint(const std::string& alg, const uint8* digest,
-                                    size_t digest_len) {
+  void SetRemoteIceMode(IceMode mode) override { remote_ice_mode_ = mode; }
+  bool SetRemoteFingerprint(const std::string& alg, const uint8* digest,
+                            size_t digest_len) override {
     dtls_fingerprint_ = rtc::SSLFingerprint(alg, digest, digest_len);
     return true;
   }
-  virtual bool SetSslRole(rtc::SSLRole role) {
+  bool SetSslRole(rtc::SSLRole role) override {
     ssl_role_ = role;
     return true;
   }
-  virtual bool GetSslRole(rtc::SSLRole* role) const {
+  bool GetSslRole(rtc::SSLRole* role) const override {
     *role = ssl_role_;
     return true;
   }
 
-  virtual void Connect() {
+  void Connect() override {
     if (state_ == STATE_INIT) {
       state_ = STATE_CONNECTING;
     }
   }
   virtual void Reset() {
     if (state_ != STATE_INIT) {
       state_ = STATE_INIT;
       if (dest_) {
         dest_->state_ = STATE_INIT;
         dest_->dest_ = NULL;
         dest_ = NULL;
       }
     }
   }
 
   void SetWritable(bool writable) {
     set_writable(writable);
   }
 
   void SetDestination(FakeTransportChannel* dest) {
     if (state_ == STATE_CONNECTING && dest) {
       // This simulates the delivery of candidates.
       dest_ = dest;
       dest_->dest_ = this;
-      if (identity_ && dest_->identity_) {
+      if (certificate_ && dest_->certificate_) {
         do_dtls_ = true;
         dest_->do_dtls_ = true;
         NegotiateSrtpCiphers();
       }
       state_ = STATE_CONNECTED;
       dest_->state_ = STATE_CONNECTED;
       set_writable(true);
       dest_->set_writable(true);
     } else if (state_ == STATE_CONNECTED && !dest) {
       // Simulates loss of connectivity, by asymmetrically forgetting dest_.
       dest_ = NULL;
       state_ = STATE_CONNECTING;
       set_writable(false);
     }
   }
 
   void SetConnectionCount(size_t connection_count) {
     size_t old_connection_count = connection_count_;
     connection_count_ = connection_count;
     if (connection_count_ < old_connection_count)
       SignalConnectionRemoved(this);
   }
 
   void SetReceiving(bool receiving) {
     set_receiving(receiving);
   }
 
   void SetReceivingTimeout(int timeout) override {}
 
-  virtual int SendPacket(const char* data, size_t len,
-                         const rtc::PacketOptions& options, int flags) {
+  int SendPacket(const char* data, size_t len,
+                 const rtc::PacketOptions& options, int flags) override {
     if (state_ != STATE_CONNECTED) {
       return -1;
     }
 
     if (flags != PF_SRTP_BYPASS && flags != 0) {
       return -1;
     }
 
     PacketMessageData* packet = new PacketMessageData(data, len);
     if (async_) {
       rtc::Thread::Current()->Post(this, 0, packet);
     } else {
       rtc::Thread::Current()->Send(this, 0, packet);
     }
     return static_cast<int>(len);
   }
-  virtual int SetOption(rtc::Socket::Option opt, int value) {
+  int SetOption(rtc::Socket::Option opt, int value) override {
     return true;
   }
-  virtual bool GetOption(rtc::Socket::Option opt, int* value) {
+  bool GetOption(rtc::Socket::Option opt, int* value) override {
     return true;
   }
-  virtual int GetError() {
+  int GetError() override {
     return 0;
   }
 
-  virtual void OnSignalingReady() {
+  void OnSignalingReady() override {
   }
-  virtual void OnCandidate(const Candidate& candidate) {
+  void OnCandidate(const Candidate& candidate) override {
   }
 
-  virtual void OnMessage(rtc::Message* msg) {
+  void OnMessage(rtc::Message* msg) override {
     PacketMessageData* data = static_cast<PacketMessageData*>(
         msg->pdata);
     dest_->SignalReadPacket(dest_, data->packet.data<char>(),
                             data->packet.size(), rtc::CreatePacketTime(0), 0);
     delete data;
   }
 
-  bool SetLocalIdentity(rtc::SSLIdentity* identity) {
-    identity_ = identity;
+  bool SetLocalCertificate(
+      const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) override {
+    certificate_ = certificate;
     return true;
   }
 
-
-  void SetRemoteCertificate(rtc::FakeSSLCertificate* cert) {
+  void SetRemoteSSLCertificate(rtc::FakeSSLCertificate* cert) {
     remote_cert_ = cert;
   }
 
-  virtual bool IsDtlsActive() const {
+  bool IsDtlsActive() const override {
     return do_dtls_;
   }
 
-  virtual bool SetSrtpCiphers(const std::vector<std::string>& ciphers) {
+  bool SetSrtpCiphers(const std::vector<std::string>& ciphers) override {
     srtp_ciphers_ = ciphers;
     return true;
   }
 
-  virtual bool GetSrtpCipher(std::string* cipher) {
+  bool GetSrtpCipher(std::string* cipher) override {
     if (!chosen_srtp_cipher_.empty()) {
       *cipher = chosen_srtp_cipher_;
       return true;
     }
     return false;
   }
 
-  virtual bool GetSslCipher(std::string* cipher) {
+  bool GetSslCipher(std::string* cipher) override {
     return false;
   }
 
-  virtual bool GetLocalIdentity(rtc::SSLIdentity** identity) const {
-    if (!identity_)
-      return false;
-
-    *identity = identity_->GetReference();
-    return true;
+  rtc::scoped_refptr<rtc::RTCCertificate>
+  GetLocalCertificate() const override {
+    return certificate_;
   }
 
-  virtual bool GetRemoteCertificate(rtc::SSLCertificate** cert) const {
+  bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const override {
     if (!remote_cert_)
       return false;
 
     *cert = remote_cert_->GetReference();
     return true;
   }
 
-  virtual bool ExportKeyingMaterial(const std::string& label,
-                                    const uint8* context,
-                                    size_t context_len,
-                                    bool use_context,
-                                    uint8* result,
-                                    size_t result_len) {
+  bool ExportKeyingMaterial(const std::string& label,
+                            const uint8* context,
+                            size_t context_len,
+                            bool use_context,
+                            uint8* result,
+                            size_t result_len) override {
     if (!chosen_srtp_cipher_.empty()) {
       memset(result, 0xff, result_len);
       return true;
     }
 
     return false;
   }
 
   virtual void NegotiateSrtpCiphers() {
     for (std::vector<std::string>::const_iterator it1 = srtp_ciphers_.begin();
@@ skipping 16 matching lines @@
     infos->push_back(info);
     return true;
   }
 
  private:
   enum State { STATE_INIT, STATE_CONNECTING, STATE_CONNECTED };
   Transport* transport_;
   FakeTransportChannel* dest_;
   State state_;
   bool async_;
-  rtc::SSLIdentity* identity_;
+  rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
   rtc::FakeSSLCertificate* remote_cert_;
   bool do_dtls_;
   std::vector<std::string> srtp_ciphers_;
   std::string chosen_srtp_cipher_;
   IceRole role_;
   uint64 tiebreaker_;
   std::string ice_ufrag_;
   std::string ice_pwd_;
   std::string remote_ice_ufrag_;
   std::string remote_ice_pwd_;
@@ skipping 22 matching lines @@
     DestroyAllChannels();
   }
 
   const ChannelMap& channels() const { return channels_; }
 
   void SetAsync(bool async) { async_ = async; }
   void SetDestination(FakeTransport* dest) {
     dest_ = dest;
     for (ChannelMap::iterator it = channels_.begin(); it != channels_.end();
          ++it) {
-      // TODO(hbos): SetLocalCertificate
-      it->second->SetLocalIdentity(
-          certificate_ ? certificate_->identity() : nullptr);
+      it->second->SetLocalCertificate(certificate_);
       SetChannelDestination(it->first, it->second);
     }
   }
 
   void SetWritable(bool writable) {
     for (ChannelMap::iterator it = channels_.begin(); it != channels_.end();
          ++it) {
       it->second->SetWritable(writable);
     }
   }
 
   void set_certificate(
       const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) {
     certificate_ = certificate;
   }
 
   using Transport::local_description;
   using Transport::remote_description;
 
  protected:
-  virtual TransportChannelImpl* CreateTransportChannel(int component) {
+  TransportChannelImpl* CreateTransportChannel(int component) override {
     if (channels_.find(component) != channels_.end()) {
       return NULL;
     }
     FakeTransportChannel* channel =
         new FakeTransportChannel(this, content_name(), component);
     channel->SetAsync(async_);
     SetChannelDestination(component, channel);
     channels_[component] = channel;
     return channel;
   }
-  virtual void DestroyTransportChannel(TransportChannelImpl* channel) {
+  void DestroyTransportChannel(TransportChannelImpl* channel) override {
     channels_.erase(channel->component());
     delete channel;
   }
   void SetCertificate_w(
       const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) override {
     certificate_ = certificate;
   }
   bool GetCertificate_w(
       rtc::scoped_refptr<rtc::RTCCertificate>* certificate) override {
     if (!certificate_)
       return false;
 
     *certificate = certificate_;
     return true;
   }
 
  private:
   FakeTransportChannel* GetFakeChannel(int component) {
     ChannelMap::iterator it = channels_.find(component);
     return (it != channels_.end()) ? it->second : NULL;
   }
   void SetChannelDestination(int component,
                              FakeTransportChannel* channel) {
     FakeTransportChannel* dest_channel = NULL;
     if (dest_) {
       dest_channel = dest_->GetFakeChannel(component);
-      if (dest_channel) {
-        // TODO(hbos): SetLocalCertificate
-        dest_channel->SetLocalIdentity(
-            dest_->certificate_ ? dest_->certificate_->identity() : nullptr);
-      }
+      if (dest_channel)
+        dest_channel->SetLocalCertificate(dest_->certificate_);
     }
     channel->SetDestination(dest_channel);
   }
 
   // Note, this is distinct from the Channel map owned by Transport.
   // This map just tracks the FakeTransportChannels created by this class.
   ChannelMap channels_;
   FakeTransport* dest_;
   bool async_;
   rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
@@ skipping 31 matching lines @@
     // Simulate the exchange of candidates.
     CompleteNegotiation();
     dest->CompleteNegotiation();
     for (TransportMap::const_iterator it = transport_proxies().begin();
         it != transport_proxies().end(); ++it) {
       static_cast<FakeTransport*>(it->second->impl())->SetDestination(
           dest->GetTransport(it->first));
     }
   }
 
-  virtual TransportChannel* CreateChannel(
-      const std::string& content_name,
-      int component) {
+  TransportChannel* CreateChannel(const std::string& content_name,
+                                  int component) override {
     if (fail_create_channel_) {
       return NULL;
     }
     return BaseSession::CreateChannel(content_name, component);
   }
 
   void set_fail_channel_creation(bool fail_channel_creation) {
     fail_create_channel_ = fail_channel_creation;
   }
 
   // TODO: Hoist this into Session when we re-work the Session code.
   void set_ssl_rtccertificate(
       const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) {
     for (TransportMap::const_iterator it = transport_proxies().begin();
         it != transport_proxies().end(); ++it) {
       // We know that we have a FakeTransport*
 
       static_cast<FakeTransport*>(it->second->impl())->set_certificate
           (certificate);
     }
   }
 
  protected:
-  virtual Transport* CreateTransport(const std::string& content_name) {
+  Transport* CreateTransport(const std::string& content_name) override {
     return new FakeTransport(signaling_thread(), worker_thread(), content_name);
   }
 
   void CompleteNegotiation() {
     for (TransportMap::const_iterator it = transport_proxies().begin();
         it != transport_proxies().end(); ++it) {
       it->second->CompleteNegotiation();
       it->second->ConnectChannels();
     }
   }
 
  private:
   bool fail_create_channel_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_FAKESESSION_H_