Rename local variables called delay that shadow the delay() decl.
Pointed out by Robert Swindells.
This commit is contained in:
rpaulo
parent
8adab3e01b
commit
941ce91614
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: in6.c,v 1.98 2006/03/05 23:47:08 rpaulo Exp $ */
|
||||
/* $NetBSD: in6.c,v 1.99 2006/03/06 20:33:52 rpaulo Exp $ */
|
||||
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.98 2006/03/05 23:47:08 rpaulo Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.99 2006/03/06 20:33:52 rpaulo Exp $");
|
||||
|
||||
#include "opt_inet.h"
|
||||
#include "opt_pfil_hooks.h"
|
||||
|
|
@ -777,7 +777,7 @@ in6_update_ifa(ifp, ifra, ia, flags)
|
|||
struct in6_multi_mship *imm;
|
||||
struct in6_multi *in6m_sol;
|
||||
struct rtentry *rt;
|
||||
int delay;
|
||||
int dad_delay;
|
||||
|
||||
in6m_sol = NULL;
|
||||
|
||||
|
|
@ -1062,7 +1062,7 @@ in6_update_ifa(ifp, ifra, ia, flags)
|
|||
"in6_setscope failed\n");
|
||||
goto cleanup;
|
||||
}
|
||||
delay = 0;
|
||||
dad_delay = 0;
|
||||
if ((flags & IN6_IFAUPDATE_DADDELAY)) {
|
||||
/*
|
||||
* We need a random delay for DAD on the address
|
||||
|
|
@ -1071,13 +1071,13 @@ in6_update_ifa(ifp, ifra, ia, flags)
|
|||
* avoid report collision.
|
||||
* [draft-ietf-ipv6-rfc2462bis-02.txt]
|
||||
*/
|
||||
delay = arc4random() %
|
||||
dad_delay = arc4random() %
|
||||
(MAX_RTR_SOLICITATION_DELAY * hz);
|
||||
}
|
||||
|
||||
#define MLTMASK_LEN 4 /* mltmask's masklen (=32bit=4octet) */
|
||||
/* join solicited multicast addr for new host id */
|
||||
imm = in6_joingroup(ifp, &llsol, &error, delay);
|
||||
imm = in6_joingroup(ifp, &llsol, &error, dad_delay);
|
||||
if (!imm) {
|
||||
nd6log((LOG_ERR,
|
||||
"in6_update_ifa: addmulti "
|
||||
|
|
@ -1152,18 +1152,18 @@ in6_update_ifa(ifp, ifra, ia, flags)
|
|||
/*
|
||||
* join node information group address
|
||||
*/
|
||||
delay = 0;
|
||||
dad_delay = 0;
|
||||
if ((flags & IN6_IFAUPDATE_DADDELAY)) {
|
||||
/*
|
||||
* The spec doesn't say anything about delay for this
|
||||
* group, but the same logic should apply.
|
||||
*/
|
||||
delay = arc4random() %
|
||||
dad_delay = arc4random() %
|
||||
(MAX_RTR_SOLICITATION_DELAY * hz);
|
||||
}
|
||||
if (in6_nigroup(ifp, hostname, hostnamelen, &mltaddr) == 0) {
|
||||
imm = in6_joingroup(ifp, &mltaddr.sin6_addr, &error,
|
||||
delay); /* XXX jinmei */
|
||||
dad_delay); /* XXX jinmei */
|
||||
if (!imm) {
|
||||
nd6log((LOG_WARNING, "in6_update_ifa: "
|
||||
"addmulti failed for %s on %s (errno=%d)\n",
|
||||
|
|
@ -1239,7 +1239,7 @@ in6_update_ifa(ifp, ifra, ia, flags)
|
|||
{
|
||||
int mindelay, maxdelay;
|
||||
|
||||
delay = 0;
|
||||
dad_delay = 0;
|
||||
if ((flags & IN6_IFAUPDATE_DADDELAY)) {
|
||||
/*
|
||||
* We need to impose a delay before sending an NS
|
||||
|
|
@ -1256,14 +1256,14 @@ in6_update_ifa(ifp, ifra, ia, flags)
|
|||
}
|
||||
maxdelay = MAX_RTR_SOLICITATION_DELAY * hz;
|
||||
if (maxdelay - mindelay == 0)
|
||||
delay = 0;
|
||||
dad_delay = 0;
|
||||
else {
|
||||
delay =
|
||||
dad_delay =
|
||||
(arc4random() % (maxdelay - mindelay)) +
|
||||
mindelay;
|
||||
}
|
||||
}
|
||||
nd6_dad_start((struct ifaddr *)ia, delay);
|
||||
nd6_dad_start((struct ifaddr *)ia, dad_delay);
|
||||
}
|
||||
|
||||
return (error);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mld6.c,v 1.31 2006/03/05 23:47:08 rpaulo Exp $ */
|
||||
/* $NetBSD: mld6.c,v 1.32 2006/03/06 20:33:52 rpaulo Exp $ */
|
||||
/* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.31 2006/03/05 23:47:08 rpaulo Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.32 2006/03/06 20:33:52 rpaulo Exp $");
|
||||
|
||||
#include "opt_inet.h"
|
||||
|
||||
|
|
@ -626,10 +626,10 @@ mld_allocbuf(mh, len, in6m, type)
|
|||
* Add an address to the list of IP6 multicast addresses for a given interface.
|
||||
*/
|
||||
struct in6_multi *
|
||||
in6_addmulti(maddr6, ifp, errorp, delay)
|
||||
in6_addmulti(maddr6, ifp, errorp, timer)
|
||||
struct in6_addr *maddr6;
|
||||
struct ifnet *ifp;
|
||||
int *errorp, delay;
|
||||
int *errorp, timer;
|
||||
{
|
||||
struct in6_ifaddr *ia;
|
||||
struct in6_ifreq ifr;
|
||||
|
|
@ -705,7 +705,7 @@ in6_addmulti(maddr6, ifp, errorp, delay)
|
|||
}
|
||||
|
||||
callout_init(in6m->in6m_timer_ch);
|
||||
in6m->in6m_timer = delay;
|
||||
in6m->in6m_timer = timer;
|
||||
if (in6m->in6m_timer > 0) {
|
||||
in6m->in6m_state = MLD_REPORTPENDING;
|
||||
mld_starttimer(in6m);
|
||||
|
|
@ -783,10 +783,10 @@ in6_delmulti(in6m)
|
|||
|
||||
|
||||
struct in6_multi_mship *
|
||||
in6_joingroup(ifp, addr, errorp, delay)
|
||||
in6_joingroup(ifp, addr, errorp, timer)
|
||||
struct ifnet *ifp;
|
||||
struct in6_addr *addr;
|
||||
int *errorp, delay;
|
||||
int *errorp, timer;
|
||||
{
|
||||
struct in6_multi_mship *imm;
|
||||
|
||||
|
|
@ -797,7 +797,7 @@ in6_joingroup(ifp, addr, errorp, delay)
|
|||
}
|
||||
|
||||
memset(imm, 0, sizeof(*imm));
|
||||
imm->i6mm_maddr = in6_addmulti(addr, ifp, errorp, delay);
|
||||
imm->i6mm_maddr = in6_addmulti(addr, ifp, errorp, timer);
|
||||
if (!imm->i6mm_maddr) {
|
||||
/* *errorp is alrady set */
|
||||
free(imm, M_IPMADDR);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: nd6_nbr.c,v 1.62 2006/03/05 23:47:08 rpaulo Exp $ */
|
||||
/* $NetBSD: nd6_nbr.c,v 1.63 2006/03/06 20:33:52 rpaulo Exp $ */
|
||||
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.62 2006/03/05 23:47:08 rpaulo Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.63 2006/03/06 20:33:52 rpaulo Exp $");
|
||||
|
||||
#include "opt_inet.h"
|
||||
#include "opt_ipsec.h"
|
||||
|
|
@ -1074,9 +1074,9 @@ nd6_dad_stoptimer(dp)
|
|||
* Start Duplicate Address Detection (DAD) for specified interface address.
|
||||
*/
|
||||
void
|
||||
nd6_dad_start(ifa, delay)
|
||||
nd6_dad_start(ifa, xtick)
|
||||
struct ifaddr *ifa;
|
||||
int delay; /* minimum delay ticks for IFF_UP event */
|
||||
int xtick; /* minimum delay ticks for IFF_UP event */
|
||||
{
|
||||
struct in6_ifaddr *ia = (struct in6_ifaddr *)ifa;
|
||||
struct dadq *dp;
|
||||
|
|
@ -1143,12 +1143,12 @@ nd6_dad_start(ifa, delay)
|
|||
dp->dad_count = ip6_dad_count;
|
||||
dp->dad_ns_icount = dp->dad_na_icount = 0;
|
||||
dp->dad_ns_ocount = dp->dad_ns_tcount = 0;
|
||||
if (delay == 0) {
|
||||
if (xtick == 0) {
|
||||
nd6_dad_ns_output(dp, ifa);
|
||||
nd6_dad_starttimer(dp,
|
||||
(long)ND_IFINFO(ifa->ifa_ifp)->retrans * hz / 1000);
|
||||
} else
|
||||
nd6_dad_starttimer(dp, delay);
|
||||
nd6_dad_starttimer(dp, xtick);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: nd6_rtr.c,v 1.56 2006/03/05 23:47:08 rpaulo Exp $ */
|
||||
/* $NetBSD: nd6_rtr.c,v 1.57 2006/03/06 20:33:52 rpaulo Exp $ */
|
||||
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.56 2006/03/05 23:47:08 rpaulo Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.57 2006/03/06 20:33:52 rpaulo Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -1898,9 +1898,9 @@ in6_ifadd(pr, mcast)
|
|||
}
|
||||
|
||||
int
|
||||
in6_tmpifadd(ia0, forcegen, delay)
|
||||
in6_tmpifadd(ia0, forcegen, dad_delay)
|
||||
const struct in6_ifaddr *ia0; /* corresponding public address */
|
||||
int forcegen, delay;
|
||||
int forcegen, dad_delay;
|
||||
{
|
||||
struct ifnet *ifp = ia0->ia_ifa.ifa_ifp;
|
||||
struct in6_ifaddr *newia, *ia;
|
||||
|
|
@ -1999,7 +1999,7 @@ in6_tmpifadd(ia0, forcegen, delay)
|
|||
|
||||
/* allocate ifaddr structure, link into chain, etc. */
|
||||
updateflags = 0;
|
||||
if (delay)
|
||||
if (dad_delay)
|
||||
updateflags |= IN6_IFAUPDATE_DADDELAY;
|
||||
if ((error = in6_update_ifa(ifp, &ifra, NULL, updateflags)) != 0)
|
||||
return (error);
|
||||
|
|
|
|||
Loading…
Reference in New Issue