Merging upstream version 0.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 9 insertions, 8 deletions

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 <jerry@dns-oarc.net>
- * 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 <jerry@dns-oarc.net>
- * 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 <jerry@dns-oarc.net>
- * 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 <jerry@dns-oarc.net>
- * 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 <jerry@dns-oarc.net>
- * 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 <jerry@dns-oarc.net>
- * 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 <jerry@dns-oarc.net>
- * 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 <jerry@dns-oarc.net>
- * Copyright (c) 2019, OARC, Inc.
+ * Copyright (c) 2019-2023, OARC, Inc.
  * All rights reserved.
  *
  * This file is part of the dnswire library.