mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-13 07:10:42 +01:00
Merge pull request #5199 from rgerhards/testbench-sndrcv-cleanup
testbench: cleanup a test and some nitfixes to it
This commit is contained in:
commit
f34eee3a82
@ -17,7 +17,6 @@ test_error_exit_handler() {
|
|||||||
#receiver
|
#receiver
|
||||||
export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.receiver.debuglog"
|
export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.receiver.debuglog"
|
||||||
generate_conf
|
generate_conf
|
||||||
export PORT_RCVR="$(get_free_port)"
|
|
||||||
add_conf '
|
add_conf '
|
||||||
global(
|
global(
|
||||||
defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
|
defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
|
||||||
@ -45,24 +44,19 @@ startup
|
|||||||
#sender
|
#sender
|
||||||
export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.sender.debuglog"
|
export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.sender.debuglog"
|
||||||
#valgrind="valgrind"
|
#valgrind="valgrind"
|
||||||
export PORT_RCVR=$TCPFLOOD_PORT
|
export PORT_RCVR=$TCPFLOOD_PORT # save TCPFLOOD_PORT, generate_conf will overwrite it!
|
||||||
generate_conf 2
|
generate_conf 2
|
||||||
export TCPFLOOD_PORT="$(get_free_port)" # TODO: move to diag.sh
|
|
||||||
echo TCPFLOOD_PORT new: $TCPFLOOD_PORT
|
|
||||||
add_conf '
|
add_conf '
|
||||||
global(
|
global(
|
||||||
defaultNetstreamDriverCAFile="'$srcdir/tls-certs/ca.pem'"
|
defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
|
||||||
defaultNetstreamDriverCertFile="'$srcdir/tls-certs/cert.pem'"
|
defaultNetstreamDriverCertFile="'$srcdir/testsuites/x.509/client-cert.pem'"
|
||||||
defaultNetstreamDriverKeyFile="'$srcdir/tls-certs/key.pem'"
|
defaultNetstreamDriverKeyFile="'$srcdir/testsuites/x.509/client-key.pem'"
|
||||||
defaultNetstreamDriver="ossl"
|
defaultNetstreamDriver="ossl"
|
||||||
debug.whitelist="on"
|
|
||||||
debug.files=["nsd_ossl.c", "tcpsrv.c", "nsdsel_ossl.c", "nsdpoll_ptcp.c", "dnscache.c"]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
# set up the action
|
# set up the action
|
||||||
$DefaultNetstreamDriver ossl # use gtls netstream driver
|
$DefaultNetstreamDriver ossl
|
||||||
$ActionSendStreamDriverMode 1 # require TLS for the connection
|
$ActionSendStreamDriverMode 1
|
||||||
$ActionSendStreamDriverAuthMode anon
|
$ActionSendStreamDriverAuthMode anon
|
||||||
$ActionSendTCPRebindInterval 100
|
$ActionSendTCPRebindInterval 100
|
||||||
*.* @@127.0.0.1:'$PORT_RCVR'
|
*.* @@127.0.0.1:'$PORT_RCVR'
|
||||||
@ -81,5 +75,4 @@ wait_shutdown
|
|||||||
export SEQ_CHECK_OPTIONS=-d
|
export SEQ_CHECK_OPTIONS=-d
|
||||||
seq_check
|
seq_check
|
||||||
|
|
||||||
unset PORT_RCVR
|
|
||||||
exit_test
|
exit_test
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user