| Index: webrtc/base/asyncudpsocket.cc
|
| diff --git a/webrtc/base/asyncudpsocket.cc b/webrtc/base/asyncudpsocket.cc
|
| deleted file mode 100644
|
| index 0bccb73836af0bbc4a7f73f3788c8924fad04dce..0000000000000000000000000000000000000000
|
| --- a/webrtc/base/asyncudpsocket.cc
|
| +++ /dev/null
|
| @@ -1,130 +0,0 @@
|
| -/*
|
| - * Copyright 2004 The WebRTC Project Authors. All rights reserved.
|
| - *
|
| - * Use of this source code is governed by a BSD-style license
|
| - * that can be found in the LICENSE file in the root of the source
|
| - * tree. An additional intellectual property rights grant can be found
|
| - * in the file PATENTS. All contributing project authors may
|
| - * be found in the AUTHORS file in the root of the source tree.
|
| - */
|
| -
|
| -#include "webrtc/base/asyncudpsocket.h"
|
| -#include "webrtc/base/checks.h"
|
| -#include "webrtc/base/logging.h"
|
| -
|
| -namespace rtc {
|
| -
|
| -static const int BUF_SIZE = 64 * 1024;
|
| -
|
| -AsyncUDPSocket* AsyncUDPSocket::Create(
|
| - AsyncSocket* socket,
|
| - const SocketAddress& bind_address) {
|
| - std::unique_ptr<AsyncSocket> owned_socket(socket);
|
| - if (socket->Bind(bind_address) < 0) {
|
| - LOG(LS_ERROR) << "Bind() failed with error " << socket->GetError();
|
| - return nullptr;
|
| - }
|
| - return new AsyncUDPSocket(owned_socket.release());
|
| -}
|
| -
|
| -AsyncUDPSocket* AsyncUDPSocket::Create(SocketFactory* factory,
|
| - const SocketAddress& bind_address) {
|
| - AsyncSocket* socket =
|
| - factory->CreateAsyncSocket(bind_address.family(), SOCK_DGRAM);
|
| - if (!socket)
|
| - return nullptr;
|
| - return Create(socket, bind_address);
|
| -}
|
| -
|
| -AsyncUDPSocket::AsyncUDPSocket(AsyncSocket* socket)
|
| - : socket_(socket) {
|
| - size_ = BUF_SIZE;
|
| - buf_ = new char[size_];
|
| -
|
| - // The socket should start out readable but not writable.
|
| - socket_->SignalReadEvent.connect(this, &AsyncUDPSocket::OnReadEvent);
|
| - socket_->SignalWriteEvent.connect(this, &AsyncUDPSocket::OnWriteEvent);
|
| -}
|
| -
|
| -AsyncUDPSocket::~AsyncUDPSocket() {
|
| - delete [] buf_;
|
| -}
|
| -
|
| -SocketAddress AsyncUDPSocket::GetLocalAddress() const {
|
| - return socket_->GetLocalAddress();
|
| -}
|
| -
|
| -SocketAddress AsyncUDPSocket::GetRemoteAddress() const {
|
| - return socket_->GetRemoteAddress();
|
| -}
|
| -
|
| -int AsyncUDPSocket::Send(const void *pv, size_t cb,
|
| - const rtc::PacketOptions& options) {
|
| - rtc::SentPacket sent_packet(options.packet_id, rtc::TimeMillis());
|
| - int ret = socket_->Send(pv, cb);
|
| - SignalSentPacket(this, sent_packet);
|
| - return ret;
|
| -}
|
| -
|
| -int AsyncUDPSocket::SendTo(const void *pv, size_t cb,
|
| - const SocketAddress& addr,
|
| - const rtc::PacketOptions& options) {
|
| - rtc::SentPacket sent_packet(options.packet_id, rtc::TimeMillis());
|
| - int ret = socket_->SendTo(pv, cb, addr);
|
| - SignalSentPacket(this, sent_packet);
|
| - return ret;
|
| -}
|
| -
|
| -int AsyncUDPSocket::Close() {
|
| - return socket_->Close();
|
| -}
|
| -
|
| -AsyncUDPSocket::State AsyncUDPSocket::GetState() const {
|
| - return STATE_BOUND;
|
| -}
|
| -
|
| -int AsyncUDPSocket::GetOption(Socket::Option opt, int* value) {
|
| - return socket_->GetOption(opt, value);
|
| -}
|
| -
|
| -int AsyncUDPSocket::SetOption(Socket::Option opt, int value) {
|
| - return socket_->SetOption(opt, value);
|
| -}
|
| -
|
| -int AsyncUDPSocket::GetError() const {
|
| - return socket_->GetError();
|
| -}
|
| -
|
| -void AsyncUDPSocket::SetError(int error) {
|
| - return socket_->SetError(error);
|
| -}
|
| -
|
| -void AsyncUDPSocket::OnReadEvent(AsyncSocket* socket) {
|
| - RTC_DCHECK(socket_.get() == socket);
|
| -
|
| - SocketAddress remote_addr;
|
| - int64_t timestamp;
|
| - int len = socket_->RecvFrom(buf_, size_, &remote_addr, ×tamp);
|
| - if (len < 0) {
|
| - // An error here typically means we got an ICMP error in response to our
|
| - // send datagram, indicating the remote address was unreachable.
|
| - // When doing ICE, this kind of thing will often happen.
|
| - // TODO: Do something better like forwarding the error to the user.
|
| - SocketAddress local_addr = socket_->GetLocalAddress();
|
| - LOG(LS_INFO) << "AsyncUDPSocket[" << local_addr.ToSensitiveString() << "] "
|
| - << "receive failed with error " << socket_->GetError();
|
| - return;
|
| - }
|
| -
|
| - // TODO: Make sure that we got all of the packet.
|
| - // If we did not, then we should resize our buffer to be large enough.
|
| - SignalReadPacket(
|
| - this, buf_, static_cast<size_t>(len), remote_addr,
|
| - (timestamp > -1 ? PacketTime(timestamp, 0) : CreatePacketTime(0)));
|
| -}
|
| -
|
| -void AsyncUDPSocket::OnWriteEvent(AsyncSocket* socket) {
|
| - SignalReadyToSend(this);
|
| -}
|
| -
|
| -} // namespace rtc
|
|
|