diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-06 08:48:28 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-06 08:48:28 +0000 |
commit | 22a29c0010e8ecee203d610e2477150004c74cf6 (patch) | |
tree | 92257b3ce72b5e0ac22ab592272c777420e497db /plugins/rssm | |
parent | Releasing debian version 2.1.0-2. (diff) | |
download | dnscap-22a29c0010e8ecee203d610e2477150004c74cf6.tar.xz dnscap-22a29c0010e8ecee203d610e2477150004c74cf6.zip |
Merging upstream version 2.1.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'plugins/rssm')
-rwxr-xr-x | plugins/rssm/dnscap-rssm-rssac002 | 2 | ||||
-rw-r--r-- | plugins/rssm/dnscap-rssm-rssac002.1.in | 2 | ||||
-rw-r--r-- | plugins/rssm/rssm.c | 5 |
3 files changed, 4 insertions, 5 deletions
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]++; |