On Wed, 18 Sep 2013, Jozsef Kadlecsik wrote:
> On Tue, 17 Sep 2013, Oliver wrote:
>
> > From: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> >
> > This adds support to the userspace portion of ipset for handling ipsets
> > with the comment extension enabled. The library revision has been raised
> > accordingly.
> >
> > Signed-off-by: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> > ---
> > Make_global.am | 2 +-
> > include/libipset/data.h | 6 +++++-
> > include/libipset/linux_ip_set.h | 7 +++++++
> > include/libipset/parse.h | 2 ++
> > include/libipset/print.h | 3 +++
> > lib/data.c | 34 ++++++++++++++++++++++++++++++++++
> > lib/debug.c | 1 +
> > lib/errcode.c | 2 ++
> > lib/libipset.map | 6 ++++++
> > lib/parse.c | 27 +++++++++++++++++++++++++++
> > lib/print.c | 31 +++++++++++++++++++++++++++++++
> > lib/session.c | 8 +++++++-
> > lib/types.c | 4 ++--
> > 13 files changed, 128 insertions(+), 5 deletions(-)
> >
> > diff --git a/Make_global.am b/Make_global.am
> > index 29b5678..9c228cc 100644
> > --- a/Make_global.am
> > +++ b/Make_global.am
> > @@ -69,7 +69,7 @@
> > # interface.
> >
> > # curr:rev:age
> > -LIBVERSION = 4:0:1
> > +LIBVERSION = 4:1:2
> >
> > AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include \
> > -I/usr/local/include
> > diff --git a/include/libipset/data.h b/include/libipset/data.h
> > index 2b6b8cd..ae0d099 100644
> > --- a/include/libipset/data.h
> > +++ b/include/libipset/data.h
> > @@ -57,6 +57,8 @@ enum ipset_opt {
> > IPSET_OPT_COUNTERS,
> > IPSET_OPT_PACKETS,
> > IPSET_OPT_BYTES,
> > + IPSET_OPT_COMMENTS,
> > + IPSET_OPT_COMMENT,
>
> Both cases are here, and then used mixed below. Stick to "COMMENT"
> everywhere.
Ohh, I got it: the first is for the create option and the second is for
the attribute.
This is highly error prone. Please rename the first one to
IPSET_OPT_CREATE_COMMENT, or the second one to IPSET_OPT_ADT_COMMENT,
whichever you prefer.
Best regards,
Jozsef
-
E-mail : kadlec@xxxxxxxxxxxxxxxxx, kadlecsik.jozsef@xxxxxxxxxxxxx
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
H-1525 Budapest 114, POB. 49, Hungary
--
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
