diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2018-08-30 00:05:00 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2018-08-30 00:05:00 +0200 |
| commit | 590bed4bf88b004942dba3c5917b24be50016b78 (patch) | |
| tree | 580fdcbb8bbc08d72b19867a8c29d63ffd21bdbd | |
| parent | 82559c3fdcc8242a1a542a3b4d3076e133fd02a9 (diff) | |
| parent | b863253879268c658abd3e61c24cf27adc99a6c1 (diff) | |
| download | plan9front-590bed4bf88b004942dba3c5917b24be50016b78.tar.xz | |
merge
| -rw-r--r-- | sys/src/cmd/ip/dhcpd/dhcpd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/src/cmd/ip/dhcpd/dhcpd.c b/sys/src/cmd/ip/dhcpd/dhcpd.c index 747c709d9..abfeb342b 100644 --- a/sys/src/cmd/ip/dhcpd/dhcpd.c +++ b/sys/src/cmd/ip/dhcpd/dhcpd.c @@ -165,7 +165,7 @@ char *optname[256] = 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 @@ sendoffer(Req *rp, uchar *ip, int offer) } 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 @@ sendack(Req *rp, uchar *ip, int offer, int sendlease) } 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 @@ bootp(Req *rp) } 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 @@ hexopt(Req *rp, int t, char *str) } void -arpenter(uchar *ip, uchar *ether, uchar *ifcaddr) +arpenter(uchar *ip, uchar *ether) { int f; char buf[256]; @@ -1598,7 +1598,7 @@ arpenter(uchar *ip, uchar *ether, uchar *ifcaddr) 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); } |