xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ipconfig: cleanup code duplication in ip6cfg()

Browse source
This commit is contained in:
cinap_lenrek 2014-08-26 21:09:57 +02:00
parent dbf165e1bd
commit 7ad08a8515
1 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -385,9 +385,8 @@ dialicmp(uchar *dst, int dport, int *ctlfd)
int int
ip6cfg(int autoconf) ip6cfg(int autoconf)
{ {
int dupfound = 0, n; int tentative, dupfound = 0, n;
char *p; char *p, buf[256];
char buf[256];
uchar ethaddr[6]; uchar ethaddr[6];
Biobuf *bp; Biobuf *bp;
@ -397,7 +396,10 @@ ip6cfg(int autoconf)
ea2lla(conf.laddr, ethaddr); ea2lla(conf.laddr, ethaddr);
} }
if (dupl_disc) tentative = dupl_disc;
Again:
if (tentative)
n = sprint(buf, "try"); n = sprint(buf, "try");
else else
n = sprint(buf, "add"); n = sprint(buf, "add");
@ -417,7 +419,7 @@ ip6cfg(int autoconf)
return -1; return -1;
} }
if (!dupl_disc) if (!tentative)
return 0; return 0;
sleep(3000); sleep(3000);
@ -434,25 +436,19 @@ ip6cfg(int autoconf)
while(p = Brdline(bp, '\n')){ while(p = Brdline(bp, '\n')){
p[Blinelen(bp)-1] = 0; p[Blinelen(bp)-1] = 0;
if(cistrstr(p, buf) != 0) { if(cistrstr(p, buf) != 0) {
warning("found dup entry in arp cache");
dupfound = 1; dupfound = 1;
break; break;
} }
} }
Bterm(bp); Bterm(bp);
if (dupfound) if (!dupfound) {
doremove(); tentative = 0;
else { goto Again;
n = sprint(buf, "add %I %M", conf.laddr, conf.mask);
if(validip(conf.raddr)){
n += snprint(buf+n, sizeof buf-n, " %I", conf.raddr);
if(conf.mtu != 0)
n += snprint(buf+n, sizeof buf-n, " %d",
conf.mtu);
}
write(conf.cfd, buf, n);
} }
warning("found dup entry in arp cache");
doremove();
return 0; return 0;
} }