From: Andreas Öman <andreas@lonelycoder.com>
Date: Tue, 16 Feb 2010 19:51:44 +0000 (+0000)
Subject: Get rid of SOL_TCP
X-Git-Tag: 2.12~244
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=197b4600791f034706579d44d4fc19bd82bd070c;p=thirdparty%2Ftvheadend.git

Get rid of SOL_TCP
---

diff --git a/src/tcp.c b/src/tcp.c
index 9d0079540..fa2f91949 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -375,17 +375,23 @@ tcp_server_start(void *aux)
   val = 1;
   setsockopt(tsl->fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val));
   
+#ifdef TCP_KEEPIDLE
   val = 30;
-  setsockopt(tsl->fd, SOL_TCP, TCP_KEEPIDLE, &val, sizeof(val));
+  setsockopt(tsl->fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val));
+#endif
 
+#ifdef TCP_KEEPINVL
   val = 15;
-  setsockopt(tsl->fd, SOL_TCP, TCP_KEEPINTVL, &val, sizeof(val));
+  setsockopt(tsl->fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val));
+#endif
 
+#ifdef TCP_KEEPCNT
   val = 5;
-  setsockopt(tsl->fd, SOL_TCP, TCP_KEEPCNT, &val, sizeof(val));
+  setsockopt(tsl->fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val));
+#endif
 
   val = 1;
-  setsockopt(tsl->fd, SOL_TCP, TCP_NODELAY, &val, sizeof(val));
+  setsockopt(tsl->fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
 
 
   tsl->start(tsl->fd, tsl->opaque, &tsl->peer, &tsl->self);