Show netmask as /%d
authorJoseph C. Lehner <joseph.c.lehner@gmail.com>
Sat, 7 Sep 2019 08:55:12 +0000 (10:55 +0200)
committerJoseph C. Lehner <joseph.c.lehner@gmail.com>
Sat, 7 Sep 2019 08:55:12 +0000 (10:55 +0200)
README.md
nmrp.c

index 880e0cedcd4e7d116a15a62064cc6ed61a5ae531..56f761952d88f48c728dcdad60695a4aeff53f93 100644 (file)
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ immediately after starting `nmrpflash`.
 # nmrpflash -i eth0 -f EX2700-V1.0.1.8.img
 Advertising NMRP server on eth0 ... /
 Received configuration request from a4:2b:8c:00:00:01.
-Sending configuration: ip 10.164.183.252, mask 255.255.255.0.
+Sending configuration: 10.164.183.252/24
 Received upload request: filename 'firmware'.
 Uploading EX2700-V1.0.1.8.img ...
 Upload successful.
diff --git a/nmrp.c b/nmrp.c
index 3f7c7b84a354160b168e2a79c36eab6309b7918f..e4fcbf1bec742d1d0c9455c768bf4fcfda5fc87c 100644 (file)
--- a/nmrp.c
+++ b/nmrp.c
@@ -541,8 +541,8 @@ int nmrp_do(struct nmrpd_args *args)
 
                                memcpy(tx.eh.ether_dhost, rx.eh.ether_shost, 6);
 
-                               printf("Sending configuration: %s, netmask %s.\n",
-                                               args->ipaddr, args->ipmask);
+                               printf("Sending configuration: %s/%d.\n",
+                                               args->ipaddr, bitcount(ipmask.s_addr));
 
                                if (ethsock_arp_add(sock, rx.eh.ether_shost, ipaddr.s_addr, &arp_undo) != 0) {
                                        goto out;