shithub: riscv

Download patch

ref: 590bed4bf88b004942dba3c5917b24be50016b78
parent: 82559c3fdcc8242a1a542a3b4d3076e133fd02a9
parent: b863253879268c658abd3e61c24cf27adc99a6c1
author: cinap_lenrek <[email protected]>
date: Wed Aug 29 20:05:00 EDT 2018 

merge


--- a/sys/src/cmd/ip/dhcpd/dhcpd.c
+++ b/sys/src/cmd/ip/dhcpd/dhcpd.c
@@ -165,7 +165,7 @@
 
 void	addropt(Req*, int, uchar*);
 void	addrsopt(Req*, int, uchar**, int);
-void	arpenter(uchar*, uchar*, uchar*);
+void	arpenter(uchar*, uchar*);
 void	bootp(Req*);
 void	byteopt(Req*, int, uchar);
 void	dhcp(Req*);
@@ -748,7 +748,7 @@
 	} else {
 		ipmove(up->raddr, ip);
 		if(bp->htype == 1)
-			arpenter(up->raddr, bp->chaddr, up->ifcaddr);
+			arpenter(up->raddr, bp->chaddr);
 		hnputs(up->rport, 68);
 	}
 
@@ -807,7 +807,7 @@
 	} else {
 		ipmove(up->raddr, ip);
 		if(bp->htype == 1)
-			arpenter(up->raddr, bp->chaddr, up->ifcaddr);
+			arpenter(up->raddr, bp->chaddr);
 		hnputs(up->rport, 68);
 	}
 
@@ -995,7 +995,7 @@
 	} else {
 		v4tov6(up->raddr, bp->yiaddr);
 		if(bp->htype == 1)
-			arpenter(up->raddr, bp->chaddr, up->ifcaddr);
+			arpenter(up->raddr, bp->chaddr);
 		hnputs(up->rport, 68);
 	}
 
@@ -1587,7 +1587,7 @@
 }
 
 void
-arpenter(uchar *ip, uchar *ether, uchar *ifcaddr)
+arpenter(uchar *ip, uchar *ether)
 {
 	int f;
 	char buf[256];
@@ -1598,7 +1598,7 @@
 		syslog(debug, blog, "open %s: %r", buf);
 		return;
 	}
-	fprint(f, "add ether %I %E %I", ip, ether, ifcaddr);
+	fprint(f, "add ether %I %E", ip, ether);
 	close(f);
 }