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

(Auto)update libjingle 72097588-> 72159069

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-07-29 17:36:52 +00:00
parent fc8b0871d9
commit d4e598d57a
509 changed files with 7114 additions and 7239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
talk/xmpp/xmppsocket.h
View File

@@ -28,9 +28,9 @@
#ifndef TALK_XMPP_XMPPSOCKET_H_
#define TALK_XMPP_XMPPSOCKET_H_
#include "talk/base/asyncsocket.h"
#include "talk/base/bytebuffer.h"
#include "talk/base/sigslot.h"
#include "webrtc/base/asyncsocket.h"
#include "webrtc/base/bytebuffer.h"
#include "webrtc/base/sigslot.h"
#include "talk/xmpp/asyncsocket.h"
#include "talk/xmpp/xmppengine.h"
@@ -38,11 +38,11 @@
// SSL, as opposed to the SSLAdapter socket adapter.
// #define USE_SSLSTREAM
namespace talk_base {
namespace rtc {
class StreamInterface;
class SocketAddress;
};
extern talk_base::AsyncSocket* cricket_socket_;
extern rtc::AsyncSocket* cricket_socket_;
namespace buzz {
@@ -55,7 +55,7 @@ public:
virtual buzz::AsyncSocket::Error error();
virtual int GetError();
virtual bool Connect(const talk_base::SocketAddress& addr);
virtual bool Connect(const rtc::SocketAddress& addr);
virtual bool Read(char * data, size_t len, size_t* len_read);
virtual bool Write(const char * data, size_t len);
virtual bool Close();
@@ -66,20 +66,20 @@ public:
private:
void CreateCricketSocket(int family);
#ifndef USE_SSLSTREAM
void OnReadEvent(talk_base::AsyncSocket * socket);
void OnWriteEvent(talk_base::AsyncSocket * socket);
void OnConnectEvent(talk_base::AsyncSocket * socket);
void OnCloseEvent(talk_base::AsyncSocket * socket, int error);
void OnReadEvent(rtc::AsyncSocket * socket);
void OnWriteEvent(rtc::AsyncSocket * socket);
void OnConnectEvent(rtc::AsyncSocket * socket);
void OnCloseEvent(rtc::AsyncSocket * socket, int error);
#else // USE_SSLSTREAM
void OnEvent(talk_base::StreamInterface* stream, int events, int err);
void OnEvent(rtc::StreamInterface* stream, int events, int err);
#endif // USE_SSLSTREAM
talk_base::AsyncSocket * cricket_socket_;
rtc::AsyncSocket * cricket_socket_;
#ifdef USE_SSLSTREAM
talk_base::StreamInterface *stream_;
rtc::StreamInterface *stream_;
#endif // USE_SSLSTREAM
buzz::AsyncSocket::State state_;
talk_base::ByteBuffer buffer_;
rtc::ByteBuffer buffer_;
buzz::TlsOptions tls_;
};