Selaa lähdekoodia

tcpops: set tcp keepalive values when available per option

- cover macos and *bsd for couple of options

(cherry picked from commit 278fd5a892c14f23e9f2b8d1f3fd3232c1d319f3)
(cherry picked from commit eb5f2096282e93b14fecfc64f22aba0db467dec5)
(cherry picked from commit 37f847af805ec20762348898c6427c8df8d02025)
Daniel-Constantin Mierla 6 vuotta sitten
vanhempi
commit
90b709c7b8
1 muutettua tiedostoa jossa 13 lisäystä ja 3 poistoa
  1. 13 3
      src/modules/tcpops/tcpops.c

+ 13 - 3
src/modules/tcpops/tcpops.c

@@ -105,8 +105,13 @@ error_release:
 	return 0;
 }
 
-#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPIDLE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL)
-	#warning "TCP keepalive is not fully supported by your platform"
+#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL)
+	#define KSR_TCPOPS_NOKEEPALIVE
+#endif
+
+#ifdef KSR_TCPOPS_NOKEEPALIVE
+
+#warning "TCP keepalive options not supported by this platform"
 
 int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd)
 {
@@ -119,6 +124,7 @@ int tcpops_keepalive_disable(int fd, int closefd)
 	LM_ERR("tcp_keepalive_disable() failed: this module does not support your platform\n");
 	return -1;
 }
+
 #else
 
 int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd)
@@ -131,11 +137,15 @@ int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int close
 		LM_ERR("failed to enable SO_KEEPALIVE: %s\n", strerror(errno));
 		return -1;
 	} else {
-
+#ifdef HAVE_TCP_KEEPIDLE
 		if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle,
 						sizeof(idle))<0){
 			LM_ERR("failed to set keepalive idle interval: %s\n", strerror(errno));
 		}
+#else
+		#warning "TCP_KEEPIDLE option not supported by this platform"
+		LM_DBG("TCP_KEEPIDLE option not available - ignoring\n");
+#endif
 
 		if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count,
 						sizeof(count))<0){