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

Merging upstream version 0.4.0.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 06:37:39 +01:00
parent 584e0220fa
commit 59def95384
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
20 changed files with 42 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.copr/Makefile
View file

@ -15,6 +15,7 @@ $(top)/rpmbuild:
mkdir -p "$(top)"/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} mkdir -p "$(top)"/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
srpm: prereq update-dist-tools srpm: prereq update-dist-tools
git config --global safe.directory "*"
test -f .gitmodules && git submodule update --init || true test -f .gitmodules && git submodule update --init || true
echo "$(spec)" | grep -q "develop.spec" && auto_build_number=`date --utc +%s` message="Auto build `date --utc --iso-8601=seconds`" "$(top)/dist-tools/spec-new-changelog-entry" || true echo "$(spec)" | grep -q "develop.spec" && auto_build_number=`date --utc +%s` message="Auto build `date --utc --iso-8601=seconds`" "$(top)/dist-tools/spec-new-changelog-entry" || true
overwrite=yes nosign=yes "$(top)/dist-tools/create-source-packages" rpm overwrite=yes nosign=yes "$(top)/dist-tools/create-source-packages" rpm

10
CHANGES
View file

@ -1,3 +1,13 @@
2023-03-03 Jerry Lundström
Release 0.4.0
Updated `dnstap.pb` to include recently added DNS-over-QUIC (DOQ)
socket protocol.
a03a989 Fix COPR
e3f1167 dnstap.pb, DOQ
2022-02-02 Jerry Lundström 2022-02-02 Jerry Lundström
Release 0.3.3 Release 0.3.3

8
configure.ac
View file

@ -1,9 +1,9 @@
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT([dnswire], [0.3.3], [admin@dns-oarc.net], [dnswire], [https://github.com/DNS-OARC/dnswire/issues]) AC_INIT([dnswire], [0.4.0], [admin@dns-oarc.net], [dnswire], [https://github.com/DNS-OARC/dnswire/issues])
AC_SUBST([DNSWIRE_VERSION_MAJOR], [0000]) AC_SUBST([DNSWIRE_VERSION_MAJOR], [0000])
AC_SUBST([DNSWIRE_VERSION_MINOR], [0003]) AC_SUBST([DNSWIRE_VERSION_MINOR], [0004])
AC_SUBST([DNSWIRE_VERSION_PATCH], [0003]) AC_SUBST([DNSWIRE_VERSION_PATCH], [0000])
AC_SUBST([DNSWIRE_LIBRARY_VERSION], [1:0:0]) AC_SUBST([DNSWIRE_LIBRARY_VERSION], [1:1:0])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AC_CONFIG_SRCDIR([src/dnstap.c]) AC_CONFIG_SRCDIR([src/dnstap.c])
AC_CONFIG_HEADER([src/config.h]) AC_CONFIG_HEADER([src/config.h])

9
rpm/dnswire.spec
View file

@ -1,7 +1,7 @@
%define sover 1 %define sover 1
%define libname libdnswire%{sover} %define libname libdnswire%{sover}
Name: dnswire Name: dnswire
Version: 0.3.3 Version: 0.4.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: library for DNS encapsulations and transporting of them Summary: library for DNS encapsulations and transporting of them
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -97,6 +97,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Mar 03 2023 Jerry Lundström <lundstrom.jerry@gmail.com> 0.4.0-1
- Release 0.4.0
* Updated `dnstap.pb` to include recently added DNS-over-QUIC (DOQ)
socket protocol.
* Commits:
a03a989 Fix COPR
e3f1167 dnstap.pb, DOQ
* Wed Feb 02 2022 Jerry Lundström <lundstrom.jerry@gmail.com> 0.3.3-1 * Wed Feb 02 2022 Jerry Lundström <lundstrom.jerry@gmail.com> 0.3.3-1
- Release 0.3.3 - Release 0.3.3
* This is a package only update release to correct mistakes in Debian/ * This is a package only update release to correct mistakes in Debian/

2
src/decoder.c
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

4
src/dnstap.c
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.
@ -57,6 +57,7 @@ const char* const DNSTAP_SOCKET_PROTOCOL_STRING[] = {
"DOH", "DOH",
"DNSCryptUDP", "DNSCryptUDP",
"DNSCryptTCP", "DNSCryptTCP",
"DOQ",
}; };
const char* const DNSTAP_POLICY_ACTION_STRING[] = { const char* const DNSTAP_POLICY_ACTION_STRING[] = {
"UNKNOWN", "UNKNOWN",
@ -143,6 +144,7 @@ int dnstap_decode_protobuf(struct dnstap* dnstap, const uint8_t* data, size_t le
case DNSTAP_SOCKET_PROTOCOL_DOH: case DNSTAP_SOCKET_PROTOCOL_DOH:
case DNSTAP_SOCKET_PROTOCOL_DNSCryptUDP: case DNSTAP_SOCKET_PROTOCOL_DNSCryptUDP:
case DNSTAP_SOCKET_PROTOCOL_DNSCryptTCP: case DNSTAP_SOCKET_PROTOCOL_DNSCryptTCP:
case DNSTAP_SOCKET_PROTOCOL_DOQ:
break; break;
default: default:
dnstap->message.has_socket_protocol = false; dnstap->message.has_socket_protocol = false;

2
src/dnswire.c
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

2
src/dnswire/decoder.h
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

3
src/dnswire/dnstap.h
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.
@ -72,6 +72,7 @@ enum dnstap_socket_protocol {
DNSTAP_SOCKET_PROTOCOL_DOH = 4, DNSTAP_SOCKET_PROTOCOL_DOH = 4,
DNSTAP_SOCKET_PROTOCOL_DNSCryptUDP = 5, DNSTAP_SOCKET_PROTOCOL_DNSCryptUDP = 5,
DNSTAP_SOCKET_PROTOCOL_DNSCryptTCP = 6, DNSTAP_SOCKET_PROTOCOL_DNSCryptTCP = 6,
DNSTAP_SOCKET_PROTOCOL_DOQ = 7,
}; };
extern const char* const DNSTAP_SOCKET_PROTOCOL_STRING[]; extern const char* const DNSTAP_SOCKET_PROTOCOL_STRING[];

2
src/dnswire/dnswire.h
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

2
src/dnswire/encoder.h
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

2
src/dnswire/reader.h
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

2
src/dnswire/trace.h.in
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

2
src/dnswire/version.h.in
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

2
src/dnswire/writer.h
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

2
src/encoder.c
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

2
src/reader.c
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

2
src/test/test_dnstap.c
View file

@ -47,7 +47,7 @@ int main(void)
d.message.socket_family = (enum _Dnstap__SocketFamily)DNSTAP_SOCKET_FAMILY_INET; d.message.socket_family = (enum _Dnstap__SocketFamily)DNSTAP_SOCKET_FAMILY_INET;
// invalid message.socket_protocol // invalid message.socket_protocol
d.message.socket_protocol = (enum _Dnstap__SocketProtocol)(DNSTAP_SOCKET_PROTOCOL_DNSCryptTCP + 1); d.message.socket_protocol = (enum _Dnstap__SocketProtocol)(DNSTAP_SOCKET_PROTOCOL_DOQ + 1);
s = dnstap_encode_protobuf_size(&d); s = dnstap_encode_protobuf_size(&d);
assert(s < sizeof(buf)); assert(s < sizeof(buf));
assert(dnstap_encode_protobuf(&d, buf) == s); assert(dnstap_encode_protobuf(&d, buf) == s);

2
src/trace.c
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.

2
src/writer.c
View file

@ -1,6 +1,6 @@
/* /*
* Author Jerry Lundström <jerry@dns-oarc.net> * Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc. * Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved. * All rights reserved.
* *
* This file is part of the dnswire library. * This file is part of the dnswire library.