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

TCP KEEPALIVE support

Browse Source 
Add tcp keeplaive support on platforms that support these socket options.
Set default to fail the socket after 120 seconds
This commit is contained in:
Ronnie Sahlberg
2011-04-13 21:35:51 +10:00
parent 120f41f225
commit b6782dd7c8
3 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -64,6 +64,16 @@ 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_MSG_CHECKING(whether libpopt is available) AC_MSG_CHECKING(whether libpopt is available)
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"

6
include/iscsi.h
View File

@@ -54,7 +54,11 @@ int iscsi_service(struct iscsi_context *iscsi, int revents);
*/ */
int iscsi_queue_length(struct iscsi_context *iscsi); int iscsi_queue_length(struct iscsi_context *iscsi);
/*
* To set tcp keepalive for the session
* ONLY available on platforms with tcp keepalive socket options
*/
int iscsi_set_tcp_keepalive(struct iscsi_context *iscsi, int idle, int count, int interval);

39
lib/socket.c
View File

@@ -23,7 +23,9 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h>
#include <poll.h> #include <poll.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <arpa/inet.h> #include <arpa/inet.h>
@@ -411,6 +413,9 @@ iscsi_service(struct iscsi_context *iscsi, int revents)
return -1; return -1;
} }
#ifdef HAVE_TCP_KEEPALIVE
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);
@@ -476,3 +481,37 @@ iscsi_free_iscsi_inqueue(struct iscsi_in_pdu *inqueue)
inqueue = next; inqueue = next;
} }
} }
#ifdef HAVE_TCP_KEEPALIVE
int iscsi_set_tcp_keepalive(struct iscsi_context *iscsi, int idle, int count, int interval)
{
int value;
value =1;
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);
return -1;
}
value = count;
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);
return -1;
}
value = interval;
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);
return -1;
}
value = idle;
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);
return -1;
}
return 0;
}
#endif