diff -Nru dnscap-2.1.0/configure dnscap-2.1.1/configure
--- dnscap-2.1.0/configure	2022-09-09 09:16:27.000000000 +0000
+++ dnscap-2.1.1/configure	2023-02-03 13:43:21.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dnscap 2.1.0.
+# Generated by GNU Autoconf 2.69 for dnscap 2.1.1.
 #
 # Report bugs to <dnscap-users@dns-oarc.net>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='dnscap'
 PACKAGE_TARNAME='dnscap'
-PACKAGE_VERSION='2.1.0'
-PACKAGE_STRING='dnscap 2.1.0'
+PACKAGE_VERSION='2.1.1'
+PACKAGE_STRING='dnscap 2.1.1'
 PACKAGE_BUGREPORT='dnscap-users@dns-oarc.net'
 PACKAGE_URL='https://github.com/DNS-OARC/dnscap/issues'
 
@@ -1353,7 +1353,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dnscap 2.1.0 to adapt to many kinds of systems.
+\`configure' configures dnscap 2.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1424,7 +1424,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dnscap 2.1.0:";;
+     short | recursive ) echo "Configuration of dnscap 2.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1556,7 +1556,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dnscap configure 2.1.0
+dnscap configure 2.1.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1979,7 +1979,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dnscap $as_me 2.1.0, which was
+It was created by dnscap $as_me 2.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2842,7 +2842,7 @@
 
 # Define the identity of the package.
  PACKAGE='dnscap'
- VERSION='2.1.0'
+ VERSION='2.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15015,7 +15015,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dnscap $as_me 2.1.0, which was
+This file was extended by dnscap $as_me 2.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15082,7 +15082,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dnscap config.status 2.1.0
+dnscap config.status 2.1.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru dnscap-2.1.0/configure.ac dnscap-2.1.1/configure.ac
--- dnscap-2.1.0/configure.ac	2022-09-09 09:13:23.000000000 +0000
+++ dnscap-2.1.1/configure.ac	2023-02-03 13:40:21.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022, OARC, Inc.
+# Copyright (c) 2016-2023, OARC, Inc.
 # Copyright (c) 2007, The Measurement Factory, Inc.
 # Copyright (c) 2007, Internet Systems Consortium, Inc.
 # All rights reserved.
@@ -33,7 +33,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 AC_PREREQ(2.61)
-AC_INIT([dnscap], [2.1.0], [dnscap-users@dns-oarc.net], [dnscap], [https://github.com/DNS-OARC/dnscap/issues])
+AC_INIT([dnscap], [2.1.1], [dnscap-users@dns-oarc.net], [dnscap], [https://github.com/DNS-OARC/dnscap/issues])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AC_CONFIG_SRCDIR([src/dnscap.c])
 AC_CONFIG_HEADER([src/config.h])
diff -Nru dnscap-2.1.0/debian/changelog dnscap-2.1.1/debian/changelog
--- dnscap-2.1.0/debian/changelog	2023-01-25 08:24:39.000000000 +0000
+++ dnscap-2.1.1/debian/changelog	2023-02-06 08:48:56.000000000 +0000
@@ -1,3 +1,12 @@
+dnscap (2.1.1-1) sid; urgency=medium
+
+  * Uploading to sid.
+  * Merging upstream version 2.1.1.
+  * Refreshing rssm-shebang.patch.
+  * Updating copyright for 2023.
+
+ -- Daniel Baumann <daniel.baumann@progress-linux.org>  Mon, 06 Feb 2023 09:48:56 +0100
+
 dnscap (2.1.0-2) sid; urgency=medium
 
   * Uploading to sid.
diff -Nru dnscap-2.1.0/debian/copyright dnscap-2.1.1/debian/copyright
--- dnscap-2.1.0/debian/copyright	2022-10-01 17:04:22.000000000 +0000
+++ dnscap-2.1.1/debian/copyright	2023-02-06 08:48:56.000000000 +0000
@@ -4,7 +4,7 @@
 Source: https://github.com/DNS-OARC/dnscap
 
 Files: *
-Copyright: 2016-2022 OARC, Inc.
+Copyright: 2016-2023 OARC, Inc.
 License: BSD-3-Clause
 
 Files: isc/*
@@ -12,7 +12,7 @@
 License: ISC
 
 Files: debian/*
-Copyright: 2021-2022 Daniel Baumann <daniel.baumann@progress-linux.org>
+Copyright: 2021-2023 Daniel Baumann <daniel.baumann@progress-linux.org>
 License: BSD-3-clause
 
 License: BSD-3-clause
diff -Nru dnscap-2.1.0/debian/patches/debian/0001-rssm-shebang.patch dnscap-2.1.1/debian/patches/debian/0001-rssm-shebang.patch
--- dnscap-2.1.0/debian/patches/debian/0001-rssm-shebang.patch	2022-10-01 17:04:22.000000000 +0000
+++ dnscap-2.1.1/debian/patches/debian/0001-rssm-shebang.patch	2023-02-06 08:48:56.000000000 +0000
@@ -8,5 +8,5 @@
 -#!/usr/bin/env perl
 +#!/usr/bin/perl
  #
- # Copyright (c) 2018-2022, OARC, Inc.
+ # Copyright (c) 2018-2023, OARC, Inc.
  # All rights reserved.
diff -Nru dnscap-2.1.0/LICENSE dnscap-2.1.1/LICENSE
--- dnscap-2.1.0/LICENSE	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/LICENSE	2023-02-03 12:49:28.000000000 +0000
@@ -1,6 +1,6 @@
 DNSCAP
 
-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 -Nru dnscap-2.1.0/plugins/anonaes128/anonaes128.c dnscap-2.1.1/plugins/anonaes128/anonaes128.c
--- dnscap-2.1.0/plugins/anonaes128/anonaes128.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/anonaes128/anonaes128.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 @@
 
     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 @@
 
     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 -Nru dnscap-2.1.0/plugins/anonmask/anonmask.c dnscap-2.1.1/plugins/anonmask/anonmask.c
--- dnscap-2.1.0/plugins/anonmask/anonmask.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/anonmask/anonmask.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 @@
 
     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 @@
 
     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 -Nru dnscap-2.1.0/plugins/cryptopan/cryptopan.c dnscap-2.1.1/plugins/cryptopan/cryptopan.c
--- dnscap-2.1.0/plugins/cryptopan/cryptopan.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/cryptopan/cryptopan.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 @@
 #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 @@
 
     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 -Nru dnscap-2.1.0/plugins/cryptopant/cryptopant.c dnscap-2.1.1/plugins/cryptopant/cryptopant.c
--- dnscap-2.1.0/plugins/cryptopant/cryptopant.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/cryptopant/cryptopant.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 @@
 #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 @@
 
     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 -Nru dnscap-2.1.0/plugins/eventlog/eventlog.c dnscap-2.1.1/plugins/eventlog/eventlog.c
--- dnscap-2.1.0/plugins/eventlog/eventlog.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/eventlog/eventlog.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/plugins/ipcrypt/ipcrypt.c dnscap-2.1.1/plugins/ipcrypt/ipcrypt.c
--- dnscap-2.1.0/plugins/ipcrypt/ipcrypt.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/ipcrypt/ipcrypt.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 @@
 {
     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 @@
 
     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 -Nru dnscap-2.1.0/plugins/pcapdump/pcapdump.c dnscap-2.1.1/plugins/pcapdump/pcapdump.c
--- dnscap-2.1.0/plugins/pcapdump/pcapdump.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/pcapdump/pcapdump.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/plugins/royparse/royparse.c dnscap-2.1.1/plugins/royparse/royparse.c
--- dnscap-2.1.0/plugins/royparse/royparse.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/royparse/royparse.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/plugins/rssm/dnscap-rssm-rssac002 dnscap-2.1.1/plugins/rssm/dnscap-rssm-rssac002
--- dnscap-2.1.0/plugins/rssm/dnscap-rssm-rssac002	2022-09-07 13:31:34.000000000 +0000
+++ dnscap-2.1.1/plugins/rssm/dnscap-rssm-rssac002	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/plugins/rssm/dnscap-rssm-rssac002.1.in dnscap-2.1.1/plugins/rssm/dnscap-rssm-rssac002.1.in
--- dnscap-2.1.0/plugins/rssm/dnscap-rssm-rssac002.1.in	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/rssm/dnscap-rssm-rssac002.1.in	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/plugins/rssm/rssm.c dnscap-2.1.1/plugins/rssm/rssm.c
--- dnscap-2.1.0/plugins/rssm/rssm.c	2022-09-07 13:31:34.000000000 +0000
+++ dnscap-2.1.1/plugins/rssm/rssm.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 @@
     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 @@
                 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 -Nru dnscap-2.1.0/plugins/template/template.c dnscap-2.1.1/plugins/template/template.c
--- dnscap-2.1.0/plugins/template/template.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/template/template.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/plugins/txtout/txtout.c dnscap-2.1.1/plugins/txtout/txtout.c
--- dnscap-2.1.0/plugins/txtout/txtout.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/plugins/txtout/txtout.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/args.c dnscap-2.1.1/src/args.c
--- dnscap-2.1.0/src/args.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/args.c	2023-02-03 12:49:28.000000000 +0000
@@ -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
@@ -564,71 +564,71 @@
             char*          fn = strdup(optarg);
             char*          t;
             char           sn[256];
-            struct plugin* p = calloc(1, sizeof(*p));
-            assert(p != NULL);
-            INIT_LINK(p, link);
-            t       = strrchr(fn, '/');
-            p->name = strdup(t ? t + 1 : fn);
-            if ((t = strstr(p->name, ".so")))
+            struct plugin* pl = calloc(1, sizeof(*pl));
+            assert(pl != NULL);
+            INIT_LINK(pl, link);
+            t        = strrchr(fn, '/');
+            pl->name = strdup(t ? t + 1 : fn);
+            if ((t = strstr(pl->name, ".so")))
                 *t = 0;
-            p->handle = dlopen(fn, RTLD_NOW);
-            if (!p->handle) {
+            pl->handle = dlopen(fn, RTLD_NOW);
+            if (!pl->handle) {
                 logerr("%s: %s", fn, dlerror());
                 exit(1);
             }
-            snprintf(sn, sizeof(sn), "%s_type", p->name);
-            p->type = dlsym(p->handle, sn);
-            if (p->type) {
-                p->pt = (*p->type)();
-                switch (p->pt) {
+            snprintf(sn, sizeof(sn), "%s_type", pl->name);
+            pl->type = dlsym(pl->handle, sn);
+            if (pl->type) {
+                pl->pt = (*pl->type)();
+                switch (pl->pt) {
                 case plugin_output:
                 case plugin_filter:
                     break;
                 default:
-                    logerr("invalid plugin type for plugin '%s'", p->name);
+                    logerr("invalid plugin type for plugin '%s'", pl->name);
                     exit(1);
                 }
             } else {
-                p->pt = plugin_output;
+                pl->pt = plugin_output;
             }
-            snprintf(sn, sizeof(sn), "%s_start", p->name);
-            p->start = dlsym(p->handle, sn);
-            snprintf(sn, sizeof(sn), "%s_stop", p->name);
-            p->stop = dlsym(p->handle, sn);
-            snprintf(sn, sizeof(sn), "%s_open", p->name);
-            p->open = dlsym(p->handle, sn);
-            snprintf(sn, sizeof(sn), "%s_close", p->name);
-            p->close = dlsym(p->handle, sn);
-            snprintf(sn, sizeof(sn), "%s_output", p->name);
-            p->output = dlsym(p->handle, sn);
-            if (p->pt == plugin_output && !p->output) {
+            snprintf(sn, sizeof(sn), "%s_start", pl->name);
+            pl->start = dlsym(pl->handle, sn);
+            snprintf(sn, sizeof(sn), "%s_stop", pl->name);
+            pl->stop = dlsym(pl->handle, sn);
+            snprintf(sn, sizeof(sn), "%s_open", pl->name);
+            pl->open = dlsym(pl->handle, sn);
+            snprintf(sn, sizeof(sn), "%s_close", pl->name);
+            pl->close = dlsym(pl->handle, sn);
+            snprintf(sn, sizeof(sn), "%s_output", pl->name);
+            pl->output = dlsym(pl->handle, sn);
+            if (pl->pt == plugin_output && !pl->output) {
                 logerr("%s", dlerror());
                 exit(1);
             }
-            snprintf(sn, sizeof(sn), "%s_filter", p->name);
-            p->filter = dlsym(p->handle, sn);
-            if (p->pt == plugin_filter && !p->filter) {
+            snprintf(sn, sizeof(sn), "%s_filter", pl->name);
+            pl->filter = dlsym(pl->handle, sn);
+            if (pl->pt == plugin_filter && !pl->filter) {
                 logerr("%s", dlerror());
                 exit(1);
             }
-            snprintf(sn, sizeof(sn), "%s_usage", p->name);
-            p->usage = dlsym(p->handle, sn);
-            snprintf(sn, sizeof(sn), "%s_extension", p->name);
-            p->extension = dlsym(p->handle, sn);
-            if (p->extension) {
-                (*p->extension)(DNSCAP_EXT_IS_RESPONDER, (void*)is_responder);
-                (*p->extension)(DNSCAP_EXT_IA_STR, (void*)_ia_str);
-                (*p->extension)(DNSCAP_EXT_TCPSTATE_GETCURR, (void*)_tcpstate_getcurr);
-                (*p->extension)(DNSCAP_EXT_TCPSTATE_RESET, (void*)_tcpstate_reset);
-                (*p->extension)(DNSCAP_EXT_SET_IADDR, (void*)set_iaddr);
-            }
-            snprintf(sn, sizeof(sn), "%s_getopt", p->name);
-            p->getopt = dlsym(p->handle, sn);
-            if (p->getopt)
-                (*p->getopt)(&argc, &argv);
-            APPEND(plugins, p, link);
+            snprintf(sn, sizeof(sn), "%s_usage", pl->name);
+            pl->usage = dlsym(pl->handle, sn);
+            snprintf(sn, sizeof(sn), "%s_extension", pl->name);
+            pl->extension = dlsym(pl->handle, sn);
+            if (pl->extension) {
+                (*pl->extension)(DNSCAP_EXT_IS_RESPONDER, (void*)is_responder);
+                (*pl->extension)(DNSCAP_EXT_IA_STR, (void*)_ia_str);
+                (*pl->extension)(DNSCAP_EXT_TCPSTATE_GETCURR, (void*)_tcpstate_getcurr);
+                (*pl->extension)(DNSCAP_EXT_TCPSTATE_RESET, (void*)_tcpstate_reset);
+                (*pl->extension)(DNSCAP_EXT_SET_IADDR, (void*)set_iaddr);
+            }
+            snprintf(sn, sizeof(sn), "%s_getopt", pl->name);
+            pl->getopt = dlsym(pl->handle, sn);
+            if (pl->getopt)
+                (*pl->getopt)(&argc, &argv);
+            APPEND(plugins, pl, link);
             if (dumptrace)
-                fprintf(stderr, "Plugin '%s' loaded\n", p->name);
+                fprintf(stderr, "Plugin '%s' loaded\n", pl->name);
             free(fn);
         } break;
         case 'U':
diff -Nru dnscap-2.1.0/src/args.h dnscap-2.1.1/src/args.h
--- dnscap-2.1.0/src/args.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/args.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/assert.c dnscap-2.1.1/src/assert.c
--- dnscap-2.1.0/src/assert.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/assert.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/bpft.c dnscap-2.1.1/src/bpft.c
--- dnscap-2.1.0/src/bpft.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/bpft.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/bpft.h dnscap-2.1.1/src/bpft.h
--- dnscap-2.1.0/src/bpft.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/bpft.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/daemon.c dnscap-2.1.1/src/daemon.c
--- dnscap-2.1.0/src/daemon.c	2022-07-29 13:42:41.000000000 +0000
+++ dnscap-2.1.1/src/daemon.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/daemon.h dnscap-2.1.1/src/daemon.h
--- dnscap-2.1.0/src/daemon.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/daemon.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/dnscap.1.in dnscap-2.1.1/src/dnscap.1.in
--- dnscap-2.1.0/src/dnscap.1.in	2022-07-29 13:42:41.000000000 +0000
+++ dnscap-2.1.1/src/dnscap.1.in	2023-02-03 12:49:28.000000000 +0000
@@ -1,4 +1,4 @@
-.\" 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 -Nru dnscap-2.1.0/src/dnscap.c dnscap-2.1.1/src/dnscap.c
--- dnscap-2.1.0/src/dnscap.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dnscap.c	2023-02-03 12:49:28.000000000 +0000
@@ -4,7 +4,7 @@
  */
 
 /*
- * 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 -Nru dnscap-2.1.0/src/dnscap_common.h dnscap-2.1.1/src/dnscap_common.h
--- dnscap-2.1.0/src/dnscap_common.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dnscap_common.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/dnscap.h dnscap-2.1.1/src/dnscap.h
--- dnscap-2.1.0/src/dnscap.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dnscap.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/dump_cbor.c dnscap-2.1.1/src/dump_cbor.c
--- dnscap-2.1.0/src/dump_cbor.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dump_cbor.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/dump_cbor.h dnscap-2.1.1/src/dump_cbor.h
--- dnscap-2.1.0/src/dump_cbor.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dump_cbor.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/dump_cds.c dnscap-2.1.1/src/dump_cds.c
--- dnscap-2.1.0/src/dump_cds.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dump_cds.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/dump_cds.h dnscap-2.1.1/src/dump_cds.h
--- dnscap-2.1.0/src/dump_cds.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dump_cds.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/dump_dns.c dnscap-2.1.1/src/dump_dns.c
--- dnscap-2.1.0/src/dump_dns.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dump_dns.c	2023-02-03 12:49:28.000000000 +0000
@@ -4,7 +4,7 @@
  */
 
 /*
- * 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 -Nru dnscap-2.1.0/src/dump_dns.h dnscap-2.1.1/src/dump_dns.h
--- dnscap-2.1.0/src/dump_dns.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dump_dns.h	2023-02-03 12:49:28.000000000 +0000
@@ -4,7 +4,7 @@
  */
 
 /*
- * 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 -Nru dnscap-2.1.0/src/dumper.c dnscap-2.1.1/src/dumper.c
--- dnscap-2.1.0/src/dumper.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dumper.c	2023-02-03 12:49:28.000000000 +0000
@@ -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
@@ -241,8 +241,6 @@
             dumper = FALSE;
         }
     } else if (options.dump_format == cbor) {
-        int ret;
-
         if (dump_type == to_stdout) {
             ret = dump_cbor(stdout);
 
@@ -265,8 +263,6 @@
             }
         }
     } else if (options.dump_format == cds) {
-        int ret;
-
         if (dump_type == to_stdout) {
             ret = dump_cds(stdout);
 
diff -Nru dnscap-2.1.0/src/dumper.h dnscap-2.1.1/src/dumper.h
--- dnscap-2.1.0/src/dumper.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/dumper.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/endian_compat.h dnscap-2.1.1/src/endian_compat.h
--- dnscap-2.1.0/src/endian_compat.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/endian_compat.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/endpoint.c dnscap-2.1.1/src/endpoint.c
--- dnscap-2.1.0/src/endpoint.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/endpoint.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/endpoint.h dnscap-2.1.1/src/endpoint.h
--- dnscap-2.1.0/src/endpoint.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/endpoint.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/hashtbl.c dnscap-2.1.1/src/hashtbl.c
--- dnscap-2.1.0/src/hashtbl.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/hashtbl.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/hashtbl.h dnscap-2.1.1/src/hashtbl.h
--- dnscap-2.1.0/src/hashtbl.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/hashtbl.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/iaddr.c dnscap-2.1.1/src/iaddr.c
--- dnscap-2.1.0/src/iaddr.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/iaddr.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/iaddr.h dnscap-2.1.1/src/iaddr.h
--- dnscap-2.1.0/src/iaddr.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/iaddr.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/log.c dnscap-2.1.1/src/log.c
--- dnscap-2.1.0/src/log.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/log.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/log.h dnscap-2.1.1/src/log.h
--- dnscap-2.1.0/src/log.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/log.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/memzero.c dnscap-2.1.1/src/memzero.c
--- dnscap-2.1.0/src/memzero.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/memzero.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/memzero.h dnscap-2.1.1/src/memzero.h
--- dnscap-2.1.0/src/memzero.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/memzero.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/network.c dnscap-2.1.1/src/network.c
--- dnscap-2.1.0/src/network.c	2022-09-07 12:32:29.000000000 +0000
+++ dnscap-2.1.1/src/network.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/network.h dnscap-2.1.1/src/network.h
--- dnscap-2.1.0/src/network.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/network.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/options.c dnscap-2.1.1/src/options.c
--- dnscap-2.1.0/src/options.c	2022-07-29 13:42:41.000000000 +0000
+++ dnscap-2.1.1/src/options.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/options.h dnscap-2.1.1/src/options.h
--- dnscap-2.1.0/src/options.h	2022-07-29 13:42:41.000000000 +0000
+++ dnscap-2.1.1/src/options.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/pcaps.c dnscap-2.1.1/src/pcaps.c
--- dnscap-2.1.0/src/pcaps.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/pcaps.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/pcaps.h dnscap-2.1.1/src/pcaps.h
--- dnscap-2.1.0/src/pcaps.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/pcaps.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/sig.c dnscap-2.1.1/src/sig.c
--- dnscap-2.1.0/src/sig.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/sig.c	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/sig.h dnscap-2.1.1/src/sig.h
--- dnscap-2.1.0/src/sig.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/sig.h	2023-02-03 12:49:28.000000000 +0000
@@ -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 -Nru dnscap-2.1.0/src/tcpreasm.c dnscap-2.1.1/src/tcpreasm.c
--- dnscap-2.1.0/src/tcpreasm.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/tcpreasm.c	2023-02-03 12:49:28.000000000 +0000
@@ -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
@@ -356,7 +356,7 @@
             if (!tcpstate->segbuf[s])
                 continue;
             /* TODO: seq >= 0 */
-            if (tcpstate->segbuf[s]->seq - seq > 0 && tcpstate->segbuf[s]->seq - seq < dnslen) {
+            if (tcpstate->segbuf[s]->seq > seq && tcpstate->segbuf[s]->seq - seq < dnslen) {
                 tcp_segbuf_t* segbuf = tcpstate->segbuf[s];
                 tcpstate->segbuf[s]  = NULL;
                 dfprintf(1, "pcap_handle_tcp_segment: %s", "message reassembled");
diff -Nru dnscap-2.1.0/src/tcpreasm.h dnscap-2.1.1/src/tcpreasm.h
--- dnscap-2.1.0/src/tcpreasm.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/tcpreasm.h	2023-02-03 12:49:28.000000000 +0000
@@ -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
diff -Nru dnscap-2.1.0/src/tcpstate.c dnscap-2.1.1/src/tcpstate.c
--- dnscap-2.1.0/src/tcpstate.c	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/tcpstate.c	2023-02-03 12:49:28.000000000 +0000
@@ -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
@@ -48,6 +48,17 @@
     static time_t next_gc = 0;
     tcpstate_ptr  tcpstate;
 
+#ifndef __clang_analyzer__
+    /* disabled during scan-build due to false-positives */
+    if (t >= next_gc || tcpstate_count > MAX_TCP_IDLE_COUNT) {
+        /* garbage collect stale states */
+        while ((tcpstate = TAIL(tcpstates)) && tcpstate->last_use < t - MAX_TCP_IDLE_TIME) {
+            tcpstate_discard(tcpstate, "gc stale");
+        }
+        next_gc = t + TCP_GC_TIME;
+    }
+#endif
+
     for (tcpstate = HEAD(tcpstates);
          tcpstate != NULL;
          tcpstate = NEXT(tcpstate, link)) {
@@ -63,22 +74,11 @@
         }
     }
 
-    if (t >= next_gc || tcpstate_count > MAX_TCP_IDLE_COUNT) {
-        /* garbage collect stale states */
-        time_t min_last_use = t - MAX_TCP_IDLE_TIME;
-        while ((tcpstate = TAIL(tcpstates)) && tcpstate->last_use < min_last_use) {
-            UNLINK(tcpstates, tcpstate, link);
-            tcpstate_count--;
-        }
-        next_gc = t + TCP_GC_TIME;
-    }
-
     return tcpstate;
 }
 
 tcpstate_ptr tcpstate_new(iaddr from, iaddr to, unsigned sport, unsigned dport)
 {
-
     tcpstate_ptr tcpstate = calloc(1, sizeof *tcpstate);
     if (tcpstate == NULL) {
         /* Out of memory; recycle the least recently used */
@@ -86,6 +86,7 @@
                "discarding some TCP state early");
         tcpstate = TAIL(tcpstates);
         assert(tcpstate != NULL);
+        UNLINK(tcpstates, tcpstate, link);
     } else {
         tcpstate_count++;
     }
@@ -98,6 +99,13 @@
     return tcpstate;
 }
 
+tcpstate_ptr _curr_tcpstate = 0;
+
+tcpstate_ptr tcpstate_getcurr(void)
+{
+    return _curr_tcpstate;
+}
+
 /* Discard this packet.  If it's part of TCP stream, all subsequent pkts on
  * the same tcp stream will also be discarded. */
 void tcpstate_discard(tcpstate_ptr tcpstate, const char* msg)
@@ -110,18 +118,13 @@
             tcpreasm_free(tcpstate->reasm);
         }
         free(tcpstate);
+        if (_curr_tcpstate == tcpstate) {
+            _curr_tcpstate = 0;
+        }
         tcpstate_count--;
-        return;
     }
 }
 
-tcpstate_ptr _curr_tcpstate = 0;
-
-tcpstate_ptr tcpstate_getcurr(void)
-{
-    return _curr_tcpstate;
-}
-
 void tcpstate_reset(tcpstate_ptr tcpstate, const char* msg)
 {
     if (options.allow_reset_tcpstate && tcpstate) {
diff -Nru dnscap-2.1.0/src/tcpstate.h dnscap-2.1.1/src/tcpstate.h
--- dnscap-2.1.0/src/tcpstate.h	2022-03-08 12:15:31.000000000 +0000
+++ dnscap-2.1.1/src/tcpstate.h	2023-02-03 12:49:28.000000000 +0000
@@ -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