d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pullup from p4 tip:

Browse Source 
* Fix MLDv2 general query timer (fallout from automated refactoring).
 * Refactor MLDv1 timer.
MLDv2 query processing is now working.
This commit is contained in:
Bruce M Simpson 2009-05-21 18:05:17 +00:00
parent 62aa21ae86
commit 05e5bb311b
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/netinet6/mld6.c
View File

@ -855,8 +855,8 @@ mld_v2_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
* not schedule any other reports. * not schedule any other reports.
* Otherwise, reset the interface timer. * Otherwise, reset the interface timer.
*/ */
if (mli->mli_v1_timer == 0 || mli->mli_v2_timer >= timer) { if (mli->mli_v2_timer == 0 || mli->mli_v2_timer >= timer) {
mli->mli_v1_timer = MLD_RANDOM_DELAY(timer); mli->mli_v2_timer = MLD_RANDOM_DELAY(timer);
V_interface_timers_running6 = 1; V_interface_timers_running6 = 1;
} }
} else { } else {
@ -888,7 +888,7 @@ mld_v2_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
* Otherwise, prepare to respond to the * Otherwise, prepare to respond to the
* group-specific or group-and-source query. * group-specific or group-and-source query.
*/ */
if (mli->mli_v1_timer == 0 || mli->mli_v2_timer >= timer) if (mli->mli_v2_timer == 0 || mli->mli_v2_timer >= timer)
mld_v2_process_group_query(inm, mli, timer, m, off); mld_v2_process_group_query(inm, mli, timer, m, off);
} }
@ -1498,6 +1498,7 @@ mld_v2_process_group_timers(struct mld_ifinfo *mli,
static void static void
mld_set_version(struct mld_ifinfo *mli, const int version) mld_set_version(struct mld_ifinfo *mli, const int version)
{ {
int old_version_timer;
MLD_LOCK_ASSERT(); MLD_LOCK_ASSERT();
@ -1505,24 +1506,18 @@ mld_set_version(struct mld_ifinfo *mli, const int version)
version, mli->mli_ifp, mli->mli_ifp->if_xname); version, mli->mli_ifp, mli->mli_ifp->if_xname);
if (version == MLD_VERSION_1) { if (version == MLD_VERSION_1) {
int old_version_timer;
/* /*
* Compute the "Older Version Querier Present" timer as per * Compute the "Older Version Querier Present" timer as per
* Section 9.12. * Section 9.12.
*/ */
old_version_timer = mli->mli_rv * mli->mli_qi + mli->mli_qri; old_version_timer = mli->mli_rv * mli->mli_qi + mli->mli_qri;
old_version_timer *= PR_SLOWHZ; old_version_timer *= PR_SLOWHZ;
mli->mli_v1_timer = old_version_timer;
if (version == MLD_VERSION_1) {
mli->mli_v1_timer = old_version_timer;
}
} }
if (mli->mli_v1_timer > 0) { if (mli->mli_v1_timer > 0 && mli->mli_version != MLD_VERSION_1) {
if (mli->mli_version != MLD_VERSION_1) { mli->mli_version = MLD_VERSION_1;
mli->mli_version = MLD_VERSION_1; mld_v2_cancel_link_timers(mli);
mld_v2_cancel_link_timers(mli);
}
} }
} }
@ -1648,17 +1643,15 @@ mld_v1_process_querier_timers(struct mld_ifinfo *mli)
MLD_LOCK_ASSERT(); MLD_LOCK_ASSERT();
if (mli->mli_v1_timer == 0) { if (mli->mli_v1_timer == 0 && mli->mli_version != MLD_VERSION_2) {
/* /*
* MLDv1 Querier Present timers expired; revert to MLDv2. * MLDv1 Querier Present timer expired; revert to MLDv2.
*/ */
if (mli->mli_version != MLD_VERSION_2) { CTR5(KTR_MLD,
CTR5(KTR_MLD, "%s: transition from v%d -> v%d on %p(%s)",
"%s: transition from v%d -> v%d on %p(%s)", __func__, mli->mli_version, MLD_VERSION_2,
__func__, mli->mli_version, MLD_VERSION_2, mli->mli_ifp, mli->mli_ifp->if_xname);
mli->mli_ifp, mli->mli_ifp->if_xname); mli->mli_version = MLD_VERSION_2;
mli->mli_version = MLD_VERSION_2;
}
} }
} }