OpenWrt/openwrt-luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci synced 2025-01-09 04:28:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

rpcd-mod-luci: honour dhcp leases without ip address for host hints

Browse Source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-02-12 22:22:05 +01:00
parent c1aeb300f6
commit 3702e13f54
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/rpcd-mod-luci/src/luci.c
View File

@ -1283,14 +1283,14 @@ rpc_luci_get_host_hints_uci(struct reply_context *rctx)
ptr.option = "ip";
ptr.o = NULL;
if (uci_lookup_ptr(uci, &ptr, NULL, true) || ptr.o == NULL)
continue;
if (!uci_lookup_ptr(uci, &ptr, NULL, true) && ptr.o != NULL &&
ptr.o->type != UCI_TYPE_STRING)
n = ptr.o->v.string;
else
n = NULL;
if (ptr.o->type != UCI_TYPE_STRING)
continue;
if (inet_pton(AF_INET, ptr.o->v.string, &in) != 1)
continue;
if (!n || inet_pton(AF_INET, n, &in) != 1)
in.s_addr = 0;
ptr.option = "name";
ptr.o = NULL;
@ -1316,7 +1316,7 @@ rpc_luci_get_host_hints_uci(struct reply_context *rctx)
if (!hint)
continue;
if (hint->ip.s_addr == 0)
if (hint->ip.s_addr == 0 && in.s_addr != 0)
hint->ip = in;
if (n && !hint->hostname)
@ -1330,7 +1330,7 @@ rpc_luci_get_host_hints_uci(struct reply_context *rctx)
if (!hint)
continue;
if (hint->ip.s_addr == 0)
if (hint->ip.s_addr == 0 && in.s_addr != 0)
hint->ip = in;
if (n && !hint->hostname)