diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 03:23:13 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 03:23:13 +0000 |
| commit | 501b9ba1516c6fe4aa4100104c70e2f302e0b44a (patch) | |
| tree | 4b124bcc6fed8536035c4ee2b30f0fbe31248b2b /jingle | |
| parent | 5f6f06b400de36fd3c302d4fc72045d4f960fde8 (diff) | |
| download | chromium_src-501b9ba1516c6fe4aa4100104c70e2f302e0b44a.zip chromium_src-501b9ba1516c6fe4aa4100104c70e2f302e0b44a.tar.gz chromium_src-501b9ba1516c6fe4aa4100104c70e2f302e0b44a.tar.bz2 | |
Roll new libjingle. Use the new incoming_only flag in chromoting host.
BUG=81597
TEST=Unittests.
Review URL: http://codereview.chromium.org/6949010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/fake_socket_factory.cc | 10 | ||||
| -rw-r--r-- | jingle/glue/fake_socket_factory.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/jingle/glue/fake_socket_factory.cc b/jingle/glue/fake_socket_factory.cc index b0649ce..6139334 100644 --- a/jingle/glue/fake_socket_factory.cc +++ b/jingle/glue/fake_socket_factory.cc @@ -22,11 +22,11 @@ FakeUDPPacketSocket::~FakeUDPPacketSocket() { fake_socket_manager_->RemoveSocket(this); } -talk_base::SocketAddress FakeUDPPacketSocket::GetLocalAddress( - bool* allocated) const { +bool FakeUDPPacketSocket::GetLocalAddress( + talk_base::SocketAddress* address) const { DCHECK(CalledOnValidThread()); - *allocated = true; - return local_address_; + *address = local_address_; + return true; } talk_base::SocketAddress FakeUDPPacketSocket::GetRemoteAddress() const { @@ -178,7 +178,7 @@ talk_base::AsyncPacketSocket* FakeSocketFactory::CreateUdpSocket( talk_base::AsyncPacketSocket* FakeSocketFactory::CreateServerTcpSocket( const talk_base::SocketAddress& local_address, int min_port, int max_port, - bool listen, bool ssl) { + bool ssl) { // TODO(sergeyu): Implement fake TCP sockets. NOTIMPLEMENTED(); return NULL; diff --git a/jingle/glue/fake_socket_factory.h b/jingle/glue/fake_socket_factory.h index fee73bb..2be2d5c 100644 --- a/jingle/glue/fake_socket_factory.h +++ b/jingle/glue/fake_socket_factory.h @@ -34,8 +34,8 @@ class FakeUDPPacketSocket : public talk_base::AsyncPacketSocket, const std::vector<char>& data); // talk_base::AsyncPacketSocket implementation. - virtual talk_base::SocketAddress GetLocalAddress( - bool* allocated) const OVERRIDE; + virtual bool GetLocalAddress( + talk_base::SocketAddress* address) const OVERRIDE; virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE; virtual int Send(const void *pv, size_t cb) OVERRIDE; virtual int SendTo(const void *pv, size_t cb, @@ -101,7 +101,7 @@ class FakeSocketFactory : public talk_base::PacketSocketFactory { int min_port, int max_port) OVERRIDE; virtual talk_base::AsyncPacketSocket* CreateServerTcpSocket( const talk_base::SocketAddress& local_address, int min_port, int max_port, - bool listen, bool ssl) OVERRIDE; + bool ssl) OVERRIDE; virtual talk_base::AsyncPacketSocket* CreateClientTcpSocket( const talk_base::SocketAddress& local_address, const talk_base::SocketAddress& remote_address, |