From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 29 Sep 2022 09:46:34 +0000 (+0200)
Subject: MINOR: tools: Impprove hash_ipanon to support dgram sockets and port offsets
X-Git-Tag: v2.7-dev7~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e50e4b9cc11ff2b640c7fbfc3350753a5dda071;p=thirdparty%2Fhaproxy.git

MINOR: tools: Impprove hash_ipanon to support dgram sockets and port offsets

Add PA_O_DGRAM and PA_O_PORT_OFS options when str2sa_range() is called. This
way dgram sockets and addresses with port offsets are supported.

No backport needed, except if anonymization mechanism is backported.
---

diff --git a/src/tools.c b/src/tools.c
index 53958a996a..5185204b13 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -5908,8 +5908,8 @@ const char *hash_ipanon(uint32_t scramble, char *ipstring, int hasport)
 		}
 		else {
 			sa = str2sa_range(ipstring, NULL, NULL, NULL, NULL, NULL, &errmsg, NULL, NULL,
-					  PA_O_PORT_OK | PA_O_STREAM | PA_O_XPRT | PA_O_CONNECT |
-					  PA_O_PORT_RANGE | PA_O_RESOLVE);
+					  PA_O_PORT_OK | PA_O_STREAM | PA_O_DGRAM | PA_O_XPRT | PA_O_CONNECT |
+					  PA_O_PORT_RANGE | PA_O_PORT_OFS | PA_O_RESOLVE);
 			if (sa == NULL) {
 				return HA_ANON_STR(scramble, ipstring);
 			}