Merging upstream version 1.4.0.

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

25 files changed, 56 insertions, 56 deletions

diff --git a/src/output/dnscli.c b/src/output/dnscli.c
index d7e0a14..ad25b1c 100644
--- a/src/output/dnscli.c
+++ b/src/output/dnscli.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
@@ -212,7 +212,7 @@ int output_dnscli_connect(output_dnscli_t* self, const char* host, const char* p
         }
         if (self->timeout.sec > 0 || self->timeout.nsec > 0) {
             self->poll.fd      = self->fd;
-            self->poll_timeout = (self->timeout.sec * 1e3) + (self->timeout.nsec / 1e6); //NOSONAR
+            self->poll_timeout = (self->timeout.sec * 1e3) + (self->timeout.nsec / 1e6); // NOSONAR
             if (!self->poll_timeout) {
                 self->poll_timeout = 1;
             }
diff --git a/src/output/dnscli.h b/src/output/dnscli.h
index 4026558..1cf352e 100644
--- a/src/output/dnscli.h
+++ b/src/output/dnscli.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
diff --git a/src/output/dnscli.hh b/src/output/dnscli.hh
index bf579df..f86bccc 100644
--- a/src/output/dnscli.hh
+++ b/src/output/dnscli.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
@@ -18,12 +18,12 @@
  * along with dnsjit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//lua:require("dnsjit.core.compat_h")
-//lua:require("dnsjit.core.log")
-//lua:require("dnsjit.core.receiver_h")
-//lua:require("dnsjit.core.producer_h")
-//lua:require("dnsjit.core.object.payload_h")
-//lua:require("dnsjit.core.timespec_h")
+// lua:require("dnsjit.core.compat_h")
+// lua:require("dnsjit.core.log")
+// lua:require("dnsjit.core.receiver_h")
+// lua:require("dnsjit.core.producer_h")
+// lua:require("dnsjit.core.object.payload_h")
+// lua:require("dnsjit.core.timespec_h")
 
 typedef enum output_dnscli_mode {
     OUTPUT_DNSCLI_MODE_NONE        = 0,
diff --git a/src/output/dnscli.lua b/src/output/dnscli.lua
index e19a2f4..7b308c0 100644
--- a/src/output/dnscli.lua
+++ b/src/output/dnscli.lua
@@ -1,4 +1,4 @@
--- Copyright (c) 2018-2023, OARC, Inc.
+-- Copyright (c) 2018-2024 OARC, Inc.
 -- All rights reserved.
 --
 -- This file is part of dnsjit.
diff --git a/src/output/null.lua b/src/output/null.lua
index 07e84a6..4c5c1e0 100644
--- a/src/output/null.lua
+++ b/src/output/null.lua
@@ -1,4 +1,4 @@
--- Copyright (c) 2018-2023, OARC, Inc.
+-- Copyright (c) 2018-2024 OARC, Inc.
 -- All rights reserved.
 --
 -- This file is part of dnsjit.
diff --git a/src/output/pcap.c b/src/output/pcap.c
index 749a36b..3ac6a70 100644
--- a/src/output/pcap.c
+++ b/src/output/pcap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
diff --git a/src/output/pcap.h b/src/output/pcap.h
index e40c8ca..b326e48 100644
--- a/src/output/pcap.h
+++ b/src/output/pcap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
diff --git a/src/output/pcap.hh b/src/output/pcap.hh
index aecf3bd..43e0fb7 100644
--- a/src/output/pcap.hh
+++ b/src/output/pcap.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
@@ -22,9 +22,9 @@
 typedef struct pcap_dumper {} pcap_dumper_t;
 #endif
 
-//lua:require("dnsjit.core.log")
-//lua:require("dnsjit.core.receiver_h")
-//lua:require("dnsjit.input.pcap_h")
+// lua:require("dnsjit.core.log")
+// lua:require("dnsjit.core.receiver_h")
+// lua:require("dnsjit.input.pcap_h")
 
 typedef struct output_pcap {
     core_log_t     _log;
diff --git a/src/output/pcap.lua b/src/output/pcap.lua
index 7b9a56a..3c62bb2 100644
--- a/src/output/pcap.lua
+++ b/src/output/pcap.lua
@@ -1,4 +1,4 @@
--- Copyright (c) 2018-2023, OARC, Inc.
+-- Copyright (c) 2018-2024 OARC, Inc.
 -- All rights reserved.
 --
 -- This file is part of dnsjit.
diff --git a/src/output/respdiff.c b/src/output/respdiff.c
index 7a2927a..b245e67 100644
--- a/src/output/respdiff.c
+++ b/src/output/respdiff.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
diff --git a/src/output/respdiff.h b/src/output/respdiff.h
index 881cfe4..2d9fee5 100644
--- a/src/output/respdiff.h
+++ b/src/output/respdiff.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
diff --git a/src/output/respdiff.hh b/src/output/respdiff.hh
index 4cdd22e..6edda6e 100644
--- a/src/output/respdiff.hh
+++ b/src/output/respdiff.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
@@ -18,8 +18,8 @@
  * along with dnsjit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//lua:require("dnsjit.core.log")
-//lua:require("dnsjit.core.receiver_h")
+// lua:require("dnsjit.core.log")
+// lua:require("dnsjit.core.receiver_h")
 
 typedef struct output_respdiff {
     core_log_t _log;
diff --git a/src/output/respdiff.lua b/src/output/respdiff.lua
index 5364853..78831ff 100644
--- a/src/output/respdiff.lua
+++ b/src/output/respdiff.lua
@@ -1,4 +1,4 @@
--- Copyright (c) 2018-2023, OARC, Inc.
+-- Copyright (c) 2018-2024 OARC, Inc.
 -- All rights reserved.
 --
 -- This file is part of dnsjit.
diff --git a/src/output/tcpcli.c b/src/output/tcpcli.c
index df1a73c..9d76a03 100644
--- a/src/output/tcpcli.c
+++ b/src/output/tcpcli.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
@@ -270,7 +270,7 @@ static const core_object_t* _produce(output_tcpcli_t* self)
         p.fd      = self->fd;
         p.events  = POLLIN;
         p.revents = 0;
-        to        = (self->timeout.sec * 1e3) + (self->timeout.nsec / 1e6); //NOSONAR
+        to        = (self->timeout.sec * 1e3) + (self->timeout.nsec / 1e6); // NOSONAR
         if (!to) {
             to = 1;
         }
diff --git a/src/output/tcpcli.h b/src/output/tcpcli.h
index 9cd455c..a44018b 100644
--- a/src/output/tcpcli.h
+++ b/src/output/tcpcli.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
diff --git a/src/output/tcpcli.hh b/src/output/tcpcli.hh
index a270c09..e538100 100644
--- a/src/output/tcpcli.hh
+++ b/src/output/tcpcli.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
@@ -18,11 +18,11 @@
  * along with dnsjit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//lua:require("dnsjit.core.log")
-//lua:require("dnsjit.core.receiver_h")
-//lua:require("dnsjit.core.producer_h")
-//lua:require("dnsjit.core.object.payload_h")
-//lua:require("dnsjit.core.timespec_h")
+// lua:require("dnsjit.core.log")
+// lua:require("dnsjit.core.receiver_h")
+// lua:require("dnsjit.core.producer_h")
+// lua:require("dnsjit.core.object.payload_h")
+// lua:require("dnsjit.core.timespec_h")
 
 typedef struct output_tcpcli {
     core_log_t _log;
diff --git a/src/output/tcpcli.lua b/src/output/tcpcli.lua
index 4f9108f..98bcfb5 100644
--- a/src/output/tcpcli.lua
+++ b/src/output/tcpcli.lua
@@ -1,4 +1,4 @@
--- Copyright (c) 2018-2023, OARC, Inc.
+-- Copyright (c) 2018-2024 OARC, Inc.
 -- All rights reserved.
 --
 -- This file is part of dnsjit.
diff --git a/src/output/tlscli.c b/src/output/tlscli.c
index cd1aac0..d9a85e7 100644
--- a/src/output/tlscli.c
+++ b/src/output/tlscli.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
diff --git a/src/output/tlscli.h b/src/output/tlscli.h
index 3eae045..83d2449 100644
--- a/src/output/tlscli.h
+++ b/src/output/tlscli.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
diff --git a/src/output/tlscli.hh b/src/output/tlscli.hh
index b0cbf38..355e9ae 100644
--- a/src/output/tlscli.hh
+++ b/src/output/tlscli.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
@@ -18,12 +18,12 @@
  * along with dnsjit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//lua:require("dnsjit.core.compat_h")
-//lua:require("dnsjit.core.log")
-//lua:require("dnsjit.core.receiver_h")
-//lua:require("dnsjit.core.producer_h")
-//lua:require("dnsjit.core.object.payload_h")
-//lua:require("dnsjit.core.timespec_h")
+// lua:require("dnsjit.core.compat_h")
+// lua:require("dnsjit.core.log")
+// lua:require("dnsjit.core.receiver_h")
+// lua:require("dnsjit.core.producer_h")
+// lua:require("dnsjit.core.object.payload_h")
+// lua:require("dnsjit.core.timespec_h")
 
 typedef struct output_tlscli {
     core_log_t _log;
diff --git a/src/output/tlscli.lua b/src/output/tlscli.lua
index b5ac762..ee7fbfe 100644
--- a/src/output/tlscli.lua
+++ b/src/output/tlscli.lua
@@ -1,4 +1,4 @@
--- Copyright (c) 2018-2023, OARC, Inc.
+-- Copyright (c) 2018-2024 OARC, Inc.
 -- All rights reserved.
 --
 -- This file is part of dnsjit.
diff --git a/src/output/udpcli.c b/src/output/udpcli.c
index ae89c84..85894cc 100644
--- a/src/output/udpcli.c
+++ b/src/output/udpcli.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
@@ -242,7 +242,7 @@ static const core_object_t* _produce_block(output_udpcli_t* self)
     p.fd      = self->fd;
     p.events  = POLLIN;
     p.revents = 0;
-    to        = (self->timeout.sec * 1e3) + (self->timeout.nsec / 1e6); //NOSONAR
+    to        = (self->timeout.sec * 1e3) + (self->timeout.nsec / 1e6); // NOSONAR
     if (!to) {
         to = 1;
     }
diff --git a/src/output/udpcli.h b/src/output/udpcli.h
index 4c8b594..0aec60f 100644
--- a/src/output/udpcli.h
+++ b/src/output/udpcli.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
diff --git a/src/output/udpcli.hh b/src/output/udpcli.hh
index d74623d..c7cbf83 100644
--- a/src/output/udpcli.hh
+++ b/src/output/udpcli.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, OARC, Inc.
+ * Copyright (c) 2018-2024 OARC, Inc.
  * All rights reserved.
  *
  * This file is part of dnsjit.
@@ -18,12 +18,12 @@
  * along with dnsjit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//lua:require("dnsjit.core.compat_h")
-//lua:require("dnsjit.core.log")
-//lua:require("dnsjit.core.receiver_h")
-//lua:require("dnsjit.core.producer_h")
-//lua:require("dnsjit.core.object.payload_h")
-//lua:require("dnsjit.core.timespec_h")
+// lua:require("dnsjit.core.compat_h")
+// lua:require("dnsjit.core.log")
+// lua:require("dnsjit.core.receiver_h")
+// lua:require("dnsjit.core.producer_h")
+// lua:require("dnsjit.core.object.payload_h")
+// lua:require("dnsjit.core.timespec_h")
 
 typedef struct output_udpcli {
     core_log_t _log;
diff --git a/src/output/udpcli.lua b/src/output/udpcli.lua
index 4537d66..575f19d 100644
--- a/src/output/udpcli.lua
+++ b/src/output/udpcli.lua
@@ -1,4 +1,4 @@
--- Copyright (c) 2018-2023, OARC, Inc.
+-- Copyright (c) 2018-2024 OARC, Inc.
 -- All rights reserved.
 --
 -- This file is part of dnsjit.