rpcd-mod-luci: strip colon from dnsmasq duid

Dnsmasq DHCPv6 use colons in the generated duid present in the lease file. Strip the colon as this is not supported by the OpenWrt config and follow the same way odhcpd use to display duid. Fixes: openwrt#4543 Signed-off-by: Ansuel Smith <[email protected]>
freifunk-berlin · Jul 26, 2024 · f71e9cb · f71e9cb
1 parent f488d28
commit f71e9cb
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/libs/rpcd-mod-luci/src/luci.c b/libs/rpcd-mod-luci/src/luci.c
@@ -329,6 +329,15 @@ duid2ea(const char *duid)
 	return &ea;
 }
 
+static void strip_colon_duid(char *str) {
+	char *pr = str, *pw = str;
+
+	while (*pr) {
+		*pw = *pr++;
+		pw += (*pw != ':');
+	}
+	*pw = '\0';
+}
 
 static struct {
 	time_t now;
@@ -592,6 +601,8 @@ lease_next(void)
 				if (!e.hostname || !e.duid)
 					continue;
 
+				strip_colon_duid(e.duid);
+
 				if (!strcmp(e.hostname, "*"))
 					e.hostname = NULL;