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

Side by Side Diff: talk/app/webrtc/webrtcsession.h

Issue 1516993002: Properly handle different transports having different SSL roles. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Adding a helper method for GetSslRole, and some more comments. Created 4 years, 11 months 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/peerconnectioninterface_unittest.cc ('k') | talk/app/webrtc/webrtcsession.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 2012 Google Inc. 3 * Copyright 2012 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 return video_channel_.get(); 197 return video_channel_.get();
198 } 198 }
199 virtual cricket::DataChannel* data_channel() { 199 virtual cricket::DataChannel* data_channel() {
200 return data_channel_.get(); 200 return data_channel_.get();
201 } 201 }
202 202
203 void SetSdesPolicy(cricket::SecurePolicy secure_policy); 203 void SetSdesPolicy(cricket::SecurePolicy secure_policy);
204 cricket::SecurePolicy SdesPolicy() const; 204 cricket::SecurePolicy SdesPolicy() const;
205 205
206 // Get current ssl role from transport. 206 // Get current ssl role from transport.
207 bool GetSslRole(rtc::SSLRole* role); 207 bool GetSslRole(const std::string& transport_name, rtc::SSLRole* role);
208
209 // Get current SSL role for this channel's transport.
210 // If |transport| is null, returns false.
211 bool GetSslRole(const cricket::BaseChannel* channel, rtc::SSLRole* role);
208 212
209 void CreateOffer( 213 void CreateOffer(
210 CreateSessionDescriptionObserver* observer, 214 CreateSessionDescriptionObserver* observer,
211 const PeerConnectionInterface::RTCOfferAnswerOptions& options, 215 const PeerConnectionInterface::RTCOfferAnswerOptions& options,
212 const cricket::MediaSessionOptions& session_options); 216 const cricket::MediaSessionOptions& session_options);
213 void CreateAnswer(CreateSessionDescriptionObserver* observer, 217 void CreateAnswer(CreateSessionDescriptionObserver* observer,
214 const MediaConstraintsInterface* constraints, 218 const MediaConstraintsInterface* constraints,
215 const cricket::MediaSessionOptions& session_options); 219 const cricket::MediaSessionOptions& session_options);
216 // The ownership of |desc| will be transferred after this call. 220 // The ownership of |desc| will be transferred after this call.
217 bool SetLocalDescription(SessionDescriptionInterface* desc, 221 bool SetLocalDescription(SessionDescriptionInterface* desc,
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 PeerConnectionInterface::BundlePolicy bundle_policy_; 514 PeerConnectionInterface::BundlePolicy bundle_policy_;
511 515
512 // Declares the RTCP mux policy for the WebRTCSession. 516 // Declares the RTCP mux policy for the WebRTCSession.
513 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 517 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
514 518
515 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 519 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
516 }; 520 };
517 } // namespace webrtc 521 } // namespace webrtc
518 522
519 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 523 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnectioninterface_unittest.cc ('k') | talk/app/webrtc/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698