shithub: riscv

Info  •  Files  •  Log  •  Branches

merge

--- a/sys/src/cmd/ip/ipconfig/dhcp.c

+++ b/sys/src/cmd/ip/ipconfig/dhcp.c

@@ -159,7 +159,7 @@

 dhcpquery(int needconfig, int startstate)

 {

 	if(needconfig)

-		fprint(conf.cfd, "add %I %I", IPnoaddr, IPnoaddr);

+		fprint(conf.cfd, "add %I %M", IPnoaddr, IPnoaddr);

 	conf.fd = openlisten();

 	if(conf.fd < 0){

@@ -192,7 +192,7 @@

 	close(conf.fd);

 	if(needconfig)

-		fprint(conf.cfd, "remove %I %I", IPnoaddr, IPnoaddr);

+		fprint(conf.cfd, "remove %I %M", IPnoaddr, IPnoaddr);

 }

--- a/sys/src/cmd/ip/ipconfig/main.c

+++ b/sys/src/cmd/ip/ipconfig/main.c

@@ -577,7 +577,7 @@

 	if(!validip(conf.mask))

 		ipmove(conf.mask, defmask(conf.laddr));

-	n += snprint(buf+n, sizeof buf-n, " %I", conf.mask);

+	n += snprint(buf+n, sizeof buf-n, " %M", conf.mask);

 	if(validip(conf.raddr)){

 		n += snprint(buf+n, sizeof buf-n, " %I", conf.raddr);