yahns Ruby server user/dev discussion
 help / color / Atom feed
* [PATCH] test_bin: SO_KEEPALIVE value only needs to be true
@ 2017-04-03 19:59 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2017-04-03 19:59 UTC (permalink / raw)
  To: yahns-public

From: Eric Wong <e@80x24.org>

On FreeBSD 10.3 (and presumably other *BSD TCP stacks, the value
of SO_KEEPALIVE returned by getsockopt is 8, even when set to
'1' via setsockopt.  Relax the test to only ensure the boolean
value is interpreted as "true".

Verified independently of Ruby using the following:
--------8<---------
	#include <sys/types.h>
	#include <sys/socket.h>
	#include <stdio.h>

static int err(const char *msg)
{
	perror(msg);
	return 1;
}

int main(void)
{
	int sv[2];
	int set = 1;
	int got;
	socklen_t len = (socklen_t) sizeof(int);
	int rc;

	rc = socketpair(PF_LOCAL, SOCK_STREAM, 0, sv);
	if (rc)
		return err("socketpair failed");

	rc = setsockopt(sv[0], SOL_SOCKET, SO_KEEPALIVE, &set, len);
	if (rc)
		return err("setsockopt failed");

	rc = getsockopt(sv[0], SOL_SOCKET, SO_KEEPALIVE, &got, &len);
	if (rc)
		return err("getsockopt failed");

	printf("got: %d\n", got);
	return 0;
}
---
 test/test_bin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_bin.rb b/test/test_bin.rb
index be1c024..af990ad 100644
--- a/test/test_bin.rb
+++ b/test/test_bin.rb
@@ -35,7 +35,7 @@ def test_listen_fd3
       assert_equal "keep-alive", res["Connection"]
     end
 
-    assert_equal 1, @srv.getsockopt(:SOL_SOCKET, :SO_KEEPALIVE).int,
+    assert @srv.getsockopt(:SOL_SOCKET, :SO_KEEPALIVE).bool,
                  'ensure the inheriting process applies TCP socket options'
   ensure
     if pid
-- 
EW


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-03 19:59 [PATCH] test_bin: SO_KEEPALIVE value only needs to be true Eric Wong

yahns Ruby server user/dev discussion

Archives are clonable:
	git clone --mirror https://yhbt.net/yahns-public
	git clone --mirror http://ou63pmih66umazou.onion/yahns-public

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.lang.ruby.yahns
	nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.yahns

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox