Adding upstream version 2.1.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-08 12:06:30 +01:00
parent 424ce939c2
commit cb612b22a5
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
58 changed files with 177 additions and 159 deletions

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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

View file

@ -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;

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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]++;

View file

@ -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

View file

@ -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