diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/httpd-corner.t | 4 | ||||
| -rw-r--r-- | t/httpd-https.t | 6 | ||||
| -rw-r--r-- | t/httpd.t | 6 | ||||
| -rw-r--r-- | t/imapd-tls.t | 7 | ||||
| -rw-r--r-- | t/nntpd-tls.t | 7 |
5 files changed, 18 insertions, 12 deletions
diff --git a/t/httpd-corner.t b/t/httpd-corner.t index 5dc5734e..cec754c9 100644 --- a/t/httpd-corner.t +++ b/t/httpd-corner.t @@ -36,7 +36,7 @@ if ($^O eq 'linux') { } } elsif ($^O eq 'freebsd' && system('kldstat -m accf_data >/dev/null') == 0) { require PublicInbox::Daemon; - my $var = PublicInbox::Daemon::SO_ACCEPTFILTER(); + my $var = $PublicInbox::Daemon::SO_ACCEPTFILTER; $accf_arg = pack('a16a240', 'dataready', ''); setsockopt($sock, SOL_SOCKET, $var, $accf_arg) or die "setsockopt: $!"; } @@ -596,7 +596,7 @@ SKIP: { SKIP: { skip 'SO_ACCEPTFILTER is FreeBSD-only', 1 if $^O ne 'freebsd'; skip 'accf_data not loaded: kldload accf_data' if !defined $accf_arg; - my $var = PublicInbox::Daemon::SO_ACCEPTFILTER(); + my $var = $PublicInbox::Daemon::SO_ACCEPTFILTER; defined(my $x = getsockopt($sock, SOL_SOCKET, $var)) or die; is($x, $accf_arg, 'SO_ACCEPTFILTER unchanged if previously set'); }; diff --git a/t/httpd-https.t b/t/httpd-https.t index bf7d3f94..d42d7c50 100644 --- a/t/httpd-https.t +++ b/t/httpd-https.t @@ -98,8 +98,10 @@ for my $args ( skip 'accf_data not loaded? kldload accf_data', 2; } require PublicInbox::Daemon; - my $var = PublicInbox::Daemon::SO_ACCEPTFILTER(); - my $x = getsockopt($https, SOL_SOCKET, $var); + ok(defined($PublicInbox::Daemon::SO_ACCEPTFILTER), + 'SO_ACCEPTFILTER defined'); + my $x = getsockopt($https, SOL_SOCKET, + $PublicInbox::Daemon::SO_ACCEPTFILTER); like($x, qr/\Adataready\0+\z/, 'got dataready accf for https'); }; @@ -109,8 +109,10 @@ SKIP: { skip 'accf_http not loaded: kldload accf_http', 1; } require PublicInbox::Daemon; - my $var = PublicInbox::Daemon::SO_ACCEPTFILTER(); - my $x = getsockopt($sock, SOL_SOCKET, $var); + ok(defined($PublicInbox::Daemon::SO_ACCEPTFILTER), + 'SO_ACCEPTFILTER defined'); + my $x = getsockopt($sock, SOL_SOCKET, + $PublicInbox::Daemon::SO_ACCEPTFILTER); like($x, qr/\Ahttpready\0+\z/, 'got httpready accf for HTTP'); }; diff --git a/t/imapd-tls.t b/t/imapd-tls.t index 73f5112f..44ab350c 100644 --- a/t/imapd-tls.t +++ b/t/imapd-tls.t @@ -176,10 +176,11 @@ for my $args ( skip 'accf_data not loaded? kldload accf_data', 2; } require PublicInbox::Daemon; - my $var = PublicInbox::Daemon::SO_ACCEPTFILTER(); - my $x = getsockopt($imaps, SOL_SOCKET, $var); + my $x = getsockopt($imaps, SOL_SOCKET, + $PublicInbox::Daemon::SO_ACCEPTFILTER); like($x, qr/\Adataready\0+\z/, 'got dataready accf for IMAPS'); - $x = getsockopt($starttls, IPPROTO_TCP, $var); + $x = getsockopt($starttls, IPPROTO_TCP, + $PublicInbox::Daemon::SO_ACCEPTFILTER); is($x, undef, 'no BSD accept filter for plain IMAP'); }; diff --git a/t/nntpd-tls.t b/t/nntpd-tls.t index 9af6c254..d81d1e13 100644 --- a/t/nntpd-tls.t +++ b/t/nntpd-tls.t @@ -168,10 +168,11 @@ for my $args ( skip 'accf_data not loaded? kldload accf_data', 2; } require PublicInbox::Daemon; - my $var = PublicInbox::Daemon::SO_ACCEPTFILTER(); - my $x = getsockopt($nntps, SOL_SOCKET, $var); + my $x = getsockopt($nntps, SOL_SOCKET, + $PublicInbox::Daemon::SO_ACCEPTFILTER); like($x, qr/\Adataready\0+\z/, 'got dataready accf for NNTPS'); - $x = getsockopt($starttls, IPPROTO_TCP, $var); + $x = getsockopt($starttls, IPPROTO_TCP, + $PublicInbox::Daemon::SO_ACCEPTFILTER); is($x, undef, 'no BSD accept filter for plain NNTP'); }; |