statefiles: change ipv4 MAC statefile syntax

This changes the MAC representation in the lease/statefile so that it
reads "aa:bb:cc:dd:ee:ff" instead of "aabbccddeeff".

No functional changes, but this makes it easier to parse the statefile
in rpcd-mod-luci (for reporting the MAC addresses in LuCI).

We should probably change lease->hwaddr to be a struct ether_addr,
to make it clearer that we only support MAC addresses as hwaddr,
but that's a topic for a different PR.

Signed-off-by: David Härdeman <[email protected]>
Link: https://github.com/openwrt/odhcpd/pull/332
Signed-off-by: Álvaro Fernández Rojas <[email protected]>

diff --git a/src/statefiles.c b/src/statefiles.c
index d0ccef5557bd20559073f7b70f6089a5c6298da2..ffca35553a9669e0802441e79c95a9a6942e5b68 100644 (file)
--- a/src/statefiles.c
+++ b/src/statefiles.c
@@ -18,6 +18,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <netinet/in.h>
+#include <netinet/ether.h>
 #include <arpa/nameser.h>
 #include <arpa/inet.h>
 #include <resolv.h>
@@ -207,7 +208,6 @@ static void statefiles_write_state6(struct write_ctxt *ctxt, struct dhcpv6_lease
 
 static void statefiles_write_state4(struct write_ctxt *ctxt, struct dhcpv4_lease *lease)
 {
-       char hexhwaddr[sizeof(lease->hwaddr) * 2 + 1];
        char ipbuf[INET6_ADDRSTRLEN];
 
        if (lease->hostname && lease->hostname_valid) {
@@ -219,12 +219,12 @@ static void statefiles_write_state4(struct write_ctxt *ctxt, struct dhcpv4_lease
                return;
 
        inet_ntop(AF_INET, &lease->ipv4, ipbuf, sizeof(ipbuf));
-       odhcpd_hexlify(hexhwaddr, lease->hwaddr, sizeof(lease->hwaddr));
 
        /* # <iface> <hexhwaddr> "ipv4" <hostname> <valid_until> <hexaddr> "32" <addrstr>"/32" */
        fprintf(ctxt->fp,
                "# %s %s ipv4 %s%s %" PRId64 " %x 32 %s/32\n",
-               ctxt->iface->ifname, hexhwaddr,
+               ctxt->iface->ifname,
+               ether_ntoa((struct ether_addr *)lease->hwaddr),
                lease->hostname_valid ? "" : "broken\\x20",
                lease->hostname ? lease->hostname : "-",
                (lease->valid_until > ctxt->now ?