diff --git a/test/lib.sh b/test/lib.sh index 1ff6899..9612cbd 100755 --- a/test/lib.sh +++ b/test/lib.sh @@ -96,6 +96,7 @@ setup() cat <<-EOF > ${CONFD}/bar.conf # For remote logging *.* @127.0.0.2 + *.* @127.0.0.2:${PORT2} ;RFC3164 EOF ../src/syslogd -m1 -b :${PORT} -d -sF -f ${CONF} -p ${SOCK} -p ${ALTSOCK} -C ${CACHE} -P ${PID} & diff --git a/test/remote.sh b/test/remote.sh index a5f1dbb..0331b6d 100755 --- a/test/remote.sh +++ b/test/remote.sh @@ -1,4 +1,6 @@ #!/bin/sh +# Verify that the sending to a remote IP:PORT works, note not receiving, +# there's a test fwd.sh that verifies that. set -x if [ x"${srcdir}" = x ]; then @@ -7,11 +9,20 @@ fi . ${srcdir}/lib.sh setup -MSG="kilroy" +export MSG="kilroy" + +# Only needed for verifying correct RFC3164 parsing +cat <<-EOF >${CONFD2}/50-default.conf + *.* ${LOG2} + EOF +../src/syslogd -a 127.0.0.2:* -b :${PORT2} -d -F -f ${CONF2} -p ${SOCK2} -m1 -C ${CACHE2} -P ${PID2} & +sleep 3 +cat ${PID2} >> "$DIR/PIDs" +kill -USR1 `cat ${PID2}` # Start collector in background, note: might need sudo! #tshark -Qni lo -w ${CAP} port ${PORT} & -tshark -Qni lo -w ${CAP} port 514 & +tshark -Qni lo -w ${CAP} port 514 2>/dev/null & TPID="$!" echo "$TPID" >> "$DIR/PIDs" @@ -29,5 +40,4 @@ wait ${TPID} # Analyze content, should have $MSG now ... #tshark -d udp.port==${PORT},syslog -r ${CAP} | grep ${MSG} -tshark -r ${CAP} | grep ${MSG} || FAIL "Cannot find: ${MSG}" -rm ${CAP} +tshark -r ${CAP} 2>/dev/null | grep ${MSG} || FAIL "Cannot find: ${MSG}"