On Wed, Mar 15, 2017 at 08:50:51PM +0100, Phil Sutter wrote:
> On Wed, Mar 15, 2017 at 05:15:14PM +0100, Pablo Neira Ayuso wrote:
> > On Wed, Mar 15, 2017 at 04:55:01PM +0100, Phil Sutter wrote:
> > > This adds support for matching on inverse ND messages as defined by
> > > RFC3122 (not implemented in Linux) and MLDv2 as defined by RFC3810.
> > >
> > > Note that ICMPV6_MLD2_REPORT macro is defined in linux/icmpv6.h but
> > > including that header leads to conflicts with symbols defined in
> > > netinet/icmp6.h.
> > >
> > > In addition to the above, "mld-listener-done" is introduced as an alias
> > > for "mld-listener-reduction".
> > >
> > > Signed-off-by: Phil Sutter <phil@xxxxxx>
> > > ---
> > > This should resolve netfilter BZ#926.
> > > ---
> > > src/proto.c | 8 ++++++++
> > > 1 file changed, 8 insertions(+)
> > >
> > > diff --git a/src/proto.c b/src/proto.c
> > > index fb965304e59d9..6a8eed936d858 100644
> > > --- a/src/proto.c
> > > +++ b/src/proto.c
> > > @@ -632,6 +632,10 @@ const struct proto_desc proto_ip = {
> > >
> > > #include <netinet/icmp6.h>
> > >
> > > +#define IND_NEIGHBOR_SOLICIT 141
> > > +#define IND_NEIGHBOR_ADVERT 142
> > > +#define ICMPV6_MLD2_REPORT 143
> > > +
> > > static const struct symbol_table icmp6_type_tbl = {
> > > .base = BASE_DECIMAL,
> > > .symbols = {
> > > @@ -644,12 +648,16 @@ static const struct symbol_table icmp6_type_tbl = {
> > > SYMBOL("mld-listener-query", MLD_LISTENER_QUERY),
> > > SYMBOL("mld-listener-report", MLD_LISTENER_REPORT),
> > > SYMBOL("mld-listener-reduction", MLD_LISTENER_REDUCTION),
> > > + SYMBOL("mld-listener-done", MLD_LISTENER_REDUCTION),
> >
> > This one is duplicated, right?
>
> Yes, it is the alias which was suggested in the ticket. Is this OK, or
> should we rather respond with WONTFIX?
Just add this before "mld-listener-reduction" so we use
"mld-listener-done" when printing this back to userspace. So we
prioritize the more appropriate syntax.
> I realize this patch lacks an update to man page and a few test cases.
> Should I reroll or send a follow-up?
Please do, thank you!
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
