vrr/nDPId
2
0
Fork 0
mirror of https://github.com/utoni/nDPId.git synced 2026-05-06 03:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Process additional layer 3 protocols.

Browse source 
* bump libnDPI to c53c82d4823b5a8f856d1375155ac5112b68e8af
 * run_tests.sh: improved execution from non-git directories e.g. via `make dist`
 * updated JSON schema to be more restrictive
 * nDPId: splitted generic get_ip_from_sockaddr into IPv4/IPv6 to prevent compiler warnings on some platforms

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig 2022-01-31 20:38:58 +01:00
parent 7022d0b1c5
commit 1a0d7ddbfa
No known key found for this signature in database
GPG key ID: 22C5333D922537D2
264 changed files with 15330 additions and 16828 deletions
Download patch file Download diff file Expand all files Collapse all files

38
test/run_tests.sh
View file

@ -8,6 +8,7 @@ nDPId_test_EXEC="$(realpath "${2:-"${MYDIR}/../nDPId-test"}")"
NETCAT_EXEC="$(which nc) -q 0 -l 127.0.0.1 9000"
JSON_VALIDATOR="$(realpath "${3:-"${MYDIR}/../examples/py-schema-validation/py-schema-validation.py"}")"
SEMN_VALIDATOR="$(realpath "${4:-"${MYDIR}/../examples/py-semantic-validation/py-semantic-validation.py"}")"
IS_GIT=$(test -d "${MYDIR}/../.git" && printf '1' || printf '0')
function usage()
{
@ -108,24 +109,12 @@ for pcap_file in *.pcap *.pcapng *.cap; do
2>>"/tmp/nDPId-test-stderr/${pcap_file}.out"
nDPId_test_RETVAL=$?
if [[ ${pcap_file} == fuzz-* ]]; then
if [ ${nDPId_test_RETVAL} -eq 0 ]; then
printf '%s\n' '[OK]'
elif [ ${nDPId_test_RETVAL} -eq 1 ]; then
# fuzzed PCAPs with a return value of 1 indicates that libpcap failed
printf '%s\n' '[FAIL][IGNORED]'
else
# may be a valid sanitizer/other failure
printf '%s\n' '[FAIL]'
printf '%s\n' '----------------------------------------'
printf '%s\n' "-- STDERR of ${pcap_file}: /tmp/nDPId-test-stderr/${pcap_file}.out"
cat "/tmp/nDPId-test-stderr/${pcap_file}.out"
fi
elif [ ${nDPId_test_RETVAL} -eq 0 ]; then
if [ ${nDPId_test_RETVAL} -eq 0 ]; then
if [ ! -r "${MYDIR}/results/${pcap_file}.out" ]; then
printf '%s\n' '[NEW]'
mv -v "/tmp/nDPId-test-stdout/${pcap_file}.out.new" \
"${MYDIR}/results/${pcap_file}.out"
test ${IS_GIT} -eq 1 && \
mv -v "/tmp/nDPId-test-stdout/${pcap_file}.out.new" \
"${MYDIR}/results/${pcap_file}.out"
TESTS_FAILED=$((TESTS_FAILED + 1))
elif diff -u0 "${MYDIR}/results/${pcap_file}.out" \
"/tmp/nDPId-test-stdout/${pcap_file}.out.new" >/dev/null; then
@ -135,8 +124,9 @@ for pcap_file in *.pcap *.pcapng *.cap; do
printf '%s\n' '[DIFF]'
diff -u0 "${MYDIR}/results/${pcap_file}.out" \
"/tmp/nDPId-test-stdout/${pcap_file}.out.new"
mv -v "/tmp/nDPId-test-stdout/${pcap_file}.out.new" \
"${MYDIR}/results/${pcap_file}.out"
test ${IS_GIT} -eq 1 && \
mv -v "/tmp/nDPId-test-stdout/${pcap_file}.out.new" \
"${MYDIR}/results/${pcap_file}.out"
TESTS_FAILED=$((TESTS_FAILED + 1))
fi
else
@ -162,10 +152,6 @@ function validate_results()
printf ' %s\n' '[MISSING]'
return 1
fi
if [[ ${pcap_file} == fuzz-* ]]; then
printf ' %s\n' '[SKIPPED]'
return 0
fi
# Note that the grep command is required as we generate a summary in the results file.
cat "${result_file}" | grep -vE '^~~.*$' | ${NETCAT_EXEC} &
@ -220,6 +206,14 @@ for out_file in results/*.out; do
fi
done
cat <<EOF
Done. For more information see text files in:
/tmp/nDPId-test-stdout/
/tmp/nDPId-test-stderr/
EOF
if [ ${TESTS_FAILED} -eq 0 ]; then
cat <<EOF