mcmc: upstream update for SO_KEEPALIVE

memcached · Feb 16, 2022 · c985f2b · c985f2b
1 parent 7e58c6d
commit c985f2b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/vendor/mcmc/mcmc.c b/vendor/mcmc/mcmc.c
@@ -454,7 +454,15 @@ int mcmc_connect(void *c, char *host, char *port, int options) {
         if (sock == -1)
             continue;
 
-        // TODO: NONBLOCK
+        if (options & MCMC_OPTION_TCP_KEEPALIVE) {
+            int optval = 1;
+            if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &optval, sizeof(optval)) < 0) {
+                res = MCMC_ERR;
+                close(sock);
+                goto end;
+            }
+        }
+
         if (options & MCMC_OPTION_NONBLOCK) {
             int flags = fcntl(sock, F_GETFL);
             if (flags < 0) {

diff --git a/vendor/mcmc/mcmc.h b/vendor/mcmc/mcmc.h
@@ -37,6 +37,7 @@
 
 #define MCMC_OPTION_BLANK 0
 #define MCMC_OPTION_NONBLOCK 1
+#define MCMC_OPTION_TCP_KEEPALIVE (1<<1)
 
 // convenience defines. if you want to save RAM you can set these smaller and
 // error handler will only copy what you ask for.