From 1cc57ff832cc48634cd697b828551f4cc3ee42b8 Mon Sep 17 00:00:00 2001 From: Venkatesh Somyajulu Date: Mon, 18 Mar 2013 17:13:51 +0530 Subject: rpc: For AF_UNIX sockets, do not set keepalive option. Change-Id: I65df52e89fe7783ff00c2b7a49be571d15e8f0d0 BUG: 920009 Signed-off-by: Venkatesh Somyajulu Reviewed-on: http://review.gluster.org/4684 Reviewed-by: Krishnan Parthasarathi Reviewed-by: Niels de Vos Tested-by: Gluster Build System Reviewed-by: Anand Avati --- rpc/rpc-transport/socket/src/socket.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'rpc/rpc-transport/socket/src/socket.c') diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index fffc137f6..526732b0a 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -2456,7 +2456,8 @@ socket_server_event_handler (int fd, int idx, void *data, } } - if (priv->keepalive) { + if (priv->keepalive && + new_sockaddr.ss_family != AF_UNIX) { ret = __socket_keepalive (new_sock, new_sockaddr.ss_family, priv->keepaliveintvl, @@ -2725,7 +2726,7 @@ socket_connect (rpc_transport_t *this, int port) } } - if (priv->keepalive) { + if (priv->keepalive && sa_family != AF_UNIX) { ret = __socket_keepalive (priv->sock, sa_family, priv->keepaliveintvl, -- cgit