From: David Carlier <dcarlier@deviceatlas.com>
Date: Tue, 20 Oct 2026 14:59:05 +0000 (+0100)
Subject: BUG/MINOR: deviceatlas: use the result's property type when printing
X-Git-Tag: v3.5-dev10~53
X-Git-Url: https://git.kaiwu.me/$%7BGITURL%7D$%7Bcid%7D?a=commitdiff_plain;h=4cb03275d917cc462c5ee4e4d38ec9da8db5bb19;p=haproxy.git

BUG/MINOR: deviceatlas: use the result's property type when printing

da_haproxy() took the property type from the atlas catalogue, but a result
may carry a different type for a property, e.g. a client-side property from
the cookie. The typed getter then failed and the value was printed empty.
The type is now read from the result with da_getproptype().

This should be backported to lower branches.
---

diff --git a/addons/deviceatlas/da.c b/addons/deviceatlas/da.c
index d1080b414..afcf2d318 100644
--- a/addons/deviceatlas/da.c
+++ b/addons/deviceatlas/da.c
@@ -380,7 +380,7 @@ static int da_haproxy(const struct arg *args, struct sample *smp, da_deviceinfo_
 			chunk_appendf(tmp, "%c", global_deviceatlas.separator);
 			continue;
 		}
-		if (unlikely(da_atlas_getproptype(&global_deviceatlas.atlas, prop, &proptype) != DA_OK)) {
+		if (unlikely(da_getproptype(devinfo, prop, &proptype) != DA_OK)) {
 			chunk_appendf(tmp, "%c", global_deviceatlas.separator);
 			continue;
 		}