Merging 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:41 +01:00
parent 4feb155734
commit 14c3c7c9ac
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
@ -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;