Adding upstream version 2.1.1.upstream/2.1.1

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

13 files changed, 54 insertions, 35 deletions

diff --git a/plugins/anonaes128/anonaes128.c b/plugins/anonaes128/anonaes128.c
index aa9539c..56c8656 100644
--- a/plugins/anonaes128/anonaes128.c
+++ b/plugins/anonaes128/anonaes128.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022, OARC, Inc.
+ * Copyright (c) 2018-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -246,8 +246,10 @@ int anonaes128_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto,
 
     for (;;) {
         if (only_clients && sport == dns_port) {
-            from = 0;
-            break;
+            if (sport != dport) {
+                from = 0;
+                break;
+            }
         }
         if (only_servers && sport != dns_port) {
             from = 0;
@@ -292,8 +294,10 @@ int anonaes128_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto,
 
     for (;;) {
         if (only_clients && dport == dns_port) {
-            to = 0;
-            break;
+            if (dport != sport) {
+                to = 0;
+                break;
+            }
         }
         if (only_servers && dport != dns_port) {
             to = 0;
diff --git a/plugins/anonmask/anonmask.c b/plugins/anonmask/anonmask.c
index d6c3d89..444f5df 100644
--- a/plugins/anonmask/anonmask.c
+++ b/plugins/anonmask/anonmask.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022, OARC, Inc.
+ * Copyright (c) 2018-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -182,8 +182,10 @@ int anonmask_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto, un
 
     for (;;) {
         if (only_clients && sport == mask_port) {
-            from = 0;
-            break;
+            if (sport != dport) {
+                from = 0;
+                break;
+            }
         }
         if (only_servers && sport != mask_port) {
             from = 0;
@@ -210,8 +212,10 @@ int anonmask_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto, un
 
     for (;;) {
         if (only_clients && dport == mask_port) {
-            to = 0;
-            break;
+            if (dport != sport) {
+                to = 0;
+                break;
+            }
         }
         if (only_servers && dport != mask_port) {
             to = 0;
diff --git a/plugins/cryptopan/cryptopan.c b/plugins/cryptopan/cryptopan.c
index 3b3e973..14f185f 100644
--- a/plugins/cryptopan/cryptopan.c
+++ b/plugins/cryptopan/cryptopan.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022, OARC, Inc.
+ * Copyright (c) 2018-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -397,8 +397,10 @@ int cryptopan_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto, u
 #ifdef USE_OPENSSL
     for (;;) {
         if (only_clients && sport == dns_port) {
-            from = 0;
-            break;
+            if (sport != dport) {
+                from = 0;
+                break;
+            }
         }
         if (only_servers && sport != dns_port) {
             from = 0;
@@ -433,8 +435,10 @@ int cryptopan_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto, u
 
     for (;;) {
         if (only_clients && dport == dns_port) {
-            to = 0;
-            break;
+            if (dport != sport) {
+                to = 0;
+                break;
+            }
         }
         if (only_servers && dport != dns_port) {
             to = 0;
diff --git a/plugins/cryptopant/cryptopant.c b/plugins/cryptopant/cryptopant.c
index 2f8aa20..7fca715 100644
--- a/plugins/cryptopant/cryptopant.c
+++ b/plugins/cryptopant/cryptopant.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022, OARC, Inc.
+ * Copyright (c) 2018-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -187,8 +187,10 @@ int cryptopant_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto,
 #ifdef USE_CRYPTOPANT
     for (;;) {
         if (only_clients && sport == dns_port) {
-            from = 0;
-            break;
+            if (sport != dport) {
+                from = 0;
+                break;
+            }
         }
         if (only_servers && sport != dns_port) {
             from = 0;
@@ -211,8 +213,10 @@ int cryptopant_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto,
 
     for (;;) {
         if (only_clients && dport == dns_port) {
-            to = 0;
-            break;
+            if (dport != sport) {
+                to = 0;
+                break;
+            }
         }
         if (only_servers && dport != dns_port) {
             to = 0;
diff --git a/plugins/eventlog/eventlog.c b/plugins/eventlog/eventlog.c
index 1854741..7f9cb74 100644
--- a/plugins/eventlog/eventlog.c
+++ b/plugins/eventlog/eventlog.c
@@ -12,7 +12,7 @@
  * Below is the original copyright notice from txtout.c.
  */
 /*
- * Copyright (c) 2016-2022, OARC, Inc.
+ * Copyright (c) 2016-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/plugins/ipcrypt/ipcrypt.c b/plugins/ipcrypt/ipcrypt.c
index b1494e8..f8908a6 100644
--- a/plugins/ipcrypt/ipcrypt.c
+++ b/plugins/ipcrypt/ipcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022, OARC, Inc.
+ * Copyright (c) 2018-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -273,8 +273,10 @@ int ipcrypt_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto, uns
 {
     for (;;) {
         if (only_clients && sport == dns_port) {
-            from = 0;
-            break;
+            if (sport != dport) {
+                from = 0;
+                break;
+            }
         }
         if (only_servers && sport != dns_port) {
             from = 0;
@@ -309,8 +311,10 @@ int ipcrypt_filter(const char* descr, iaddr* from, iaddr* to, uint8_t proto, uns
 
     for (;;) {
         if (only_clients && dport == dns_port) {
-            to = 0;
-            break;
+            if (dport != sport) {
+                to = 0;
+                break;
+            }
         }
         if (only_servers && dport != dns_port) {
             to = 0;
diff --git a/plugins/pcapdump/pcapdump.c b/plugins/pcapdump/pcapdump.c
index 60a452f..3af1ccd 100644
--- a/plugins/pcapdump/pcapdump.c
+++ b/plugins/pcapdump/pcapdump.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2022, OARC, Inc.
+ * Copyright (c) 2016-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/plugins/royparse/royparse.c b/plugins/royparse/royparse.c
index b7e9b87..4deed9a 100644
--- a/plugins/royparse/royparse.c
+++ b/plugins/royparse/royparse.c
@@ -1,7 +1,7 @@
 /*
  * Author Roy Arends
  *
- * Copyright (c) 2017-2022, OARC, Inc.
+ * Copyright (c) 2017-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/plugins/rssm/dnscap-rssm-rssac002 b/plugins/rssm/dnscap-rssm-rssac002
index 30c0b3b..aff45e7 100755
--- a/plugins/rssm/dnscap-rssm-rssac002
+++ b/plugins/rssm/dnscap-rssm-rssac002
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (c) 2018-2022, OARC, Inc.
+# Copyright (c) 2018-2023, OARC, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/rssm/dnscap-rssm-rssac002.1.in b/plugins/rssm/dnscap-rssm-rssac002.1.in
index 92f3f77..6afce8f 100644
--- a/plugins/rssm/dnscap-rssm-rssac002.1.in
+++ b/plugins/rssm/dnscap-rssm-rssac002.1.in
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2017-2022, OARC, Inc.
+.\" Copyright (c) 2017-2023, OARC, Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/plugins/rssm/rssm.c b/plugins/rssm/rssm.c
index 1847cc0..91cbd93 100644
--- a/plugins/rssm/rssm.c
+++ b/plugins/rssm/rssm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2022, OARC, Inc.
+ * Copyright (c) 2016-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -566,7 +566,6 @@ int rssm_close(my_bpftimeval ts)
     struct tm tm;
 
     if (dont_fork_on_close) {
-        struct tm tm;
         gmtime_r((time_t*)&open_ts.tv_sec, &tm);
         strftime(sbuf, sizeof(sbuf), "%Y%m%d.%H%M%S", &tm);
         close_ts = ts;
@@ -721,7 +720,7 @@ void rssm_output(const char* descr, iaddr from, iaddr to, uint8_t proto, unsigne
                 counts.dns_tcp_responses_sent_ipv6++;
             }
         }
-        if (ldns_pkt_arcount(pkt)) {
+        if (ldns_pkt_edns(pkt)) {
             rcode |= ((uint16_t)ldns_pkt_edns_extended_rcode(pkt) << 4);
         }
         counts.rcodes[rcode]++;
diff --git a/plugins/template/template.c b/plugins/template/template.c
index 567c9c9..bf0a89c 100644
--- a/plugins/template/template.c
+++ b/plugins/template/template.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2022, OARC, Inc.
+ * Copyright (c) 2016-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/plugins/txtout/txtout.c b/plugins/txtout/txtout.c
index 976d18e..2a22e7a 100644
--- a/plugins/txtout/txtout.c
+++ b/plugins/txtout/txtout.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2022, OARC, Inc.
+ * Copyright (c) 2016-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without