Allow remote fingerprint update during a call

talk/session/media/channel.h

Index: talk/session/media/channel.h
diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h
index 9342d31a257c79b4de5d37cde08242ae0c79acbb..d4e428e07e46758592fcfcb11df4cfbf0f541cba 100644
--- a/talk/session/media/channel.h
+++ b/talk/session/media/channel.h
@@ -176,7 +176,7 @@ class BaseChannel
   bool SetTransport_w(const std::string& transport_name);
   void set_transport_channel(TransportChannel* transport);
   void set_rtcp_transport_channel(TransportChannel* transport);
-  bool was_ever_writable() const { return was_ever_writable_; }
+  bool dtls_srtp_setup_pending() const { return dtls_srtp_setup_pending_; }
   void set_local_content_direction(MediaContentDirection direction) {
     local_content_direction_ = direction;
   }
@@ -213,6 +213,8 @@ class BaseChannel
                              int flags);
   void OnReadyToSend(TransportChannel* channel);
 
+  void OnDtlsState(TransportChannel* channel, DtlsTransportState state);
+
   bool PacketIsRtcp(const TransportChannel* channel, const char* data,
                     size_t len);
   bool SendPacket(bool rtcp,
@@ -235,6 +237,7 @@ class BaseChannel
   // Do the DTLS key expansion and impose it on the SRTP/SRTCP filters.
   // |rtcp_channel| indicates whether to set up the RTP or RTCP filter.
   bool SetupDtlsSrtp(bool rtcp_channel);
+  void TrySetupDtlsSrtp_w();
   // Set the DTLS-SRTP cipher policy on this channel as appropriate.
   bool SetDtlsSrtpCryptoSuites(TransportChannel* tc, bool rtcp);
 
@@ -315,7 +318,7 @@ class BaseChannel
   bool writable_;
   bool rtp_ready_to_send_;
   bool rtcp_ready_to_send_;
-  bool was_ever_writable_;
+  bool dtls_srtp_setup_pending_;

[pthatcher1, 2015/11/30 20:23:11]

It feels like this should go right under srtp_filter_.

[pthatcher1, 2015/11/30 20:23:11]

And "dtls" isn't really relevant.  It's more whether SRTP is ready or not.  So,
"srtp_setup_pending_" would be better.  But that makes me think that it would be
even more clear to invert it to "srtp_ready_" or "srtp_filter_ready_".  And that
makes me wonder:  why can't we just use srtp_filter_.Active()?

[guoweis_webrtc, 2015/12/01 22:05:12]

Done.

   MediaContentDirection local_content_direction_;
   MediaContentDirection remote_content_direction_;
   bool has_received_packet_;