From ce7a9a58e3a0d13db53f7e0b4c17b3185a8c0e1a Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Thu, 28 Jul 2011 08:06:21 +0200
Subject: Setting TCP socket options moved to tcp_engine_t

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
---
 src/tcp_listener.cpp | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

(limited to 'src/tcp_listener.cpp')

diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp
index fbb1b85..d334768 100644
--- a/src/tcp_listener.cpp
+++ b/src/tcp_listener.cpp
@@ -133,11 +133,6 @@ int zmq::tcp_listener_t::set_address (const char *protocol_, const char *addr_)
         (const char*) &flag, sizeof (int));
     wsa_assert (rc != SOCKET_ERROR);
 
-    //  Set the non-blocking flag.
-    u_long uflag = 1;
-    rc = ioctlsocket (s, FIONBIO, &uflag);
-    wsa_assert (rc != SOCKET_ERROR);
-
     //  Bind the socket to the network interface and port.
     rc = bind (s, (struct sockaddr*) &addr, addr_len);
     if (rc == SOCKET_ERROR) {
@@ -182,12 +177,6 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
     int rc = ioctlsocket (sock, FIONBIO, &argp);
     wsa_assert (rc != SOCKET_ERROR);
 
-    //  Disable Nagle's algorithm.
-    int flag = 1;
-    rc = setsockopt (sock, IPPROTO_TCP, TCP_NODELAY, (char*) &flag,
-        sizeof (int));
-    wsa_assert (rc != SOCKET_ERROR);
-
     return sock;
 }
 
@@ -212,19 +201,6 @@ int zmq::tcp_listener_t::set_address (const char *protocol_, const char *addr_)
         rc = setsockopt (s, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int));
         errno_assert (rc == 0);
 
-        //  Set the non-blocking flag.
-#ifdef ZMQ_HAVE_OPENVMS
-    	flag = 1;
-    	rc = ioctl (s, FIONBIO, &flag);
-        errno_assert (rc != -1);
-#else
-    	flag = fcntl (s, F_GETFL, 0);
-    	if (flag == -1)
-            flag = 0;
-    	rc = fcntl (s, F_SETFL, flag | O_NONBLOCK);
-        errno_assert (rc != -1);
-#endif
-
         //  Bind the socket to the network interface and port.
         rc = bind (s, (struct sockaddr*) &addr, addr_len);
         if (rc != 0) {
@@ -369,24 +345,6 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
     errno_assert (rc != -1);
 #endif
 
-    struct sockaddr *sa = (struct sockaddr*) &addr;
-    if (AF_UNIX != sa->sa_family) {
-
-        //  Disable Nagle's algorithm.
-        int flag = 1;
-        rc = setsockopt (sock, IPPROTO_TCP, TCP_NODELAY, (char*) &flag,
-            sizeof (int));
-        errno_assert (rc == 0);
-
-#ifdef ZMQ_HAVE_OPENVMS
-        //  Disable delayed acknowledgements.
-        flag = 1;
-        rc = setsockopt (sock, IPPROTO_TCP, TCP_NODELACK, (char*) &flag,
-            sizeof (int));
-        errno_assert (rc != SOCKET_ERROR);
-#endif
-    }
-
     return sock;
 }
 
-- 
cgit v1.2.3