zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert change which removes GICE.

Browse Source 
There are still dependencies on this functionality.

TBR=pthatcher@webrtc.org

BUG=526399

Review URL: https://codereview.webrtc.org/1336553003

Cr-Commit-Position: refs/heads/master@{#9920}
This commit is contained in:
guoweis
2015-09-10 13:32:11 -07:00
committed by Commit bot
parent fab882b193
commit d12140a68e
42 changed files with 1777 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/p2p/base/session.h
View File

@ -240,6 +240,8 @@ class BaseSession : public sigslot::has_slots<>,
// from local/remote_description(). Remove these functions and members.
// Returns the XML namespace identifying the type of this session.
const std::string& content_type() const { return content_type_; }
// Returns the XML namespace identifying the transport used for this session.
const std::string& transport_type() const { return transport_type_; }
// Indicates whether we initiated this session.
bool initiator() const { return initiator_; }
@ -450,6 +452,7 @@ class BaseSession : public sigslot::has_slots<>,
PortAllocator* const port_allocator_;
const std::string sid_;
const std::string content_type_;
const std::string transport_type_;
bool initiator_;
rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
rtc::SSLProtocolVersion ssl_max_version_;