generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update libjingle to 50654631.

Browse Source 
R=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2000006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4519 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
2013-08-10 07:18:04 +00:00
parent bf853f2732
commit 91053e7c5a
50 changed files with 2377 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
talk/p2p/base/session.h
View File

@@ -141,6 +141,7 @@ class TransportProxy : public sigslot::has_slots<>,
// Simple functions that thunk down to the same functions on Transport.
void SetRole(TransportRole role);
void SetIdentity(talk_base::SSLIdentity* identity);
bool SetLocalTransportDescription(const TransportDescription& description,
ContentAction action);
bool SetRemoteTransportDescription(const TransportDescription& description,
@@ -365,15 +366,16 @@ class BaseSession : public sigslot::has_slots<>,
// This avoids exposing the internal structures used to track them.
virtual bool GetStats(SessionStats* stats);
talk_base::SSLIdentity* identity() { return identity_; }
protected:
// Specifies the identity to use in this session.
bool SetIdentity(talk_base::SSLIdentity* identity);
bool PushdownTransportDescription(ContentSource source,
ContentAction action);
void set_initiator(bool initiator) { initiator_ = initiator; }
talk_base::SSLIdentity* identity() { return identity_; }
// Specifies the identity to use in this session.
void set_identity(talk_base::SSLIdentity* identity) { identity_ = identity; }
const TransportMap& transport_proxies() const { return transports_; }
// Get a TransportProxy by content_name or transport. NULL if not found.
TransportProxy* GetTransportProxy(const std::string& content_name);