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

Side by Side Diff: webrtc/p2p/base/transportdescriptionfactory.h

Issue 2647593003: Accept SDP with TRANSPORT attributes missing from bundled m= sections. (Closed)
Patch Set: Fix "a=fingerprint" too. Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 // Specifies the certificate to use (only used when secure != SEC_DISABLED). 46 // Specifies the certificate to use (only used when secure != SEC_DISABLED).
47 void set_certificate( 47 void set_certificate(
48 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) { 48 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) {
49 certificate_ = certificate; 49 certificate_ = certificate;
50 } 50 }
51 51
52 // Creates a transport description suitable for use in an offer. 52 // Creates a transport description suitable for use in an offer.
53 TransportDescription* CreateOffer(const TransportOptions& options, 53 TransportDescription* CreateOffer(const TransportOptions& options,
54 const TransportDescription* current_description) const; 54 const TransportDescription* current_description) const;
55 // Create a transport description that is a response to an offer. 55 // Create a transport description that is a response to an offer.
56 // |bundled| indicates that this transport description is being generated
57 // for an m= section that's being bundled into another m= section, in
pthatcher1 2017/02/17 19:17:32 might be more clear as "|bundled| indicates that
Taylor Brandstetter 2017/02/17 21:49:14 Done.
58 // which case transport-level attributes aren't needed since they can
59 // be found in the other m= section.
56 TransportDescription* CreateAnswer( 60 TransportDescription* CreateAnswer(
57 const TransportDescription* offer, 61 const TransportDescription* offer,
58 const TransportOptions& options, 62 const TransportOptions& options,
59 const TransportDescription* current_description) const; 63 const TransportDescription* current_description,
64 bool bundled) const;
pthatcher1 2017/02/17 19:17:32 It ought to be the 3rd argument, not the last. An
Taylor Brandstetter 2017/02/17 21:49:14 Done (though not the TransportOptions part).
60 65
61 private: 66 private:
62 bool SetSecurityInfo(TransportDescription* description, 67 bool SetSecurityInfo(TransportDescription* description,
63 ConnectionRole role) const; 68 ConnectionRole role) const;
64 69
65 SecurePolicy secure_; 70 SecurePolicy secure_;
66 rtc::scoped_refptr<rtc::RTCCertificate> certificate_; 71 rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
67 }; 72 };
68 73
69 } // namespace cricket 74 } // namespace cricket
70 75
71 #endif // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ 76 #endif // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698