Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undo interface addition attempt if in6_ifinit() fails. 

without it, :: will be kept if in6_ifinit() fails.
This commit is contained in:
itojun 2000-03-12 05:23:07 +00:00
parent e9619d5d21
commit 7560717e93
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/netinet6/in6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in6.c,v 1.23 2000/03/02 07:14:52 itojun Exp $ */
/* $NetBSD: in6.c,v 1.24 2000/03/12 05:23:07 itojun Exp $ */
/* $KAME: in6.c,v 1.56 2000/03/02 07:11:00 itojun Exp $ */
/*
@ -327,7 +327,8 @@ in6_control(so, cmd, data, ifp, p)
#ifdef COMPAT_IN6IFIOCTL
struct sockaddr_in6 net;
#endif
int error = 0, hostIsNew, prefixIsNew;
int error = 0, hostIsNew, prefixIsNew;
int newifaddr;
time_t time_second = (time_t)time.tv_sec;
int privileged;
@ -488,7 +489,10 @@ in6_control(so, cmd, data, ifp, p)
TAILQ_INSERT_TAIL(&ifp->if_addrlist, &ia->ia_ifa,
ifa_list);
IFAREF(&ia->ia_ifa);
}
newifaddr = 1;
} else
newifaddr = 0;
if (cmd == SIOCAIFADDR_IN6) {
/* sanity for overflow - beware unsigned */
@ -639,7 +643,28 @@ in6_control(so, cmd, data, ifp, p)
break;
case SIOCSIFADDR_IN6:
return(in6_ifinit(ifp, ia, &ifr->ifr_addr, 1));
error = in6_ifinit(ifp, ia, &ifr->ifr_addr, 1);
undo:
if (error && newifaddr) {
TAILQ_REMOVE(&ifp->if_addrlist, &ia->ia_ifa, ifa_list);
IFAFREE(&ia->ia_ifa);
oia = ia;
if (oia == (ia = in6_ifaddr))
in6_ifaddr = ia->ia_next;
else {
while (ia->ia_next && (ia->ia_next != oia))
ia = ia->ia_next;
if (ia->ia_next)
ia->ia_next = oia->ia_next;
else {
printf("Didn't unlink in6_ifaddr "
"from list\n");
}
}
IFAFREE(&ia->ia_ifa);
}
return error;
#ifdef COMPAT_IN6IFIOCTL /* XXX should be unused */
case SIOCSIFNETMASK_IN6:
@ -719,8 +744,11 @@ in6_control(so, cmd, data, ifp, p)
}
prefixIsNew = 1; /* We lie; but effect's the same */
}
if (hostIsNew || prefixIsNew)
if (hostIsNew || prefixIsNew) {
error = in6_ifinit(ifp, ia, &ifra->ifra_addr, 0);
if (error)
goto undo;
}
if (hostIsNew && (ifp->if_flags & IFF_MULTICAST)) {
int error_local = 0;