From 136e6c81201daeb49e5ca9b893ae23b3ba5c0bdc Mon Sep 17 00:00:00 2001
From: Shreyas Siravara <sshreyas@fb.com>
Date: Tue, 15 Mar 2016 19:18:35 -0700
Subject: socket: Keepalives should happen on IPv6 as well as IPv4

Summary:
- Check for AF_INET *and* AF_INET6.
- This is a cherry-pick of D3057373 to 3.8

Signed-off-by: Shreyas Siravara <sshreyas@fb.com>
Change-Id: I53eb79284eddfee6e13821c6570809f575b96769
BUG: 1405478
Reviewed-on: http://review.gluster.org/16167
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Tested-by: Jeff Darcy <jdarcy@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
---
 rpc/rpc-transport/socket/src/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rpc')

diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 35b1455f370..36388548937 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -864,7 +864,7 @@ __socket_keepalive (int fd, int family, int keepalive_intvl,
                 goto err;
         }
 #else
-        if (family != AF_INET)
+        if (family != AF_INET && family != AF_INET6)
                 goto done;
 
         ret = setsockopt (fd, IPPROTO_TCP, TCP_KEEPIDLE, &keepalive_idle,
-- 
cgit