summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2017-04-25 17:49:12 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2017-04-25 17:49:12 +0000
commitebd7ca5b24708e8c203ca9ca8240eae8914609a4 (patch)
tree01d80c00e408743a8ebeffec351a7ebd620d45a5
parent9e1430f1cf8a423d760b66ceaabe02422f2cf6e6 (diff)
Test listening on multiple syslog over TLS sockets.
-rw-r--r--regress/usr.sbin/syslogd/args-client-multilisten.pl110
1 files changed, 62 insertions, 48 deletions
diff --git a/regress/usr.sbin/syslogd/args-client-multilisten.pl b/regress/usr.sbin/syslogd/args-client-multilisten.pl
index de8dea60840..2f87f8eefd0 100644
--- a/regress/usr.sbin/syslogd/args-client-multilisten.pl
+++ b/regress/usr.sbin/syslogd/args-client-multilisten.pl
@@ -15,52 +15,64 @@ use Socket;
our %args = (
client => {
connectproto => "none",
+ redo => [
+ {
+ proto => "udp",
+ domain => AF_INET,
+ addr => "127.0.0.1",
+ port => 514,
+ },
+ {
+ proto => "udp",
+ domain => AF_INET,
+ addr => "127.0.0.1",
+ port => 513,
+ },
+ {
+ proto => "udp",
+ domain => AF_INET6,
+ addr => "::1",
+ port => 514,
+ },
+ {
+ proto => "tcp",
+ domain => AF_INET,
+ addr => "127.0.0.1",
+ port => 514,
+ },
+ {
+ proto => "tcp",
+ domain => AF_INET6,
+ addr => "::1",
+ port => 513,
+ },
+ {
+ proto => "tcp",
+ domain => AF_INET6,
+ addr => "::1",
+ port => 514,
+ },
+ {
+ proto => "tls",
+ domain => AF_INET6,
+ addr => "::1",
+ port => 6514,
+ },
+ {
+ proto => "tls",
+ domain => AF_INET,
+ addr => "127.0.0.1",
+ port => 6514,
+ },
+ {
+ proto => "tls",
+ domain => AF_INET,
+ addr => "127.0.0.1",
+ port => 6515,
+ },
+ ],
func => sub {
my $self = shift;
- $self->{redo} ||= [
- {
- proto => "udp",
- domain => AF_INET,
- addr => "127.0.0.1",
- port => 514,
- },
- {
- proto => "udp",
- domain => AF_INET,
- addr => "127.0.0.1",
- port => 513,
- },
- {
- proto => "udp",
- domain => AF_INET6,
- addr => "::1",
- port => 514,
- },
- {
- proto => "tcp",
- domain => AF_INET,
- addr => "127.0.0.1",
- port => 514,
- },
- {
- proto => "tcp",
- domain => AF_INET6,
- addr => "::1",
- port => 513,
- },
- {
- proto => "tcp",
- domain => AF_INET6,
- addr => "::1",
- port => 514,
- },
- {
- proto => "tls",
- domain => AF_INET6,
- addr => "::1",
- port => 6514,
- },
- ];
write_message($self, "client proto: ". $self->{connectproto});
close($self->{cs}) if $self->{cs};
if (my $connect = shift @{$self->{redo}}) {
@@ -78,7 +90,7 @@ our %args = (
}
},
loggrep => {
- qr/connect sock: (127.0.0.1|::1) \d+/ => 7,
+ qr/connect sock: (127.0.0.1|::1) \d+/ => 9,
get_testgrep() => 1,
},
},
@@ -86,7 +98,7 @@ our %args = (
options => [qw(
-U 127.0.0.1 -U [::1] -U 127.0.0.1:513
-T 127.0.0.1:514 -T [::1]:514 -T [::1]:513
- -S [::1]:6514
+ -S [::1]:6514 -S 127.0.0.1 -S 127.0.0.1:6515
)],
fstat => {
qr/ internet6? dgram udp (127.0.0.1):513$/ => 1,
@@ -95,14 +107,16 @@ our %args = (
qr/ internet6? stream tcp \w+ (127.0.0.1):514$/ => 1,
qr/ internet6? stream tcp \w+ (\[::1\]):513$/ => 1,
qr/ internet6? stream tcp \w+ (\[::1\]):514$/ => 1,
- qr/ internet6? stream tcp \w+ (127.0.0.1|\[::1\]):6514$/ => 1,
+ qr/ internet6? stream tcp \w+ (\[::1\]):6514$/ => 1,
+ qr/ internet6? stream tcp \w+ (127.0.0.1):6514$/ => 1,
+ qr/ internet6? stream tcp \w+ (127.0.0.1):6515$/ => 1,
},
},
file => {
loggrep => {
qr/client proto: udp/ => '>=1',
qr/client proto: tcp/ => 3,
- qr/client proto: tls/ => 1,
+ qr/client proto: tls/ => 3,
get_testgrep() => 1,
}
},