Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/mld6.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/mld6.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.13.4.2 retrieving revision 1.22 diff -u -p -r1.13.4.2 -r1.22 --- src/sys/netinet6/mld6.c 2002/06/23 17:51:19 1.13.4.2 +++ src/sys/netinet6/mld6.c 2003/06/06 08:13:44 1.22 @@ -1,4 +1,4 @@ -/* $NetBSD: mld6.c,v 1.13.4.2 2002/06/23 17:51:19 jdolecek Exp $ */ +/* $NetBSD: mld6.c,v 1.22 2003/06/06 08:13:44 itojun Exp $ */ /* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */ /* @@ -70,7 +70,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.13.4.2 2002/06/23 17:51:19 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.22 2003/06/06 08:13:44 itojun Exp $"); #include "opt_inet.h" @@ -97,18 +97,18 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.1 */ /* denotes that the MLD max response delay field specifies time in milliseconds */ -#define MLD6_TIMER_SCALE 1000 +#define MLD_TIMER_SCALE 1000 /* * time between repetitions of a node's initial report of interest in a * multicast address(in seconds) */ -#define MLD6_UNSOLICITED_REPORT_INTERVAL 10 +#define MLD_UNSOLICITED_REPORT_INTERVAL 10 static struct ip6_pktopts ip6_opts; -static int mld6_timers_are_running; +static int mld_timers_are_running; /* XXX: These are necessary for KAME's link-local hack */ -static struct in6_addr mld6_all_nodes_linklocal = IN6ADDR_LINKLOCAL_ALLNODES_INIT; -static struct in6_addr mld6_all_routers_linklocal = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT; +static struct in6_addr mld_all_nodes_linklocal = IN6ADDR_LINKLOCAL_ALLNODES_INIT; +static struct in6_addr mld_all_routers_linklocal = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT; static void mld6_sendpkt __P((struct in6_multi *, int, const struct in6_addr *)); @@ -119,7 +119,7 @@ mld6_init() struct ip6_hbh *hbh = (struct ip6_hbh *)hbh_buf; u_int16_t rtalert_code = htons((u_int16_t)IP6OPT_RTALERT_MLD); - mld6_timers_are_running = 0; + mld_timers_are_running = 0; /* ip6h_nxt will be fill in later */ hbh->ip6h_len = 0; /* (8 >> 3) - 1 */ @@ -149,19 +149,19 @@ mld6_start_listening(in6m) * MLD messages are never sent for multicast addresses whose scope is 0 * (reserved) or 1 (node-local). */ - mld6_all_nodes_linklocal.s6_addr16[1] = + mld_all_nodes_linklocal.s6_addr16[1] = htons(in6m->in6m_ifp->if_index); /* XXX */ - if (IN6_ARE_ADDR_EQUAL(&in6m->in6m_addr, &mld6_all_nodes_linklocal) || + if (IN6_ARE_ADDR_EQUAL(&in6m->in6m_addr, &mld_all_nodes_linklocal) || IPV6_ADDR_MC_SCOPE(&in6m->in6m_addr) < IPV6_ADDR_SCOPE_LINKLOCAL) { in6m->in6m_timer = 0; - in6m->in6m_state = MLD6_OTHERLISTENER; + in6m->in6m_state = MLD_OTHERLISTENER; } else { - mld6_sendpkt(in6m, MLD6_LISTENER_REPORT, NULL); + mld6_sendpkt(in6m, MLD_LISTENER_REPORT, NULL); in6m->in6m_timer = - MLD6_RANDOM_DELAY(MLD6_UNSOLICITED_REPORT_INTERVAL * + MLD_RANDOM_DELAY(MLD_UNSOLICITED_REPORT_INTERVAL * PR_FASTHZ); - in6m->in6m_state = MLD6_IREPORTEDLAST; - mld6_timers_are_running = 1; + in6m->in6m_state = MLD_IREPORTEDLAST; + mld_timers_are_running = 1; } splx(s); } @@ -170,16 +170,16 @@ void mld6_stop_listening(in6m) struct in6_multi *in6m; { - mld6_all_nodes_linklocal.s6_addr16[1] = + mld_all_nodes_linklocal.s6_addr16[1] = htons(in6m->in6m_ifp->if_index); /* XXX */ - mld6_all_routers_linklocal.s6_addr16[1] = + mld_all_routers_linklocal.s6_addr16[1] = htons(in6m->in6m_ifp->if_index); /* XXX: necessary when mrouting */ - if (in6m->in6m_state == MLD6_IREPORTEDLAST && - (!IN6_ARE_ADDR_EQUAL(&in6m->in6m_addr, &mld6_all_nodes_linklocal)) && + if (in6m->in6m_state == MLD_IREPORTEDLAST && + (!IN6_ARE_ADDR_EQUAL(&in6m->in6m_addr, &mld_all_nodes_linklocal)) && IPV6_ADDR_MC_SCOPE(&in6m->in6m_addr) > IPV6_ADDR_SCOPE_NODELOCAL) - mld6_sendpkt(in6m, MLD6_LISTENER_DONE, - &mld6_all_routers_linklocal); + mld6_sendpkt(in6m, MLD_LISTENER_DONE, + &mld_all_routers_linklocal); } void @@ -188,31 +188,26 @@ mld6_input(m, off) int off; { struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); - struct mld6_hdr *mldh; + struct mld_hdr *mldh; struct ifnet *ifp = m->m_pkthdr.rcvif; struct in6_multi *in6m; struct in6_ifaddr *ia; int timer; /* timer value in the MLD query header */ -#ifndef PULLDOWN_TEST - IP6_EXTHDR_CHECK(m, off, sizeof(*mldh),); - mldh = (struct mld6_hdr *)(mtod(m, caddr_t) + off); -#else - IP6_EXTHDR_GET(mldh, struct mld6_hdr *, m, off, sizeof(*mldh)); + IP6_EXTHDR_GET(mldh, struct mld_hdr *, m, off, sizeof(*mldh)); if (mldh == NULL) { icmp6stat.icp6s_tooshort++; return; } -#endif /* source address validation */ ip6 = mtod(m, struct ip6_hdr *);/* in case mpullup */ if (!IN6_IS_ADDR_LINKLOCAL(&ip6->ip6_src)) { #if 0 log(LOG_ERR, - "mld6_input: src %s is not link-local (grp=%s)\n", + "mld_input: src %s is not link-local (grp=%s)\n", ip6_sprintf(&ip6->ip6_src), - ip6_sprintf(&mldh->mld6_addr)); + ip6_sprintf(&mldh->mld_addr)); #endif /* * spec (RFC2710) does not explicitly @@ -231,20 +226,20 @@ mld6_input(m, off) * In Delaying Listener state, our timer is running (in6m->in6m_timer) * In Idle Listener state, our timer is not running (in6m->in6m_timer==0) * - * The flag is in6m->in6m_state, it is set to MLD6_OTHERLISTENER if - * we have heard a report from another member, or MLD6_IREPORTEDLAST + * The flag is in6m->in6m_state, it is set to MLD_OTHERLISTENER if + * we have heard a report from another member, or MLD_IREPORTEDLAST * if we sent the last report. */ - switch (mldh->mld6_type) { - case MLD6_LISTENER_QUERY: + switch (mldh->mld_type) { + case MLD_LISTENER_QUERY: if (ifp->if_flags & IFF_LOOPBACK) break; - if (!IN6_IS_ADDR_UNSPECIFIED(&mldh->mld6_addr) && - !IN6_IS_ADDR_MULTICAST(&mldh->mld6_addr)) + if (!IN6_IS_ADDR_UNSPECIFIED(&mldh->mld_addr) && + !IN6_IS_ADDR_MULTICAST(&mldh->mld_addr)) break; /* print error or log stat? */ - if (IN6_IS_ADDR_MC_LINKLOCAL(&mldh->mld6_addr)) - mldh->mld6_addr.s6_addr16[1] = + if (IN6_IS_ADDR_MC_LINKLOCAL(&mldh->mld_addr)) + mldh->mld_addr.s6_addr16[1] = htons(ifp->if_index); /* XXX */ /* @@ -267,10 +262,10 @@ mld6_input(m, off) * the calculated value equals to zero when Max Response * Delay is positive. */ - timer = ntohs(mldh->mld6_maxdelay)*PR_FASTHZ/MLD6_TIMER_SCALE; - if (timer == 0 && mldh->mld6_maxdelay) + timer = ntohs(mldh->mld_maxdelay)*PR_FASTHZ/MLD_TIMER_SCALE; + if (timer == 0 && mldh->mld_maxdelay) timer = 1; - mld6_all_nodes_linklocal.s6_addr16[1] = + mld_all_nodes_linklocal.s6_addr16[1] = htons(ifp->if_index); /* XXX */ for (in6m = ia->ia6_multiaddrs.lh_first; @@ -278,35 +273,35 @@ mld6_input(m, off) in6m = in6m->in6m_entry.le_next) { if (IN6_ARE_ADDR_EQUAL(&in6m->in6m_addr, - &mld6_all_nodes_linklocal) || + &mld_all_nodes_linklocal) || IPV6_ADDR_MC_SCOPE(&in6m->in6m_addr) < IPV6_ADDR_SCOPE_LINKLOCAL) continue; - if (IN6_IS_ADDR_UNSPECIFIED(&mldh->mld6_addr) || - IN6_ARE_ADDR_EQUAL(&mldh->mld6_addr, + if (IN6_IS_ADDR_UNSPECIFIED(&mldh->mld_addr) || + IN6_ARE_ADDR_EQUAL(&mldh->mld_addr, &in6m->in6m_addr)) { if (timer == 0) { /* send a report immediately */ - mld6_sendpkt(in6m, MLD6_LISTENER_REPORT, + mld6_sendpkt(in6m, MLD_LISTENER_REPORT, NULL); in6m->in6m_timer = 0; /* reset timer */ - in6m->in6m_state = MLD6_IREPORTEDLAST; + in6m->in6m_state = MLD_IREPORTEDLAST; } else if (in6m->in6m_timer == 0 || /*idle state*/ in6m->in6m_timer > timer) { in6m->in6m_timer = - MLD6_RANDOM_DELAY(timer); - mld6_timers_are_running = 1; + MLD_RANDOM_DELAY(timer); + mld_timers_are_running = 1; } } } - if (IN6_IS_ADDR_MC_LINKLOCAL(&mldh->mld6_addr)) - mldh->mld6_addr.s6_addr16[1] = 0; /* XXX */ + if (IN6_IS_ADDR_MC_LINKLOCAL(&mldh->mld_addr)) + mldh->mld_addr.s6_addr16[1] = 0; /* XXX */ break; - case MLD6_LISTENER_REPORT: + case MLD_LISTENER_REPORT: /* * For fast leave to work, we have to know that we are the * last person to send a report for this group. Reports @@ -319,24 +314,24 @@ mld6_input(m, off) if (m->m_flags & M_LOOP) /* XXX: grotty flag, but efficient */ break; - if (!IN6_IS_ADDR_MULTICAST(&mldh->mld6_addr)) + if (!IN6_IS_ADDR_MULTICAST(&mldh->mld_addr)) break; - if (IN6_IS_ADDR_MC_LINKLOCAL(&mldh->mld6_addr)) - mldh->mld6_addr.s6_addr16[1] = + if (IN6_IS_ADDR_MC_LINKLOCAL(&mldh->mld_addr)) + mldh->mld_addr.s6_addr16[1] = htons(ifp->if_index); /* XXX */ /* * If we belong to the group being reported, stop * our timer for that group. */ - IN6_LOOKUP_MULTI(mldh->mld6_addr, ifp, in6m); + IN6_LOOKUP_MULTI(mldh->mld_addr, ifp, in6m); if (in6m) { in6m->in6m_timer = 0; /* transit to idle state */ - in6m->in6m_state = MLD6_OTHERLISTENER; /* clear flag */ + in6m->in6m_state = MLD_OTHERLISTENER; /* clear flag */ } - if (IN6_IS_ADDR_MC_LINKLOCAL(&mldh->mld6_addr)) - mldh->mld6_addr.s6_addr16[1] = 0; /* XXX */ + if (IN6_IS_ADDR_MC_LINKLOCAL(&mldh->mld_addr)) + mldh->mld_addr.s6_addr16[1] = 0; /* XXX */ break; default: /* this is impossible */ #if 0 @@ -345,7 +340,7 @@ mld6_input(m, off) * icmp6_input(). But we explicitly disabled this part * just in case. */ - log(LOG_ERR, "mld6_input: illegal type(%d)", mldh->mld6_type); + log(LOG_ERR, "mld_input: illegal type(%d)", mldh->mld6_type); #endif break; } @@ -363,20 +358,20 @@ mld6_fasttimeo() * Quick check to see if any work needs to be done, in order * to minimize the overhead of fasttimo processing. */ - if (!mld6_timers_are_running) + if (!mld_timers_are_running) return; s = splsoftnet(); - mld6_timers_are_running = 0; + mld_timers_are_running = 0; IN6_FIRST_MULTI(step, in6m); while (in6m != NULL) { if (in6m->in6m_timer == 0) { /* do nothing */ } else if (--in6m->in6m_timer == 0) { - mld6_sendpkt(in6m, MLD6_LISTENER_REPORT, NULL); - in6m->in6m_state = MLD6_IREPORTEDLAST; + mld6_sendpkt(in6m, MLD_LISTENER_REPORT, NULL); + in6m->in6m_state = MLD_IREPORTEDLAST; } else { - mld6_timers_are_running = 1; + mld_timers_are_running = 1; } IN6_NEXT_MULTI(step, in6m); } @@ -390,7 +385,7 @@ mld6_sendpkt(in6m, type, dst) const struct in6_addr *dst; { struct mbuf *mh, *md; - struct mld6_hdr *mldh; + struct mld_hdr *mldh; struct ip6_hdr *ip6; struct ip6_moptions im6o; struct in6_ifaddr *ia; @@ -425,7 +420,7 @@ mld6_sendpkt(in6m, type, dst) mh->m_next = md; mh->m_pkthdr.rcvif = NULL; - mh->m_pkthdr.len = sizeof(struct ip6_hdr) + sizeof(struct mld6_hdr); + mh->m_pkthdr.len = sizeof(struct ip6_hdr) + sizeof(struct mld_hdr); mh->m_len = sizeof(struct ip6_hdr); MH_ALIGN(mh, sizeof(struct ip6_hdr)); @@ -441,20 +436,19 @@ mld6_sendpkt(in6m, type, dst) ip6->ip6_dst = dst ? *dst : in6m->in6m_addr; /* fill in the MLD header */ - md->m_len = sizeof(struct mld6_hdr); - mldh = mtod(md, struct mld6_hdr *); - mldh->mld6_type = type; - mldh->mld6_code = 0; - mldh->mld6_cksum = 0; + md->m_len = sizeof(struct mld_hdr); + mldh = mtod(md, struct mld_hdr *); + mldh->mld_type = type; + mldh->mld_code = 0; + mldh->mld_cksum = 0; /* XXX: we assume the function will not be called for query messages */ - mldh->mld6_maxdelay = 0; - mldh->mld6_reserved = 0; - mldh->mld6_addr = in6m->in6m_addr; - if (IN6_IS_ADDR_MC_LINKLOCAL(&mldh->mld6_addr)) - mldh->mld6_addr.s6_addr16[1] = 0; /* XXX */ - mldh->mld6_cksum = in6_cksum(mh, IPPROTO_ICMPV6, - sizeof(struct ip6_hdr), - sizeof(struct mld6_hdr)); + mldh->mld_maxdelay = 0; + mldh->mld_reserved = 0; + mldh->mld_addr = in6m->in6m_addr; + if (IN6_IS_ADDR_MC_LINKLOCAL(&mldh->mld_addr)) + mldh->mld_addr.s6_addr16[1] = 0; /* XXX */ + mldh->mld_cksum = in6_cksum(mh, IPPROTO_ICMPV6, sizeof(struct ip6_hdr), + sizeof(struct mld_hdr)); /* construct multicast option */ bzero(&im6o, sizeof(im6o)); @@ -471,13 +465,13 @@ mld6_sendpkt(in6m, type, dst) icmp6stat.icp6s_outhist[type]++; icmp6_ifstat_inc(ifp, ifs6_out_msg); switch (type) { - case MLD6_LISTENER_QUERY: + case MLD_LISTENER_QUERY: icmp6_ifstat_inc(ifp, ifs6_out_mldquery); break; - case MLD6_LISTENER_REPORT: + case MLD_LISTENER_REPORT: icmp6_ifstat_inc(ifp, ifs6_out_mldreport); break; - case MLD6_LISTENER_DONE: + case MLD_LISTENER_DONE: icmp6_ifstat_inc(ifp, ifs6_out_mlddone); break; }