Changeset 8ef8c4e in code

Timestamp:

Mar 4, 2014, 11:30:49 AM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

626f420

Parents:

d488e1b

Message:

Set SO_KEEPALIVE on the client socket, not on the server one

File:

• icbd.c (modified) (3 diffs)

icbd.c

@@ -175 +175 @@
                         }
 
-                        if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &on,
-                            sizeof on) < 0) {
-                                cause = "SO_KEEPALIVE";
-                                save_errno = errno;
-                                (void)close(s);
-                                continue;
-                        }
-
                         if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on,
                             sizeof on) < 0) {
@@ -261 +253 @@
         struct icb_session *is;
         socklen_t ss_len = sizeof ss;
-        int s, tos = IPTOS_LOWDELAY;
+        int s, on = 1, tos = IPTOS_LOWDELAY;
 
         ss.ss_len = ss_len;
@@ -271 +263 @@
                 if (setsockopt(s, IPPROTO_IP, IP_TOS, &tos, sizeof tos) < 0)
                         syslog(LOG_WARNING, "IP_TOS: %m");
+        if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof on) < 0)
+                syslog(LOG_WARNING, "SO_KEEPALIVE: %m");
         if ((is = calloc(1, sizeof *is)) == NULL) {
                 syslog(LOG_ERR, "calloc: %m");