From c053a54faacff6c5cd9aa1ead0e3a17e9a8e93eb Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 8 Feb 2018 23:07:17 +0000 Subject: [PATCH] Added test to cover setsockopt for tcpkeepalive --- tests/acceptance/ld_preload.rb | 6 ++++ .../ld_preloads/setsockopt_logger.c | 34 +++++++++++++++++++ tests/acceptance/test_serve_mode.rb | 21 +++++++----- 3 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 tests/acceptance/ld_preloads/setsockopt_logger.c diff --git a/tests/acceptance/ld_preload.rb b/tests/acceptance/ld_preload.rb index 9cc5a14..6ebf3cc 100644 --- a/tests/acceptance/ld_preload.rb +++ b/tests/acceptance/ld_preload.rb @@ -33,4 +33,10 @@ module LdPreload @ld_preload_logs[obj_name].eof? lines end + + def parse_ld_preload_logs(obj_name) + read_ld_preload_log(obj_name).map do |l| + l.split(':').map { |i| i =~ /^\d+$/ ? i.to_i : i } + end + end end diff --git a/tests/acceptance/ld_preloads/setsockopt_logger.c b/tests/acceptance/ld_preloads/setsockopt_logger.c new file mode 100644 index 0000000..08f3142 --- /dev/null +++ b/tests/acceptance/ld_preloads/setsockopt_logger.c @@ -0,0 +1,34 @@ +#define _GNU_SOURCE + +#include +#include +#include +#include + +typedef int (*real_setsockopt_t)(int sockfd, int level, int optname, const void *optval, socklen_t optlen); + +int real_setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen) +{ + return ((real_setsockopt_t)dlsym(RTLD_NEXT, "setsockopt"))(sockfd, level, optname, optval, optlen); +} + +/* + * Noddy LD_PRELOAD wrapper to catch setsockopt calls, and log them to a file. + */ + +int setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen) +{ + FILE *fd; + char *fn; + int retval; + + retval = real_setsockopt(sockfd, level, optname, optval, optlen); + fn = getenv("OUTPUT_setsockopt_logger"); + if ( fn != NULL && optval != NULL && optlen == 4) { + fd = fopen(fn,"a"); + fprintf(fd,"setsockopt:%d:%d:%i:%d\n", level, optname, *(int *)optval, retval); + fclose(fd); + } + + return retval; +} diff --git a/tests/acceptance/test_serve_mode.rb b/tests/acceptance/test_serve_mode.rb index 8a451ce..cc392d6 100644 --- a/tests/acceptance/test_serve_mode.rb +++ b/tests/acceptance/test_serve_mode.rb @@ -40,12 +40,6 @@ class TestServeMode < Test::Unit::TestCase end end - def parse_msync_logs - read_ld_preload_log('msync_logger').map do |l| - l.split(':').map { |i| i =~ /^\d+$/ ? i.to_i : i } - end - end - def test_bad_request_magic_receives_error_response connect_to_server do |client| # replace REQUEST_MAGIC with all 0s to make it look bad @@ -145,7 +139,7 @@ class TestServeMode < Test::Unit::TestCase assert_equal FlexNBD::REPLY_MAGIC, rsp[:magic] assert_equal 0, rsp[:error] end - op = parse_msync_logs + op = parse_ld_preload_logs('msync_logger') assert_equal 1, op.count, 'Only one msync expected' assert_equal @env.blocksize, op.first[2], 'msync length wrong' assert_equal 6, op.first[3], 'msync called with incorrect flags' @@ -165,7 +159,7 @@ class TestServeMode < Test::Unit::TestCase assert_equal FlexNBD::REPLY_MAGIC, rsp[:magic] assert_equal 0, rsp[:error] end - op = parse_msync_logs + op = parse_ld_preload_logs('msync_logger') assert_equal 1, op.count, 'Only one msync expected' @@ -190,4 +184,15 @@ class TestServeMode < Test::Unit::TestCase client.close end end + + def test_server_sets_tcpkeepalive + with_ld_preload('setsockopt_logger') do + connect_to_server(&:close) + op = parse_ld_preload_logs('setsockopt_logger') + assert(op.any? { |e| e == ['setsockopt', Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1, 0] }, 'TCP Keepalive not successfully set') + assert(op.any? { |e| e == ['setsockopt', Socket::SOL_TCP, Socket::TCP_KEEPIDLE, 30, 0] }, 'TCP Keepalive idle timeout not set to 30s') + assert(op.any? { |e| e == ['setsockopt', Socket::SOL_TCP, Socket::TCP_KEEPINTVL, 10, 0] }, 'TCP keepalive retry time not set to 10s') + assert(op.any? { |e| e == ['setsockopt', Socket::SOL_TCP, Socket::TCP_KEEPCNT, 3, 0] }, 'TCP keepalive count not set to 3') + end + end end