From 43bfca11d2f295ff873b2199cf89602bf0e6d843 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 7 Mar 2023 18:57:46 +0100 Subject: Adding upstream version 0.4.0. Signed-off-by: Daniel Baumann --- src/decoder.c | 2 +- src/dnstap.c | 4 +++- src/dnswire.c | 2 +- src/dnswire/decoder.h | 2 +- src/dnswire/dnstap.h | 3 ++- src/dnswire/dnswire.h | 2 +- src/dnswire/encoder.h | 2 +- src/dnswire/reader.h | 2 +- src/dnswire/trace.h.in | 2 +- src/dnswire/version.h.in | 2 +- src/dnswire/writer.h | 2 +- src/encoder.c | 2 +- src/reader.c | 2 +- src/test/test_dnstap.c | 2 +- src/trace.c | 2 +- src/writer.c | 2 +- 16 files changed, 19 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/decoder.c b/src/decoder.c index 821b14e..d13b015 100644 --- a/src/decoder.c +++ b/src/decoder.c @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/dnstap.c b/src/dnstap.c index 4e49e64..83d5c0f 100644 --- a/src/dnstap.c +++ b/src/dnstap.c @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. @@ -57,6 +57,7 @@ const char* const DNSTAP_SOCKET_PROTOCOL_STRING[] = { "DOH", "DNSCryptUDP", "DNSCryptTCP", + "DOQ", }; const char* const DNSTAP_POLICY_ACTION_STRING[] = { "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_DNSCryptUDP: case DNSTAP_SOCKET_PROTOCOL_DNSCryptTCP: + case DNSTAP_SOCKET_PROTOCOL_DOQ: break; default: dnstap->message.has_socket_protocol = false; diff --git a/src/dnswire.c b/src/dnswire.c index 5468434..0056a58 100644 --- a/src/dnswire.c +++ b/src/dnswire.c @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/dnswire/decoder.h b/src/dnswire/decoder.h index 60ab44e..99db44c 100644 --- a/src/dnswire/decoder.h +++ b/src/dnswire/decoder.h @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/dnswire/dnstap.h b/src/dnswire/dnstap.h index 7a01898..dc507ab 100644 --- a/src/dnswire/dnstap.h +++ b/src/dnswire/dnstap.h @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. @@ -72,6 +72,7 @@ enum dnstap_socket_protocol { DNSTAP_SOCKET_PROTOCOL_DOH = 4, DNSTAP_SOCKET_PROTOCOL_DNSCryptUDP = 5, DNSTAP_SOCKET_PROTOCOL_DNSCryptTCP = 6, + DNSTAP_SOCKET_PROTOCOL_DOQ = 7, }; extern const char* const DNSTAP_SOCKET_PROTOCOL_STRING[]; diff --git a/src/dnswire/dnswire.h b/src/dnswire/dnswire.h index f113b22..50276c9 100644 --- a/src/dnswire/dnswire.h +++ b/src/dnswire/dnswire.h @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/dnswire/encoder.h b/src/dnswire/encoder.h index c5fbc6a..c635dfb 100644 --- a/src/dnswire/encoder.h +++ b/src/dnswire/encoder.h @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/dnswire/reader.h b/src/dnswire/reader.h index 5fdfad5..55e5f36 100644 --- a/src/dnswire/reader.h +++ b/src/dnswire/reader.h @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/dnswire/trace.h.in b/src/dnswire/trace.h.in index 7b8e038..b74f466 100644 --- a/src/dnswire/trace.h.in +++ b/src/dnswire/trace.h.in @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/dnswire/version.h.in b/src/dnswire/version.h.in index 1a4f96f..0e603ab 100644 --- a/src/dnswire/version.h.in +++ b/src/dnswire/version.h.in @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/dnswire/writer.h b/src/dnswire/writer.h index 99bae1a..d989377 100644 --- a/src/dnswire/writer.h +++ b/src/dnswire/writer.h @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/encoder.c b/src/encoder.c index 4b7ad27..9825208 100644 --- a/src/encoder.c +++ b/src/encoder.c @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/reader.c b/src/reader.c index ba04284..6710b9b 100644 --- a/src/reader.c +++ b/src/reader.c @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/test/test_dnstap.c b/src/test/test_dnstap.c index eec0049..2a36a81 100644 --- a/src/test/test_dnstap.c +++ b/src/test/test_dnstap.c @@ -47,7 +47,7 @@ int main(void) d.message.socket_family = (enum _Dnstap__SocketFamily)DNSTAP_SOCKET_FAMILY_INET; // 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); assert(s < sizeof(buf)); assert(dnstap_encode_protobuf(&d, buf) == s); diff --git a/src/trace.c b/src/trace.c index 742f819..19b3ddf 100644 --- a/src/trace.c +++ b/src/trace.c @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. diff --git a/src/writer.c b/src/writer.c index 885ff91..f65606b 100644 --- a/src/writer.c +++ b/src/writer.c @@ -1,6 +1,6 @@ /* * Author Jerry Lundström - * Copyright (c) 2019, OARC, Inc. + * Copyright (c) 2019-2023, OARC, Inc. * All rights reserved. * * This file is part of the dnswire library. -- cgit v1.2.3