dns-oarc/dnsperf
1
0
Fork 0
Code Issues Activity

Merging upstream version 2.7.1.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 09:00:15 +01:00
parent 3982d2b96d
commit ce24908707
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
8 changed files with 74 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/dns.c
View file

@ -111,12 +111,11 @@ perf_result_t perf_dname_fromstring(const char* str, size_t len, perf_buffer_t*
for (at = 0; at < len; at++) {
if (*(str + at) == '\\') {
at++;
if (at >= len)
return PERF_R_FAILURE;
if (*(str + at) >= '0' && *(str + at) <= '9') {
char b[4];
long v;
memcpy(b, str, 3);
memcpy(b, str + at, 3);
at += 2;
b[3] = 0;
v = strtol(b, 0, 7);
if (v < 0 || v > 255)
@ -124,6 +123,8 @@ perf_result_t perf_dname_fromstring(const char* str, size_t len, perf_buffer_t*
perf_buffer_putuint8(target, (uint8_t)v);
continue;
}
} else if (*(str + at) == '.') {
break;
}
perf_buffer_putmem(target, str + at, 1);
}

6
src/test/Makefile.am
View file

@ -1,9 +1,9 @@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
CLEANFILES = test*.log test*.trs \
test2.out test4.out test4err.out key.pem cert.pem
test2.out test4.out test4err.out key.pem cert.pem test6.out
TESTS = test1.sh test2.sh test3.sh test4.sh test5.sh
TESTS = test1.sh test2.sh test3.sh test4.sh test5.sh test6.sh
EXTRA_DIST = $(TESTS) \
datafile datafile2 updatefile datafile3 datafile4 datafile5
datafile datafile2 updatefile datafile3 datafile4 datafile5 datafile6

13
src/test/Makefile.in
View file

@ -465,11 +465,11 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
CLEANFILES = test*.log test*.trs \
test2.out test4.out test4err.out key.pem cert.pem
test2.out test4.out test4err.out key.pem cert.pem test6.out
TESTS = test1.sh test2.sh test3.sh test4.sh test5.sh
TESTS = test1.sh test2.sh test3.sh test4.sh test5.sh test6.sh
EXTRA_DIST = $(TESTS) \
datafile datafile2 updatefile datafile3 datafile4 datafile5
datafile datafile2 updatefile datafile3 datafile4 datafile5 datafile6
all: all-am
@ -694,6 +694,13 @@ test5.sh.log: test5.sh
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
test6.sh.log: test6.sh
@p='test6.sh'; \
b='test6.sh'; \
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
.test.log:
@p='$<'; \
$(am__set_b); \

26
src/test/datafile6 Normal file
View file

@ -0,0 +1,26 @@
\" A
\001 A
\". A
a\". A
\"a. A
a\"a. A
a\"a\". A
\!\"a\". A
\001. A
a\001. A
\001a. A
a\001a. A
a\001\001\001a. A
a\001a\001a\001. A
\".\". A
a\".a\". A
\"a.\"a. A
a\"a.a\"a. A
a\"a\".a\"a\". A
\!\"a\".\!\"a\". A
\001.\001. A
a\001.a\001. A
\001a.\001a. A
a\001a.a\001a. A
a\001\001\001a.a\001\001\001a. A
a\001a\001a\001.a\001a\001a\001. A

7
src/test/test6.sh Executable file
View file

@ -0,0 +1,7 @@
#!/bin/sh -xe
test "$TEST_DNSPERF_WITH_NETWORK" = "1" || exit 0
../dnsperf -vvv -d "$srcdir/datafile6" -s 1.1.1.1 >test6.out
grep "NXDOMAIN 26" test6.out