From 4e2b53708e0ca3f740815dbe7741f276069235ab Mon Sep 17 00:00:00 2001 From: shishir gowda Date: Tue, 14 Dec 2010 01:03:38 +0000 Subject: setsockopt should be called with solaris specific arguments for solaris server ----- Original Message ----- From: "Raghavendra Bhat" To: glusterfs@dev.gluster.com Sent: Tuesday, December 14, 2010 11:56:43 AM Subject: [PATCH BUG:2205 v4] setsockopt should be called with solaris specific arguments for solaris server Looks fine to me. Signed-off-by: Raghavendra Bhat Signed-off-by: Anand V. Avati BUG: 2205 ([glusterfs-3.1.2qa1]: error while setting the keepalive time interval) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2205 --- rpc/rpc-transport/socket/src/socket.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'rpc/rpc-transport/socket') diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index c121210c478..4ae49815a58 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -376,8 +376,13 @@ __socket_keepalive (int fd, int keepalive_intvl, int keepalive_idle) goto done; #ifndef GF_LINUX_HOST_OS +#ifdef GF_SOLARIS_HOST_OS + ret = setsockopt (fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive_intvl, + sizeof (keepalive_intvl)); +#else ret = setsockopt (fd, IPPROTO_TCP, TCP_KEEPALIVE, &keepalive_intvl, sizeof (keepalive_intvl)); +#endif if (ret == -1) goto err; #else -- cgit