diff options
| author |   bluhm <bluhm@openbsd.org> | 2016-05-29 14:38:33 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2016-05-29 14:38:33 +0000 |
| commit | 22fe7e52478feca42beaaa53b0a8b52c489d904f (patch) | |
| tree | 98f5f15dbe2d6687882bf02290eee4556c6ca551 | |
| parent | Fix sizes passed to free() in fdfree(). This prevents a panic reported (diff) | |
| download | wireguard-openbsd-22fe7e52478feca42beaaa53b0a8b52c489d904f.tar.xz wireguard-openbsd-22fe7e52478feca42beaaa53b0a8b52c489d904f.zip | |
When connecting to a non existing tcp listen socket on localhost,
connect(2) does no longer fail immediately. It reports EINPROGRESS
first, an ECONNREFUSED or EPIPE error follows later. Allow this
changed behavior in syslogd(8) regression tests.
| -rw-r--r-- | regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl | 14 | ||||
| -rw-r--r-- | regress/usr.sbin/syslogd/args-server-tls-reconnect.pl | 19 |
2 files changed, 18 insertions, 15 deletions
diff --git a/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl b/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl index 6a2d8b8e74c..ff56909e008 100644 --- a/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl +++ b/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl @@ -18,15 +18,15 @@ our %args = ( client => { func => sub { write_between2logs(shift, sub { my $self = shift; - ${$self->{syslogd}}->loggrep("Connection refused", 5) - or die "no connection refused in syslogd.log"; + ${$self->{syslogd}}->loggrep($errors, 5) + or die "no $errors in syslogd.log"; })}, }, syslogd => { loghost => '@tcp://127.0.0.1:$connectport', loggrep => { qr/Logging to FORWTCP \@tcp:\/\/127.0.0.1:\d+/ => '>=6', - qr/syslogd: connect .*: $errors/ => '>=2', + qr/syslogd: (connect .*|.*connection error): $errors/ => '>=2', get_between2loggrep(), }, }, @@ -42,21 +42,21 @@ our %args = ( $self->close(); shutdown(\*STDOUT, 1) or die "shutdown write failed: $!"; - ${$self->{syslogd}}->loggrep("Connection refused", 5) - or die "no connection refused in syslogd.log"; + ${$self->{syslogd}}->loggrep($errors, 5) + or die "no $errors in syslogd.log"; $self->listen(); $self->{redo}++; })}, loggrep => { qr/Accepted/ => 2, qr/syslogd: loghost .* connection close/ => 1, - qr/syslogd: connect .*: $errors/ => 1, + qr/syslogd: (connect .*|.*connection error): $errors/ => 1, get_between2loggrep(), }, }, file => { loggrep => { - qr/syslogd: connect .*: $errors/ => '>=1', + qr/syslogd: (connect .*|.*connection error): $errors/ => '>=1', get_between2loggrep(), }, }, diff --git a/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl b/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl index f0df830b9c2..564f3f42ac5 100644 --- a/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl +++ b/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl @@ -11,22 +11,23 @@ use warnings; use Socket; use Errno ':POSIX'; -my @errors = (ECONNREFUSED); +my @errors = (ECONNREFUSED, EPIPE); my $errors = "(". join("|", map { $! = $_ } @errors). ")"; our %args = ( client => { func => sub { write_between2logs(shift, sub { my $self = shift; - ${$self->{syslogd}}->loggrep("Connection refused", 5) - or die "no connection refused in syslogd.log"; + ${$self->{syslogd}}->loggrep($errors, 5) + or die "no $errors in syslogd.log"; })}, }, syslogd => { loghost => '@tls://127.0.0.1:$connectport', loggrep => { qr/Logging to FORWTLS \@tls:\/\/127.0.0.1:\d+/ => '>=6', - qr/syslogd: connect .*: $errors/ => '>=2', + qr/syslogd: (connect .*|.* connection error: handshake failed): /. + $errors => '>=2', get_between2loggrep(), }, }, @@ -42,21 +43,23 @@ our %args = ( $self->close(); shutdown(\*STDOUT, 1) or die "shutdown write failed: $!"; - ${$self->{syslogd}}->loggrep("Connection refused", 5) - or die "no connection refused in syslogd.log"; + ${$self->{syslogd}}->loggrep($errors, 5) + or die "no $errors in syslogd.log"; $self->listen(); $self->{redo}++; })}, loggrep => { qr/Accepted/ => 2, qr/syslogd: loghost .* connection close/ => 1, - qr/syslogd: connect .*: $errors/ => 1, + qr/syslogd: (connect .*|.* connection error: handshake failed): /. + $errors => 1, get_between2loggrep(), }, }, file => { loggrep => { - qr/syslogd: connect .*: $errors/ => '>=1', + qr/syslogd: (connect .*|.* connection error: handshake failed): /. + $errors => '>=1', get_between2loggrep(), }, }, |