[openwrt/openwrt] dnsmasq: fix the dynamic dns object names patch

LEDE Commits lede-commits at lists.infradead.org
Fri Nov 12 14:13:09 PST 2021


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/c8340120e703abe6343cf347d1274587d288e0aa

commit c8340120e703abe6343cf347d1274587d288e0aa
Author: Rui Salvaterra <rsalvaterra at gmail.com>
AuthorDate: Fri Nov 12 16:50:33 2021 +0000

    dnsmasq: fix the dynamic dns object names patch
    
    We can't use booleans, since we're not including stdbool.h. Use integers
    instead.
    
    Fixes: 0b79e7c01e ("dnsmasq: generate the dns object name dynamically")
    
    Signed-off-by: Rui Salvaterra <rsalvaterra at gmail.com>
---
 .../network/services/dnsmasq/patches/200-ubus_dns.patch    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/network/services/dnsmasq/patches/200-ubus_dns.patch b/package/network/services/dnsmasq/patches/200-ubus_dns.patch
index 03fc5b50b3..b8c4e44952 100644
--- a/package/network/services/dnsmasq/patches/200-ubus_dns.patch
+++ b/package/network/services/dnsmasq/patches/200-ubus_dns.patch
@@ -60,17 +60,17 @@
 +		*dest = blobmsg_get_string(val);
 +}
 +
-+static bool ubus_dns_doctor(const char *name, int ttl, void *p, int af)
++static int ubus_dns_doctor(const char *name, int ttl, void *p, int af)
 +{
 +	struct blob_buf *b;
 +	char *addr;
 +
 +	if (!name)
-+		return false;
++		return 0;
 +
 +	b = ubus_dns_notify_prepare();
 +	if (!b)
-+		return false;
++		return 0;
 +
 +	blobmsg_add_string(b, "name", name);
 +
@@ -80,7 +80,7 @@
 +
 +	addr = blobmsg_alloc_string_buffer(b, "address", INET6_ADDRSTRLEN);
 +	if (!addr)
-+		return false;
++		return 0;
 +
 +	inet_ntop(af, p, addr, INET6_ADDRSTRLEN);
 +	blobmsg_add_string_buffer(b);
@@ -89,14 +89,14 @@
 +	ubus_dns_notify("dns_result", ubus_dns_doctor_cb, &addr);
 +
 +	if (!addr)
-+		return false;
++		return 0;
 +
 +	return inet_pton(af, addr, p) == 1;
 +}
 +#else
-+static bool ubus_dns_doctor(const char *name, int ttl, void *p, int af)
++static int ubus_dns_doctor(const char *name, int ttl, void *p, int af)
 +{
-+	return false;
++	return 0;
 +}
 +#endif
 +



More information about the lede-commits mailing list