summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
Diffstat (limited to 'jingle')
-rw-r--r--jingle/glue/fake_socket_factory.cc10
-rw-r--r--jingle/glue/fake_socket_factory.h6
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,