[PATCH nf-next] netfilter: move zone info into struct nf_conn

2016-06-11 Thread Florian Westphal
Curently we store zone information as a conntrack extension. This has one drawback: for every lookup we need to fetch the zone data from the extension area. This change place the zone data directly into the main conntrack object structure and then removes the zone conntrack extension. The zone

[PATCH nf-next] netfilter: nf_log: Remove NULL check

2016-06-11 Thread Shivani Bhardwaj
If 'logger' was NULL, there would be a direct jump to the label 'out', since it has already been checked for NULL, remove this unnecessary check. Signed-off-by: Shivani Bhardwaj --- net/netfilter/nf_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH 1/3] bridge: netfilter: checkpatch whitespace fixes

2016-06-11 Thread Tobin Harding
On Thu, Jun 09, 2016 at 11:00:18AM -0700, Joe Perches wrote: > On Wed, 2016-06-08 at 19:38 +0200, Pablo Neira Ayuso wrote: > > On Wed, Jun 08, 2016 at 07:31:21PM +0200, Pablo Neira Ayuso wrote: > > looks easier to readable than original Tobin's, so I'll wait for you > > to resubmit. > > Well,

[nft PATCH] tests/shell: cleanup tempfile handling in testcases/sets/cache_handling_0

2016-06-11 Thread Arturo Borrero Gonzalez
It uses a bogus pattern which was cleaned up already in others testscases, and this is a leftover. Signed-off-by: Arturo Borrero Gonzalez --- tests/shell/testcases/sets/cache_handling_0 |8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git

[nft PATCH] tests/shell: delete unused variable in run-tests.sh

2016-06-11 Thread Arturo Borrero Gonzalez
This ${TESTS_OUTPUT} variable is empty. Delete it. It was probably an idea about dinamically redirecting testscases output. Signed-off-by: Arturo Borrero Gonzalez --- tests/shell/run-tests.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH nft] tests: shell: make testcases which using tcp/udp port more rubost

2016-06-11 Thread Arturo Borrero Gonzalez
On 11 June 2016 at 07:05, Liping Zhang wrote: > From: Liping Zhang > > In my mechain, port 12345 is mapped to italk in /etc/services: > italk 12345/tcp # Italk Chat System > > So when we add nft rule with udp port "12345",