From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 29 Sep 2022 09:53:07 +0000 (+0200)
Subject: MINOR: tools: Impprove hash_ipanon to not hash FD-based addresses
X-Git-Tag: v2.7-dev7~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=015bbc298ff2eecebba09968b7c3ff41a65b6d12;p=thirdparty%2Fhaproxy.git

MINOR: tools: Impprove hash_ipanon to not hash FD-based addresses

"stdout" and "stderr" are not hashed. In the same spirit, "fd@" and
"sockpair@" prefixes are not hashed too. There is no reason to hash such
address and it may be useful to diagnose bugs.

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

diff --git a/src/tools.c b/src/tools.c
index 5185204b13..33bc88e6d4 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -5895,7 +5895,11 @@ const char *hash_ipanon(uint32_t scramble, char *ipstring, int hasport)
 	if (scramble == 0) {
 		return ipstring;
 	}
-	if (strcmp(ipstring, "localhost") == 0) {
+	if (strcmp(ipstring, "localhost") == 0 ||
+	    strcmp(ipstring, "stdout") == 0 ||
+	    strcmp(ipstring, "stderr") == 0 ||
+	    strncmp(ipstring, "fd@", 3) == 0 ||
+	    strncmp(ipstring, "sockpair@", 9) == 0) {
 		return ipstring;
 	}
 	else {