Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

sync with pim6sd; removed a redundant member from the listaddr struct…

…ure.
  • Loading branch information...
commit f5ed82fa6ee9e0c06f6593f3b4c8d281418a744f 1 parent 89b903b
jinmei authored
Showing with 4 additions and 25 deletions.
  1. +3 −23 kame/kame/pim6dd/mld6_proto.c
  2. +1 −2  kame/kame/pim6dd/vif.h
26 kame/kame/pim6dd/mld6_proto.c
View
@@ -1,4 +1,4 @@
-/* $KAME: mld6_proto.c,v 1.8 2001/04/17 18:18:09 jinmei Exp $ */
+/* $KAME: mld6_proto.c,v 1.9 2001/04/17 18:33:37 jinmei Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -108,23 +108,11 @@ void
query_groups(v)
register struct uvif *v;
{
- register struct listaddr *g;
-
v->uv_gq_timer = MLD6_QUERY_INTERVAL;
if (v->uv_flags & VIFF_QUERIER && (v->uv_flags & VIFF_NOLISTENER) == 0)
send_mld6(MLD6_LISTENER_QUERY, 0, &v->uv_linklocal->pa_addr,
NULL, (struct in6_addr *)&in6addr_any,
v->uv_ifindex, MLD6_QUERY_RESPONSE_INTERVAL, 0, 1);
-
- /*
- * Decrement the old-hosts-present timer for each
- * active group on that vif.
- */
- for (g = v->uv_groups; g != NULL; g = g->al_next)
- if (g->al_old > TIMER_INTERVAL)
- g->al_old -= TIMER_INTERVAL;
- else
- g->al_old = 0;
}
@@ -301,7 +289,6 @@ accept_listener_report(src, dst, group)
log(LOG_ERR, 0, "ran out of memory"); /* fatal */
g->al_addr = group_sa;
- g->al_old = 0;
/** set a timer for expiration **/
g->al_query = 0;
@@ -356,17 +343,10 @@ accept_listener_done(src, dst, group)
if (inet6_equal(&group_sa, &g->al_addr)) {
IF_DEBUG(DEBUG_MLD)
log(LOG_DEBUG, 0,
- "[accept_done_message] %d %ld\n",
- g->al_old, g->al_query);
+ "[accept_done_message] %ld\n",
+ g->al_query);
/*
- * Ignore the done message if there are old
- * hosts present
- */
- if (g->al_old)
- return;
-
- /*
* still waiting for a reply to a query,
* ignore the done
*/
3  kame/kame/pim6dd/vif.h
View
@@ -1,4 +1,4 @@
-/* $KAME: vif.h,v 1.4 2001/02/21 03:49:56 itojun Exp $ */
+/* $KAME: vif.h,v 1.5 2001/04/17 18:33:37 jinmei Exp $ */
/*
* Copyright (c) 1998 by the University of Southern California.
@@ -254,7 +254,6 @@ struct listaddr {
} al_alu;
u_char al_pv; /* router protocol version */
u_char al_mv; /* router mrouted version */
- u_char al_old; /* time since heard old report: unnecessary for mld */
u_char al_index; /* neighbor index */
u_long al_timerid; /* timer for group membership */
u_long al_query; /* timer for repeated leave query */
Please sign in to comment.
Something went wrong with that request. Please try again.