From a9b4f93612581b06a09c5a53da9d50ffe4d00216 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 22 Sep 2021 09:41:12 +0200 Subject: [PATCH] rpcd-mod-luci: let IPv4 hostnames take precedence over IPv6 ones Do not overwrite IPv4-resolved hostnames with IPv6 ones in case both are available or resolvable. Signed-off-by: Jo-Philipp Wich (cherry picked from commit 93bd93e220714276eff95ea51793bb2f826328e8) --- libs/rpcd-mod-luci/src/luci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/rpcd-mod-luci/src/luci.c b/libs/rpcd-mod-luci/src/luci.c index eb6f58803e..b89bca494d 100644 --- a/libs/rpcd-mod-luci/src/luci.c +++ b/libs/rpcd-mod-luci/src/luci.c @@ -1672,8 +1672,9 @@ rpc_luci_get_host_hints_rrdns_cb(struct ubus_request *req, int type, avl_for_each_element(&rctx->avl, hint, avl) { avl_for_each_element(&hint->ip6addrs, addr, avl) { if (!memcmp(&addr->addr.in6, &in6, sizeof(in6))) { - free(hint->hostname); - hint->hostname = strdup(blobmsg_get_string(cur)); + if (!hint->hostname) + hint->hostname = strdup(blobmsg_get_string(cur)); + break; } } -- 2.30.2