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/ipconfig: don't add default route for ULA prefix

Browse source
This commit is contained in:
cinap_lenrek 2024-01-24 20:51:52 +00:00
parent fc6cc079fe
commit 42ec5a0729
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sys/src/cmd/ip/ipconfig/ipv6.c
View file

@ -24,6 +24,7 @@ enum {
MFMASK = 1 << 7,
OCMASK = 1 << 6,
OLMASK = 1 << 7,
AFMASK = 1 << 6,
RFMASK = 1 << 5,
@ -151,6 +152,7 @@ uchar v6solpfx[IPaddrlen] = {
0xff, 0, 0, 0,
};
#define isula(addr) (((addr)[0] & 0xfe) == 0xfc)
void
v6paraminit(Conf *cf)
@ -587,11 +589,6 @@ recvrahost(uchar buf[], int pktlen)
conf.rxmitra = nhgetl(ra->rxmtimer);
conf.linkmtu = DEFMTU;
if(conf.routerlt == 0)
ipmove(conf.gaddr, IPnoaddr);
else
ipmove(conf.gaddr, ra->src);
memset(conf.dns, 0, sizeof(conf.dns));
memset(conf.fs, 0, sizeof(conf.fs));
memset(conf.auth, 0, sizeof(conf.auth));
@ -696,18 +693,12 @@ recvrahost(uchar buf[], int pktlen)
maskip(prfo->pref, conf.mask, conf.v6pref);
memmove(conf.laddr, conf.v6pref, 8);
memmove(conf.laddr+8, conf.lladdr+8, 8);
ipmove(conf.gaddr, (prfo->lar & RFMASK) != 0? prfo->pref: ra->src);
conf.onlink = (prfo->lar & OLMASK) != 0;
conf.autoflag = (prfo->lar & AFMASK) != 0;
conf.validlt = nhgetl(prfo->validlt);
conf.preflt = nhgetl(prfo->preflt);
if(conf.routerlt == 0)
ipmove(conf.gaddr, IPnoaddr);
else if((prfo->lar & RFMASK) != 0)
ipmove(conf.gaddr, prfo->pref);
else
ipmove(conf.gaddr, ra->src);
seen = 0;
sha1((uchar*)&conf, sizeof(conf), hash, nil);
for(rr = &routelist; (r = *rr) != nil; rr = &r->next){
@ -723,6 +714,12 @@ recvrahost(uchar buf[], int pktlen)
memmove(r->hash, hash, SHA1dlen);
if(conf.routerlt == 0
|| isula(conf.laddr)
|| ipcmp(conf.gaddr, conf.laddr) == 0
|| ipcmp(conf.gaddr, conf.lladdr) == 0)
ipmove(conf.gaddr, IPnoaddr);
ipmove(r->src, ra->src);
ipmove(r->gaddr, conf.gaddr);
ipmove(r->laddr, conf.laddr);
@ -764,9 +761,7 @@ recvrahost(uchar buf[], int pktlen)
if(noconfig)
continue;
if(validip(conf.gaddr)
&& ipcmp(conf.gaddr, conf.laddr) != 0
&& ipcmp(conf.gaddr, conf.lladdr) != 0)
if(validip(conf.gaddr))
adddefroute(conf.gaddr, conf.lladdr, conf.laddr, conf.mask);
putndb(1);