Revert D13966702: [fbcode] AsyncServerSocket::AcceptCallback::connectionAccepted to NetworkSocket

Differential Revision:
D13966702

Original commit changeset: 415622dc347d

fbshipit-source-id: 11ff9cac08174cfaefe20e7e4c5e08dc005aaa39

folly/io/async/AsyncServerSocket.h

@@ -158,8 +158,13 @@ class AsyncServerSocket : public DelayedDestruction, public AsyncSocketBase {
      *                    remain valid until connectionAccepted() returns.
      */
     virtual void connectionAccepted(
-        NetworkSocket fd,
+        int fd,
         const SocketAddress& clientAddr) noexcept = 0;
+    void connectionAccepted(
+        NetworkSocket fd,
+        const SocketAddress& clientAddr) noexcept {
+      connectionAccepted(fd.toFd(), clientAddr);
+    }
 
     /**
      * acceptError() is called if an error occurs while accepting.

folly/io/async/test/AsyncSocketTest2.h

@@ -182,12 +182,12 @@ class TestAcceptCallback : public AsyncServerSocket::AcceptCallback {
   }
 
   void connectionAccepted(
-      NetworkSocket fd,
+      int fd,
       const folly::SocketAddress& clientAddr) noexcept override {
-    events_.emplace_back(fd, clientAddr);
+    events_.emplace_back(NetworkSocket::fromFd(fd), clientAddr);
 
     if (connectionAcceptedFn_) {
-      connectionAcceptedFn_(fd, clientAddr);
+      connectionAcceptedFn_(NetworkSocket::fromFd(fd), clientAddr);
     }
   }
   void acceptError(const std::exception& ex) noexcept override {

folly/io/async/test/TestSSLServer.h

@@ -61,10 +61,8 @@ class SSLServerAcceptCallbackBase : public AsyncServerSocket::AcceptCallback {
   }
 
   void connectionAccepted(
-      folly::NetworkSocket fdNetworkSocket,
+      int fd,
       const SocketAddress& /* clientAddr */) noexcept override {
-    int fd = fdNetworkSocket.toFd();
-
     if (socket_) {
       socket_->detachEventBase();
     }

folly/io/async/test/ZeroCopy.h

@@ -227,10 +227,8 @@ class ZeroCopyTestServer : public folly::AsyncServerSocket::AcceptCallback {
   }
 
   void connectionAccepted(
-      folly::NetworkSocket fdNetworkSocket,
+      int fd,
       const folly::SocketAddress& /* unused */) noexcept override {
-    int fd = fdNetworkSocket.toFd();
-
     auto client = std::make_shared<ZeroCopyTestAsyncSocket>(
         nullptr, evb_, fd, numLoops_, bufferSize_, zeroCopy_);
     clients_[client.get()] = client;