admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

always export iscsi_set_tcp_keepalive()

Browse Source 
Set only the (socket) options which are defined on a given platform.
The function becomes a no-op if no option is known at complie time.
Remove autoconf test for HAVE_TCP_KEEPALIVE too.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Michael Tokarev
2012-05-12 01:20:01 +04:00
committed by Ronnie Sahlberg
parent c91de1e35a
commit aee0e3bf72
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -38,16 +38,6 @@ if test x"$libiscsi_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
AC_DEFINE(HAVE_SOCK_SIN_LEN,1,[Whether the sockaddr_in struct has a sin_len property]) AC_DEFINE(HAVE_SOCK_SIN_LEN,1,[Whether the sockaddr_in struct has a sin_len property])
fi fi
AC_CACHE_CHECK([for tcp keepalive],libiscsi_cv_HAVE_TCP_KEEPALIVE,[
AC_TRY_COMPILE([#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>],
[int foo = TCP_KEEPCNT + TCP_KEEPIDLE + TCP_KEEPINTVL],
libiscsi_cv_HAVE_TCP_KEEPALIVE=yes,libiscsi_cv_HAVE_TCP_KEEPALIVE=no)])
if test x"$libiscsi_cv_HAVE_TCP_KEEPALIVE" = x"yes"; then
AC_DEFINE(HAVE_TCP_KEEPALIVE,1,[Whether we have support for tcp keepalive socket options])
fi
AC_CACHE_CHECK([for sys filio.h],libiscsi_cv_NEED_SYS_FILIO_H,[ AC_CACHE_CHECK([for sys filio.h],libiscsi_cv_NEED_SYS_FILIO_H,[
AC_TRY_COMPILE([#include <stdint.h> AC_TRY_COMPILE([#include <stdint.h>
#include <sys/filio.h>], #include <sys/filio.h>],

4
include/iscsi.h
View File

@@ -61,8 +61,8 @@ EXTERN int iscsi_service(struct iscsi_context *iscsi, int revents);
EXTERN int iscsi_queue_length(struct iscsi_context *iscsi); EXTERN int iscsi_queue_length(struct iscsi_context *iscsi);
/* /*
* To set tcp keepalive for the session * To set tcp keepalive for the session.
* ONLY available on platforms with tcp keepalive socket options * Only options supported by given platform (if any) are set.
*/ */
int iscsi_set_tcp_keepalive(struct iscsi_context *iscsi, int idle, int count, int interval); int iscsi_set_tcp_keepalive(struct iscsi_context *iscsi, int idle, int count, int interval);

15
lib/socket.c
View File

@@ -460,9 +460,7 @@ iscsi_service(struct iscsi_context *iscsi, int revents)
return -1; return -1;
} }
#ifdef HAVE_TCP_KEEPALIVE
iscsi_set_tcp_keepalive(iscsi, 30, 3, 30); iscsi_set_tcp_keepalive(iscsi, 30, 3, 30);
#endif
iscsi->is_connected = 1; iscsi->is_connected = 1;
iscsi->socket_status_cb(iscsi, SCSI_STATUS_GOOD, NULL, iscsi->socket_status_cb(iscsi, SCSI_STATUS_GOOD, NULL,
iscsi->connect_data); iscsi->connect_data);
@@ -540,39 +538,42 @@ iscsi_free_iscsi_inqueue(struct iscsi_in_pdu *inqueue)
} }
} }
#ifdef HAVE_TCP_KEEPALIVE
int iscsi_set_tcp_keepalive(struct iscsi_context *iscsi, int idle, int count, int interval) int iscsi_set_tcp_keepalive(struct iscsi_context *iscsi, int idle, int count, int interval)
{ {
int value; int value;
#ifdef SO_KEEPALIVE
value =1; value =1;
if (setsockopt(iscsi->fd, SOL_SOCKET, SO_KEEPALIVE, &value, sizeof(value)) != 0) { if (setsockopt(iscsi->fd, SOL_SOCKET, SO_KEEPALIVE, &value, sizeof(value)) != 0) {
iscsi_set_error(iscsi, "TCP: Failed to set socket option SO_KEEPALIVE. Error %s(%d)", strerror(errno), errno); iscsi_set_error(iscsi, "TCP: Failed to set socket option SO_KEEPALIVE. Error %s(%d)", strerror(errno), errno);
return -1; return -1;
} }
#endif
#ifdef TCP_KEEPCNT
value = count; value = count;
if (setsockopt(iscsi->fd, SOL_TCP, TCP_KEEPCNT, &value, sizeof(value)) != 0) { if (setsockopt(iscsi->fd, SOL_TCP, TCP_KEEPCNT, &value, sizeof(value)) != 0) {
iscsi_set_error(iscsi, "TCP: Failed to set tcp keepalive count. Error %s(%d)", strerror(errno), errno); iscsi_set_error(iscsi, "TCP: Failed to set tcp keepalive count. Error %s(%d)", strerror(errno), errno);
return -1; return -1;
} }
#endif
#ifdef TCP_KEEPINTVL
value = interval; value = interval;
if (setsockopt(iscsi->fd, SOL_TCP, TCP_KEEPINTVL, &value, sizeof(value)) != 0) { if (setsockopt(iscsi->fd, SOL_TCP, TCP_KEEPINTVL, &value, sizeof(value)) != 0) {
iscsi_set_error(iscsi, "TCP: Failed to set tcp keepalive interval. Error %s(%d)", strerror(errno), errno); iscsi_set_error(iscsi, "TCP: Failed to set tcp keepalive interval. Error %s(%d)", strerror(errno), errno);
return -1; return -1;
} }
#endif
#ifdef TCP_KEEPIDLE
value = idle; value = idle;
if (setsockopt(iscsi->fd, SOL_TCP, TCP_KEEPIDLE, &value, sizeof(value)) != 0) { if (setsockopt(iscsi->fd, SOL_TCP, TCP_KEEPIDLE, &value, sizeof(value)) != 0) {
iscsi_set_error(iscsi, "TCP: Failed to set tcp keepalive idle. Error %s(%d)", strerror(errno), errno); iscsi_set_error(iscsi, "TCP: Failed to set tcp keepalive idle. Error %s(%d)", strerror(errno), errno);
return -1; return -1;
} }
#endif
return 0; return 0;
} }
#endif
#if defined(WIN32) #if defined(WIN32)
int poll(struct pollfd *fds, int nfsd, int timeout) int poll(struct pollfd *fds, int nfsd, int timeout)
{ {