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

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: Introduce new parameter on whether to update writablity. 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
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 void set_transport_channel(TransportChannel* transport); 182
183 void set_rtcp_transport_channel(TransportChannel* transport); 183 void set_transport_channel(TransportChannel* transport,
184 bool update_writablity);
185 void set_rtcp_transport_channel(TransportChannel* transport,
186 bool update_writablity);
187
184 bool was_ever_writable() const { return was_ever_writable_; } 188 bool was_ever_writable() const { return was_ever_writable_; }
185 void set_local_content_direction(MediaContentDirection direction) { 189 void set_local_content_direction(MediaContentDirection direction) {
186 local_content_direction_ = direction; 190 local_content_direction_ = direction;
187 } 191 }
188 void set_remote_content_direction(MediaContentDirection direction) { 192 void set_remote_content_direction(MediaContentDirection direction) {
189 remote_content_direction_ = direction; 193 remote_content_direction_ = direction;
190 } 194 }
191 void set_secure_required(bool secure_required) { 195 void set_secure_required(bool secure_required) {
192 secure_required_ = secure_required; 196 secure_required_ = secure_required;
193 } 197 }
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 // SetSendParameters. 648 // SetSendParameters.
645 DataSendParameters last_send_params_; 649 DataSendParameters last_send_params_;
646 // Last DataRecvParameters sent down to the media_channel() via 650 // Last DataRecvParameters sent down to the media_channel() via
647 // SetRecvParameters. 651 // SetRecvParameters.
648 DataRecvParameters last_recv_params_; 652 DataRecvParameters last_recv_params_;
649 }; 653 };
650 654
651 } // namespace cricket 655 } // namespace cricket
652 656
653 #endif // TALK_SESSION_MEDIA_CHANNEL_H_ 657 #endif // TALK_SESSION_MEDIA_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698