netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Josh Hunt <johunt@akamai.com>
To: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Cc: "netfilter-devel@vger.kernel.org" <netfilter-devel@vger.kernel.org>
Subject: Re: [PATCH v2 2/2] ipset: add userspace support for forceadd
Date: Fri, 28 Feb 2014 15:52:39 -0600	[thread overview]
Message-ID: <53110527.8090509@akamai.com> (raw)
In-Reply-To: <alpine.DEB.2.10.1402282233120.5894@blackhole.kfki.hu>

On 02/28/2014 03:46 PM, Jozsef Kadlecsik wrote:
> On Thu, 27 Feb 2014, Josh Hunt wrote:
>
>> The userspace side of the forceadd changes.
>>
>> Signed-off-by: Josh Hunt <johunt@akamai.com>
>> ---
>>   Make_global.am              |    2 +-
>>   include/libipset/data.h     |    4 +-
>>   lib/data.c                  |    6 ++
>>   lib/ipset_hash_ip.c         |  123 +++++++++++++++++++++++++++++++
>>   lib/ipset_hash_ipmark.c     |  142 ++++++++++++++++++++++++++++++++++++
>>   lib/ipset_hash_ipport.c     |  147 +++++++++++++++++++++++++++++++++++++
>>   lib/ipset_hash_ipportip.c   |  158 ++++++++++++++++++++++++++++++++++++++++
>>   lib/ipset_hash_ipportnet.c  |  169 +++++++++++++++++++++++++++++++++++++++++++
>>   lib/ipset_hash_net.c        |  119 ++++++++++++++++++++++++++++++
>>   lib/ipset_hash_netiface.c   |  125 ++++++++++++++++++++++++++++++++
>>   lib/ipset_hash_netnet.c     |  125 ++++++++++++++++++++++++++++++++
>>   lib/ipset_hash_netport.c    |  132 +++++++++++++++++++++++++++++++++
>>   lib/ipset_hash_netportnet.c |  149 ++++++++++++++++++++++++++++++++++++++
>>   src/ipset.8                 |    7 ++
>>   14 files changed, 1406 insertions(+), 2 deletions(-)
>
> I don't see include/libipset/linux_ip_set.h refreshed, so
> please run "make update_includes".

Ahh I willdo. I misunderstood here. I was doing that locally.

>
>> diff --git a/Make_global.am b/Make_global.am
>> index f931618..1151714 100644
>> --- a/Make_global.am
>> +++ b/Make_global.am
>> @@ -69,7 +69,7 @@
>>   # interface.
>>
>>   #            curr:rev:age
>> -LIBVERSION = 5:0:3
>> +LIBVERSION = 6:0:1
>
> As Pablo pointed out, it should be "6:0:4".
>

Yep willdo.

>>   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 3a26b1e..06ece1e 100644
>> --- a/include/libipset/data.h
>> +++ b/include/libipset/data.h
>> @@ -36,6 +36,7 @@ enum ipset_opt {
>>   	IPSET_OPT_PROBES,
>>   	IPSET_OPT_RESIZE,
>>   	IPSET_OPT_SIZE,
>> +	IPSET_OPT_FORCEADD,
>>   	/* Create-specific options, filled out by the kernel */
>>   	IPSET_OPT_ELEMENTS,
>>   	IPSET_OPT_REFERENCES,
>> @@ -94,7 +95,8 @@ enum ipset_opt {
>>   	| IPSET_FLAG(IPSET_OPT_RESIZE)	\
>>   	| IPSET_FLAG(IPSET_OPT_SIZE)	\
>>   	| IPSET_FLAG(IPSET_OPT_COUNTERS)\
>> -	| IPSET_FLAG(IPSET_OPT_CREATE_COMMENT))
>> +	| IPSET_FLAG(IPSET_OPT_CREATE_COMMENT)\
>> +	| IPSET_FLAG(IPSET_OPT_FORCEADD))
>>
>>   #define IPSET_ADT_FLAGS			\
>>   	(IPSET_FLAG(IPSET_OPT_IP)	\
>> diff --git a/lib/data.c b/lib/data.c
>> index 48ec98a..9ff8e42 100644
>> --- a/lib/data.c
>> +++ b/lib/data.c
>> @@ -309,6 +309,10 @@ ipset_data_set(struct ipset_data *data, enum ipset_opt opt, const void *value)
>>   	case IPSET_OPT_CREATE_COMMENT:
>>   		cadt_flag_type_attr(data, opt, IPSET_FLAG_WITH_COMMENT);
>>   		break;
>> +        case IPSET_OPT_FORCEADD:
>> +		cadt_flag_type_attr(data, opt, IPSET_FLAG_WITH_FORCEADD);
>> +		break;
>> +
>
> It looks like the extra leading whitespaces slipped in here too.
>

Doh. Ok will take care of this and your comments in patch 1 and send a 
v3 later this evening.

Thanks
Josh


  reply	other threads:[~2014-02-28 21:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-27 23:04 [PATCH v2 0/2] ipset: forceadd support Josh Hunt
2014-02-27 23:04 ` [PATCH v2 1/2] ipset: add forceadd kernel support for hash set types Josh Hunt
2014-02-28 21:29   ` Jozsef Kadlecsik
2014-02-27 23:04 ` [PATCH v2 2/2] ipset: add userspace support for forceadd Josh Hunt
2014-02-28  9:25   ` Pablo Neira Ayuso
2014-02-28 21:46   ` Jozsef Kadlecsik
2014-02-28 21:52     ` Josh Hunt [this message]
2014-02-28  3:41 ` [PATCH v2 0/2] ipset: forceadd support Phil Oester
2014-02-28 14:26   ` Josh Hunt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53110527.8090509@akamai.com \
    --to=johunt@akamai.com \
    --cc=kadlec@blackhole.kfki.hu \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).