Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: talk/session/media/channel.h

Issue 1532543003: DTLS-SRTP set up is bypassed when the channel has been writable. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: improve comments. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « talk/app/webrtc/peerconnection_unittest.cc ('k') | talk/session/media/channel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 int SetOption(SocketType type, rtc::Socket::Option o, int val) 172 int SetOption(SocketType type, rtc::Socket::Option o, int val)
173 override; 173 override;
174 174
175 SrtpFilter* srtp_filter() { return &srtp_filter_; } 175 SrtpFilter* srtp_filter() { return &srtp_filter_; }
176 176
177 protected: 177 protected:
178 virtual MediaChannel* media_channel() const { return media_channel_; } 178 virtual MediaChannel* media_channel() const { return media_channel_; }
179 // Sets the |transport_channel_| (and |rtcp_transport_channel_|, if |rtcp_| is 179 // Sets the |transport_channel_| (and |rtcp_transport_channel_|, if |rtcp_| is
180 // true). Gets the transport channels from |transport_controller_|. 180 // true). Gets the transport channels from |transport_controller_|.
181 bool SetTransport_w(const std::string& transport_name); 181 bool SetTransport_w(const std::string& transport_name);
182
182 void set_transport_channel(TransportChannel* transport); 183 void set_transport_channel(TransportChannel* transport);
183 void set_rtcp_transport_channel(TransportChannel* transport); 184 void set_rtcp_transport_channel(TransportChannel* transport,
185 bool update_writablity);
186
184 bool was_ever_writable() const { return was_ever_writable_; } 187 bool was_ever_writable() const { return was_ever_writable_; }
185 void set_local_content_direction(MediaContentDirection direction) { 188 void set_local_content_direction(MediaContentDirection direction) {
186 local_content_direction_ = direction; 189 local_content_direction_ = direction;
187 } 190 }
188 void set_remote_content_direction(MediaContentDirection direction) { 191 void set_remote_content_direction(MediaContentDirection direction) {
189 remote_content_direction_ = direction; 192 remote_content_direction_ = direction;
190 } 193 }
191 void set_secure_required(bool secure_required) { 194 void set_secure_required(bool secure_required) {
192 secure_required_ = secure_required; 195 secure_required_ = secure_required;
193 } 196 }
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 // SetSendParameters. 647 // SetSendParameters.
645 DataSendParameters last_send_params_; 648 DataSendParameters last_send_params_;
646 // Last DataRecvParameters sent down to the media_channel() via 649 // Last DataRecvParameters sent down to the media_channel() via
647 // SetRecvParameters. 650 // SetRecvParameters.
648 DataRecvParameters last_recv_params_; 651 DataRecvParameters last_recv_params_;
649 }; 652 };
650 653
651 } // namespace cricket 654 } // namespace cricket
652 655
653 #endif // TALK_SESSION_MEDIA_CHANNEL_H_ 656 #endif // TALK_SESSION_MEDIA_CHANNEL_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnection_unittest.cc ('k') | talk/session/media/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698