Accept remote offers with current DTLS role, rather than "actpass".

webrtc/p2p/base/jseptransport.h

 /*
  *  Copyright 2004 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 280 matching lines @@
   // occurs.
   //
   // This and the below method can be called safely from any thread as long as
   // SetXTransportDescription is not in progress.
   void SetNeedsIceRestartFlag();
   // Returns true if the ICE restart flag above was set, and no ICE restart has
   // occurred yet for this transport (by applying a local description with
   // changed ufrag/password).
   bool NeedsIceRestart() const;
 
-  void GetSslRole(rtc::SSLRole* ssl_role) const;
+  // Returns role if negotiated, or empty Optional if it hasn't been negotiated
+  // yet.
+  rtc::Optional<rtc::SSLRole> GetSslRole() const;
 
   // TODO(deadbeef): Make this const. See comment in transportcontroller.h.
   bool GetStats(TransportStats* stats);
 
   // The current local transport description, possibly used
   // by the transport controller.
   const TransportDescription* local_description() const {
     return local_description_.get();
   }
 
   // The current remote transport description, possibly used
   // by the transport controller.
   const TransportDescription* remote_description() const {
     return remote_description_.get();
   }
 
   // TODO(deadbeef): The methods below are only public for testing. Should make
   // them utility functions or objects so they can be tested independently from
   // this class.
 
   // Returns false if the certificate's identity does not match the fingerprint,
   // or either is NULL.
   bool VerifyCertificateFingerprint(const rtc::RTCCertificate* certificate,
                                     const rtc::SSLFingerprint* fingerprint,
                                     std::string* error_desc) const;
 
-  // Negotiates the SSL role based off the offer and answer as specified by
-  // RFC 4145, section-4.1. Returns false if the SSL role cannot be determined
-  // from the local description and remote description.
-  bool NegotiateRole(ContentAction local_role,
-                     rtc::SSLRole* ssl_role,
-                     std::string* error_desc) const;
-
  private:
   // Negotiates the transport parameters based on the current local and remote
   // transport description, such as the ICE role to use, and whether DTLS
   // should be activated.
   //
   // Called when an answer TransportDescription is applied.
-  bool NegotiateTransportDescription(ContentAction local_role,
+  bool NegotiateTransportDescription(ContentAction local_description_type,
                                      std::string* error_desc);
 
+  // Negotiates the SSL role based off the offer and answer as specified by
+  // RFC 4145, section-4.1. Returns false if the SSL role cannot be determined
+  // from the local description and remote description.
+  bool NegotiateRole(ContentAction local_description_type,
+                     std::string* error_desc);
+
   // Pushes down the transport parameters from the local description, such
   // as the ICE ufrag and pwd.
   bool ApplyLocalTransportDescription(DtlsTransportInternal* dtls_transport,
                                       std::string* error_desc);
 
   // Pushes down the transport parameters from the remote description to the
   // transport channel.
   bool ApplyRemoteTransportDescription(DtlsTransportInternal* dtls_transport,
                                        std::string* error_desc);
 
   // Pushes down the transport parameters obtained via negotiation.
   bool ApplyNegotiatedTransportDescription(
       DtlsTransportInternal* dtls_transport,
       std::string* error_desc);
 
   const std::string mid_;
   // needs-ice-restart bit as described in JSEP.
   bool needs_ice_restart_ = false;
   rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
-  rtc::SSLRole secure_role_ = rtc::SSL_CLIENT;
+  rtc::Optional<rtc::SSLRole> ssl_role_;
   std::unique_ptr<rtc::SSLFingerprint> remote_fingerprint_;
   std::unique_ptr<TransportDescription> local_description_;
   std::unique_ptr<TransportDescription> remote_description_;
   bool local_description_set_ = false;
   bool remote_description_set_ = false;
 
   // Candidate component => DTLS channel
   std::map<int, DtlsTransportInternal*> channels_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(JsepTransport);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_JSEPTRANSPORT_H_