diff options
| author | ume <ume@FreeBSD.org> | 2002-05-06 16:28:25 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2002-05-06 16:28:25 +0000 |
| commit | 0dc033806b6e467440aa8004facf38c61c83e617 (patch) | |
| tree | ef83cfffd0177cf608e0acf729fd8aab5f3e1979 /sys/netinet6/icmp6.c | |
| parent | a65193d5b159668ce23ff42d7b44cae3b1c06bd6 (diff) | |
| download | FreeBSD-src-0dc033806b6e467440aa8004facf38c61c83e617.zip FreeBSD-src-0dc033806b6e467440aa8004facf38c61c83e617.tar.gz | |
Revised MLD-related definitions
- Used mld_xxx and MLD_xxx instead of mld6_xxx and MLD6_xxx according
to the official defintions in rfc2292bis
(macro definitions for backward compatibility were provided)
- Changed the first member of mld_hdr{} from mld_hdr to mld_icmp6_hdr
to avoid name space conflict in C++
This change makes ports/net/pchar compilable again under -CURRENT.
Obtained from: KAME
Diffstat (limited to 'sys/netinet6/icmp6.c')
| -rw-r--r-- | sys/netinet6/icmp6.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 65e1c89..38332b2 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -606,11 +606,11 @@ icmp6_input(mp, offp, proto) goto badcode; break; - case MLD6_LISTENER_QUERY: - case MLD6_LISTENER_REPORT: - if (icmp6len < sizeof(struct mld6_hdr)) + case MLD_LISTENER_QUERY: + case MLD_LISTENER_REPORT: + if (icmp6len < sizeof(struct mld_hdr)) goto badlen; - if (icmp6->icmp6_type == MLD6_LISTENER_QUERY) /* XXX: ugly... */ + if (icmp6->icmp6_type == MLD_LISTENER_QUERY) /* XXX: ugly... */ icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_mldquery); else icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_mldreport); @@ -624,14 +624,14 @@ icmp6_input(mp, offp, proto) /* m stays. */ break; - case MLD6_LISTENER_DONE: + case MLD_LISTENER_DONE: icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_mlddone); - if (icmp6len < sizeof(struct mld6_hdr)) /* necessary? */ + if (icmp6len < sizeof(struct mld_hdr)) /* necessary? */ goto badlen; break; /* nothing to be done in kernel */ - case MLD6_MTRACE_RESP: - case MLD6_MTRACE: + case MLD_MTRACE_RESP: + case MLD_MTRACE: /* XXX: these two are experimental. not officially defind. */ /* XXX: per-interface statistics? */ break; /* just pass it to applications */ |
