Merging upstream version 2.2.1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
8a88aceccc
commit
7fadabf04f
66 changed files with 117 additions and 81 deletions
2
LICENSE
2
LICENSE
|
@ -1,6 +1,6 @@
|
|||
DNSCAP
|
||||
|
||||
Copyright (c) 2016-2023, OARC, Inc.
|
||||
Copyright (c) 2016-2024 OARC, Inc.
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# dnscap
|
||||
|
||||
[![Total alerts](https://img.shields.io/lgtm/alerts/g/DNS-OARC/dnscap.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/DNS-OARC/dnscap/alerts/) [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=dns-oarc%3Adnscap&metric=bugs)](https://sonarcloud.io/dashboard?id=dns-oarc%3Adnscap) [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=dns-oarc%3Adnscap&metric=security_rating)](https://sonarcloud.io/dashboard?id=dns-oarc%3Adnscap)
|
||||
[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=dns-oarc%3Adnscap&metric=bugs)](https://sonarcloud.io/summary/new_code?id=dns-oarc%3Adnscap) [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=dns-oarc%3Adnscap&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=dns-oarc%3Adnscap)
|
||||
|
||||
`dnscap` is a network capture utility designed specifically for DNS traffic.
|
||||
It produces binary data in `pcap(3)` and other format. This utility is similar
|
||||
|
|
20
configure
vendored
20
configure
vendored
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.71 for dnscap 2.2.0.
|
||||
# Generated by GNU Autoconf 2.71 for dnscap 2.2.1.
|
||||
#
|
||||
# Report bugs to <dnscap-users@dns-oarc.net>.
|
||||
#
|
||||
|
@ -621,8 +621,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='dnscap'
|
||||
PACKAGE_TARNAME='dnscap'
|
||||
PACKAGE_VERSION='2.2.0'
|
||||
PACKAGE_STRING='dnscap 2.2.0'
|
||||
PACKAGE_VERSION='2.2.1'
|
||||
PACKAGE_STRING='dnscap 2.2.1'
|
||||
PACKAGE_BUGREPORT='dnscap-users@dns-oarc.net'
|
||||
PACKAGE_URL='https://github.com/DNS-OARC/dnscap/issues'
|
||||
|
||||
|
@ -1381,7 +1381,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures dnscap 2.2.0 to adapt to many kinds of systems.
|
||||
\`configure' configures dnscap 2.2.1 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
@ -1452,7 +1452,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of dnscap 2.2.0:";;
|
||||
short | recursive ) echo "Configuration of dnscap 2.2.1:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
@ -1585,7 +1585,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
dnscap configure 2.2.0
|
||||
dnscap configure 2.2.1
|
||||
generated by GNU Autoconf 2.71
|
||||
|
||||
Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
|
@ -1898,7 +1898,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by dnscap $as_me 2.2.0, which was
|
||||
It was created by dnscap $as_me 2.2.1, which was
|
||||
generated by GNU Autoconf 2.71. Invocation command line was
|
||||
|
||||
$ $0$ac_configure_args_raw
|
||||
|
@ -3168,7 +3168,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='dnscap'
|
||||
VERSION='2.2.0'
|
||||
VERSION='2.2.1'
|
||||
|
||||
|
||||
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
|
||||
|
@ -15829,7 +15829,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by dnscap $as_me 2.2.0, which was
|
||||
This file was extended by dnscap $as_me 2.2.1, which was
|
||||
generated by GNU Autoconf 2.71. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
@ -15898,7 +15898,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config='$ac_cs_config_escaped'
|
||||
ac_cs_version="\\
|
||||
dnscap config.status 2.2.0
|
||||
dnscap config.status 2.2.1
|
||||
configured by $0, generated by GNU Autoconf 2.71,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (c) 2016-2023, OARC, Inc.
|
||||
# Copyright (c) 2016-2024 OARC, Inc.
|
||||
# Copyright (c) 2007, The Measurement Factory, Inc.
|
||||
# Copyright (c) 2007, Internet Systems Consortium, Inc.
|
||||
# All rights reserved.
|
||||
|
@ -33,7 +33,7 @@
|
|||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
AC_PREREQ(2.61)
|
||||
AC_INIT([dnscap], [2.2.0], [dnscap-users@dns-oarc.net], [dnscap], [https://github.com/DNS-OARC/dnscap/issues])
|
||||
AC_INIT([dnscap], [2.2.1], [dnscap-users@dns-oarc.net], [dnscap], [https://github.com/DNS-OARC/dnscap/issues])
|
||||
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
|
||||
AC_CONFIG_SRCDIR([src/dnscap.c])
|
||||
AC_CONFIG_HEADER([src/config.h])
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2023, OARC, Inc.
|
||||
* Copyright (c) 2018-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2023, OARC, Inc.
|
||||
* Copyright (c) 2018-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2023, OARC, Inc.
|
||||
* Copyright (c) 2018-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2023, OARC, Inc.
|
||||
* Copyright (c) 2018-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
* Below is the original copyright notice from txtout.c.
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2023, OARC, Inc.
|
||||
* Copyright (c) 2018-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Author Roy Arends
|
||||
*
|
||||
* Copyright (c) 2017-2023, OARC, Inc.
|
||||
* Copyright (c) 2017-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env perl
|
||||
#
|
||||
# Copyright (c) 2018-2023, OARC, Inc.
|
||||
# Copyright (c) 2018-2024 OARC, Inc.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.\" Copyright (c) 2017-2023, OARC, Inc.
|
||||
.\" Copyright (c) 2017-2024 OARC, Inc.
|
||||
.\" All rights reserved.
|
||||
.\"
|
||||
.\" Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2023, OARC, Inc.
|
||||
* Copyright (c) 2018-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
@ -86,7 +86,7 @@ void prepare_bpft(void)
|
|||
else
|
||||
len += text_add(&bpfl, "("); /* ( transports ... */
|
||||
if (wanticmp) {
|
||||
len += text_add(&bpfl, " ( ip proto 1 or ip proto 58 ) or");
|
||||
len += text_add(&bpfl, " ( icmp or icmp6 ) or");
|
||||
}
|
||||
if (wantfrags) {
|
||||
len += text_add(&bpfl, " ( ip[6:2] & 0x1fff != 0 or ip6[6] = 44 ) or");
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.\" Copyright (c) 2016-2023, OARC, Inc.
|
||||
.\" Copyright (c) 2016-2024 OARC, Inc.
|
||||
.\" All rights reserved.
|
||||
.\"
|
||||
.\" Redistribution and use in source and binary forms, with or without
|
||||
|
@ -226,8 +226,8 @@ This depends on the libpcap version.
|
|||
If you want to make sure you're capturing on all interfaces then use the
|
||||
special "any" or "all" (depends on system).
|
||||
|
||||
More than one interface may be selected which will cause output to be
|
||||
interleaved from all selected interfaces.
|
||||
Can be specified more than once to select multiple interfaces, this will
|
||||
cause output to be interleaved from all selected interfaces.
|
||||
.TP
|
||||
.B \-p
|
||||
Asks that the interface not be put into promiscuous mode.
|
||||
|
@ -468,7 +468,7 @@ VLAN id 4095 can be used to specify all vlans.
|
|||
.BI "\-L " vlan
|
||||
Captures 802.1Q encapsulated packets matching the specified vlans AND
|
||||
packets without VLAN tags.
|
||||
Can be specified more than one to select multiple vlans.
|
||||
Can be specified more than once to select multiple vlans.
|
||||
VLAN id 4095 can be used to specify all vlans.
|
||||
.TP
|
||||
.BI "\-u " port
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
@ -325,7 +325,7 @@ int dumper_close(my_bpftimeval ts)
|
|||
int x;
|
||||
if (!p->close)
|
||||
continue;
|
||||
x = (*p->close)(ts);
|
||||
x = (*p->close)();
|
||||
if (x)
|
||||
logerr("%s_close returned %d", p->name, x);
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, OARC, Inc.
|
||||
* Copyright (c) 2016-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2023, OARC, Inc.
|
||||
* Copyright (c) 2018-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2023, OARC, Inc.
|
||||
* Copyright (c) 2018-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2023, OARC, Inc.
|
||||
* Copyright (c) 2018-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2023, OARC, Inc.
|
||||
* Copyright (c) 2018-2024 OARC, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -16,11 +16,12 @@ CLEANFILES = test*.log test*.trs \
|
|||
test13.out \
|
||||
test14.out \
|
||||
test_regex_match.out \
|
||||
edns.out
|
||||
edns.out \
|
||||
test_icmp.out
|
||||
|
||||
TESTS = test1.sh test2.sh test3.sh test4.sh test5.sh test6.sh test7.sh \
|
||||
test8.sh test9.sh test10.sh test11.sh test12.sh test13.sh test14.sh \
|
||||
test_regex_match.sh test_edns.sh
|
||||
test_regex_match.sh test_edns.sh test_icmp.sh
|
||||
|
||||
EXTRA_DIST = $(TESTS) \
|
||||
dns.gold dns.pcap \
|
||||
|
@ -36,4 +37,5 @@ EXTRA_DIST = $(TESTS) \
|
|||
dns6.pcap test10.gold \
|
||||
test14.gold \
|
||||
test_regex_match.gold \
|
||||
edns.pcap edns.gold
|
||||
edns.pcap edns.gold \
|
||||
gen_icmp.py icmp.pcap icmp.gold
|
||||
|
|
|
@ -481,11 +481,12 @@ CLEANFILES = test*.log test*.trs \
|
|||
test13.out \
|
||||
test14.out \
|
||||
test_regex_match.out \
|
||||
edns.out
|
||||
edns.out \
|
||||
test_icmp.out
|
||||
|
||||
TESTS = test1.sh test2.sh test3.sh test4.sh test5.sh test6.sh test7.sh \
|
||||
test8.sh test9.sh test10.sh test11.sh test12.sh test13.sh test14.sh \
|
||||
test_regex_match.sh test_edns.sh
|
||||
test_regex_match.sh test_edns.sh test_icmp.sh
|
||||
|
||||
EXTRA_DIST = $(TESTS) \
|
||||
dns.gold dns.pcap \
|
||||
|
@ -501,7 +502,8 @@ EXTRA_DIST = $(TESTS) \
|
|||
dns6.pcap test10.gold \
|
||||
test14.gold \
|
||||
test_regex_match.gold \
|
||||
edns.pcap edns.gold
|
||||
edns.pcap edns.gold \
|
||||
gen_icmp.py icmp.pcap icmp.gold
|
||||
|
||||
all: all-am
|
||||
|
||||
|
@ -803,6 +805,13 @@ test_edns.sh.log: test_edns.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)
|
||||
test_icmp.sh.log: test_icmp.sh
|
||||
@p='test_icmp.sh'; \
|
||||
b='test_icmp.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); \
|
||||
|
|
10
src/test/gen_icmp.py
Normal file
10
src/test/gen_icmp.py
Normal file
|
@ -0,0 +1,10 @@
|
|||
import sys
|
||||
from scapy.all import *
|
||||
|
||||
pcap = sys.argv[1]
|
||||
|
||||
pkts = []
|
||||
pkts.append(Ether()/IPv6(dst="2001:db8:dead::1")/ICMPv6DestUnreach())
|
||||
pkts.append(Ether()/IP(dst="0.0.0.0")/ICMP(type=3))
|
||||
|
||||
wrpcap(pcap, pkts)
|
4
src/test/icmp.gold
Normal file
4
src/test/icmp.gold
Normal file
|
@ -0,0 +1,4 @@
|
|||
[48] 2024-09-10 08:52:52.252793 [#0 icmp.pcap 4095] \
|
||||
[fd00::242:ac11:9].0 [2001:db8:dead::1].0
|
||||
[28] 2024-09-10 08:52:52.253461 [#1 icmp.pcap 4095] \
|
||||
[172.17.0.9].0 [0.0.0.0].0
|
BIN
src/test/icmp.pcap
Normal file
BIN
src/test/icmp.pcap
Normal file
Binary file not shown.
11
src/test/test_icmp.sh
Executable file
11
src/test/test_icmp.sh
Executable file
|
@ -0,0 +1,11 @@
|
|||
#!/bin/sh -xe
|
||||
|
||||
test -e icmp.pcap || ln -s "$srcdir/icmp.pcap" icmp.pcap
|
||||
|
||||
../dnscap -g -I -r icmp.pcap 2>test_icmp.out
|
||||
|
||||
mv test_icmp.out test_icmp.out.old
|
||||
grep -v "^libgcov profiling error:" test_icmp.out.old > test_icmp.out
|
||||
rm test_icmp.out.old
|
||||
|
||||
diff test_icmp.out "$srcdir/icmp.gold"
|
Loading…
Add table
Reference in a new issue