Revert of net: merge two versions of SetTCPNoDelay() function into one

net/tools/flip_server/tcp_socket_util.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/flip_server/tcp_socket_util.h"
 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "net/socket/tcp_socket.h"
 
 namespace net {
 
 namespace {
 
 // Used to ensure we delete the addrinfo structure alloc'd by getaddrinfo().
 class AddrinfoGuard {
  public:
   explicit AddrinfoGuard(struct addrinfo* addrinfo_ptr)
       : addrinfo_ptr_(addrinfo_ptr) {}
@@ skipping 24 matching lines @@
     if (!close(*fd)) {
       *fd = -1;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace
 
+bool SetTCPNoDelay(int fd) {
+  int on = 1;
+  return setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char*>(&on),
+                    sizeof(on)) == 0;
+}
+
 int CreateTCPServerSocket(const std::string& host,
                           const std::string& port,
                           bool is_numeric_host_address,
                           int backlog,
                           bool reuseaddr,
                           bool reuseport,
                           bool wait_for_iface,
                           bool disable_nagle,
                           int* listen_fd) {
   // start out by assuming things will fail.
@@ skipping 88 matching lines @@
     } else {
       // couldn't even close the dang socket?!
       LOG(ERROR) << "Unable to close the socket.. Considering this a fatal "
                     "error, and exiting\n";
       exit(EXIT_FAILURE);
       return -1;
     }
   }
 
   if (disable_nagle) {
-    if (!SetTCPNoDelay(sock, /*no_delay=*/true)) {
+    if (!SetTCPNoDelay(sock)) {
       close(sock);
       LOG(FATAL) << "SetTCPNoDelay() failed on fd: " << sock;
       return -1;
     }
   }
 
   if (listen(sock, backlog)) {
     // listen was unsuccessful.
     LOG(ERROR) << "Listen was unsuccessful for (" << host << ":" << port
                << "): " << strerror(errno) << "\n";
@@ skipping 57 matching lines @@
     LOG(ERROR) << "Unable to create socket for (" << node << ":" << service
                << "): " << strerror(errno);
     return -1;
   }
 
   if (!base::SetNonBlocking(sock)) {
     LOG(FATAL) << "base::SetNonBlocking failed: " << sock;
   }
 
   if (disable_nagle) {
-    if (!SetTCPNoDelay(sock, /*no_delay=*/true)) {
+    if (!SetTCPNoDelay(sock)) {
       close(sock);
       LOG(FATAL) << "SetTCPNoDelay() failed on fd: " << sock;
       return -1;
     }
   }
 
   int ret_val = 0;
   if (connect(sock, results->ai_addr, results->ai_addrlen)) {
     if (errno != EINPROGRESS) {
       LOG(ERROR) << "Connect was unsuccessful for (" << node << ":" << service
                  << "): " << strerror(errno);
       close(sock);
       return -1;
     }
   } else {
     ret_val = 1;
   }
 
   // If we've gotten to here, Yeay! Success!
   *connect_fd = sock;
 
   return ret_val;
 }
 
 }  // namespace net