commit d0b88797705cfc6c1d60ad325d1923f326f10de1
author Niels Möller <nisse@webrtc.org> Thu Aug 12 10:32:30 2021 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 17 15:39:25 2021 +0000
tree e73a47bd467939d5ad0a0e15e33355ebf3f3863d
parent 45b3e530cb4999010b572ea60b63916fdb79d66b

Delete AsyncSocket class, merge into Socket class

Bug: webrtc:13065
Change-Id: I13afee2386ea9c4de0e4fa95133f0c4d3ec826e8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227031
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34787}

rtc_base/firewall_socket_server.cc

diff --git a/rtc_base/firewall_socket_server.cc b/rtc_base/firewall_socket_server.cc
index 8f44753..edb0cd2 100644
--- a/rtc_base/firewall_socket_server.cc
+++ b/rtc_base/firewall_socket_server.cc
@@ -25,7 +25,7 @@
 
 class FirewallSocket : public AsyncSocketAdapter {
  public:
-  FirewallSocket(FirewallSocketServer* server, AsyncSocket* socket, int type)
+  FirewallSocket(FirewallSocketServer* server, Socket* socket, int type)
       : AsyncSocketAdapter(socket), server_(server), type_(type) {}
 
   int Bind(const SocketAddress& addr) override {
@@ -96,9 +96,9 @@
 
     return AsyncSocketAdapter::Listen(backlog);
   }
-  AsyncSocket* Accept(SocketAddress* paddr) override {
+  Socket* Accept(SocketAddress* paddr) override {
     SocketAddress addr;
-    while (AsyncSocket* sock = AsyncSocketAdapter::Accept(&addr)) {
+    while (Socket* sock = AsyncSocketAdapter::Accept(&addr)) {
       if (server_->Check(FP_TCP, addr, GetLocalAddress())) {
         if (paddr)
           *paddr = addr;
@@ -203,11 +203,7 @@
 }
 
 Socket* FirewallSocketServer::CreateSocket(int family, int type) {
-  return WrapSocket(server_->CreateAsyncSocket(family, type), type);
-}
-
-AsyncSocket* FirewallSocketServer::CreateAsyncSocket(int family, int type) {
-  return WrapSocket(server_->CreateAsyncSocket(family, type), type);
+  return WrapSocket(server_->CreateSocket(family, type), type);
 }
 
 void FirewallSocketServer::SetMessageQueue(Thread* queue) {
@@ -222,7 +218,7 @@
   return server_->WakeUp();
 }
 
-AsyncSocket* FirewallSocketServer::WrapSocket(AsyncSocket* sock, int type) {
+Socket* FirewallSocketServer::WrapSocket(Socket* sock, int type) {
   if (!sock || (type == SOCK_STREAM && !tcp_sockets_enabled_) ||
       (type == SOCK_DGRAM && !udp_sockets_enabled_)) {
     RTC_LOG(LS_VERBOSE) << "FirewallSocketServer socket creation denied";