cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ip/dhcpd: don't override local address for gateway case

Browse source
This commit is contained in:
cinap_lenrek 2024-01-01 21:14:28 +00:00
parent f0ac2d0176
commit 59d4a6261f
1 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
sys/src/cmd/ip/dhcpd/dhcpd.c
View file

@ -726,20 +726,21 @@ sendoffer(Req *rp, uchar *ip, int offer)
bp = rp->bp;
up = rp->up;
localip(up->laddr, ip, rp->ifc);
flags = nhgets(bp->flags);
if(validip(rp->giaddr)){
ipmove(up->raddr, rp->giaddr);
hnputs(up->rport, 67);
} else if(flags & Fbroadcast){
ipmove(up->raddr, IPv4bcast);
hnputs(up->rport, 68);
} else {
ipmove(up->raddr, ip);
if(bp->htype == 1)
arpenter(up->raddr, bp->chaddr, up->laddr);
hnputs(up->rport, 68);
localip(up->laddr, ip, rp->ifc);
if(flags & Fbroadcast){
ipmove(up->raddr, IPv4bcast);
hnputs(up->rport, 68);
} else {
ipmove(up->raddr, ip);
if(bp->htype == 1)
arpenter(up->raddr, bp->chaddr, up->laddr);
hnputs(up->rport, 68);
}
}
/*
@ -785,20 +786,21 @@ sendack(Req *rp, uchar *ip, int offer, int sendlease)
bp = rp->bp;
up = rp->up;
localip(up->laddr, ip, rp->ifc);
flags = nhgets(bp->flags);
if(validip(rp->giaddr)){
ipmove(up->raddr, rp->giaddr);
hnputs(up->rport, 67);
} else if(flags & Fbroadcast){
ipmove(up->raddr, IPv4bcast);
hnputs(up->rport, 68);
} else {
ipmove(up->raddr, ip);
if(bp->htype == 1)
arpenter(up->raddr, bp->chaddr, up->laddr);
hnputs(up->rport, 68);
localip(up->laddr, ip, rp->ifc);
if(flags & Fbroadcast){
ipmove(up->raddr, IPv4bcast);
hnputs(up->rport, 68);
} else {
ipmove(up->raddr, ip);
if(bp->htype == 1)
arpenter(up->raddr, bp->chaddr, up->laddr);
hnputs(up->rport, 68);
}
}
/*
@ -844,8 +846,6 @@ sendnak(Req *rp, uchar *ip, char *msg)
bp = rp->bp;
up = rp->up;
localip(up->laddr, ip, rp->ifc);
/*
* set destination (always broadcast)
*/
@ -853,6 +853,7 @@ sendnak(Req *rp, uchar *ip, char *msg)
ipmove(up->raddr, rp->giaddr);
hnputs(up->rport, 67);
} else {
localip(up->laddr, ip, rp->ifc);
ipmove(up->raddr, IPv4bcast);
hnputs(up->rport, 68);
}
@ -973,20 +974,21 @@ bootp(Req *rp)
rp->p += 128-4;
}
localip(up->laddr, iip->ipaddr, iip->ifc);
flags = nhgets(bp->flags);
if(validip(rp->giaddr)){
ipmove(up->raddr, rp->giaddr);
hnputs(up->rport, 67);
} else if(flags & Fbroadcast){
ipmove(up->raddr, IPv4bcast);
hnputs(up->rport, 68);
} else {
v4tov6(up->raddr, bp->yiaddr);
if(bp->htype == 1)
arpenter(up->raddr, bp->chaddr, up->laddr);
hnputs(up->rport, 68);
localip(up->laddr, iip->ipaddr, rp->ifc);
if(flags & Fbroadcast){
ipmove(up->raddr, IPv4bcast);
hnputs(up->rport, 68);
} else {
v4tov6(up->raddr, bp->yiaddr);
if(bp->htype == 1)
arpenter(up->raddr, bp->chaddr, up->laddr);
hnputs(up->rport, 68);
}
}
/*