[PATCH] netfilter: fix indent on in statements

2017-08-15 Thread Colin King
From: Colin Ian King The returns on some if statements are not indented correctly, add in the missing tab. Signed-off-by: Colin Ian King --- net/bridge/netfilter/ebt_ip.c | 4 ++-- net/bridge/netfilter/ebt_ip6.c | 2 +- 2 files changed, 3

Re: [PATCH] netfilter: fix indent on in statements

2017-08-15 Thread walter harms
Am 15.08.2017 08:50, schrieb Colin King: > From: Colin Ian King > > The returns on some if statements are not indented correctly, > add in the missing tab. > > Signed-off-by: Colin Ian King > --- > net/bridge/netfilter/ebt_ip.c | 4 ++-- >

Re: [PATCH] netfilter: fix indent on in statements

2017-08-15 Thread Colin Ian King
On 15/08/17 10:45, Sergei Shtylyov wrote: > Hello! > > On 8/15/2017 9:50 AM, Colin King wrote: > >> From: Colin Ian King >> >> The returns on some if statements are not indented correctly, > >s/in/if/ in the subject? Doh, fix resent. > >> add in the missing

Re: [PATCH] netfilter: fix indent on in statements

2017-08-15 Thread Sergei Shtylyov
Hello! On 8/15/2017 9:50 AM, Colin King wrote: From: Colin Ian King The returns on some if statements are not indented correctly, s/in/if/ in the subject? add in the missing tab. Signed-off-by: Colin Ian King [...] MBR, Sergei --

[PATCH nft] src: make netlink sequence number non-static

2017-08-15 Thread Pablo Neira Ayuso
Place sequence number that is allocated per-command on the struct netlink_ctx structure. This is allocated from nft_run() to correlate commands with netlink messages for error reporting. Batch support probing also shares this sequence numbers with commands. There is an inpendent cache sequence

Re: [nft PATCH 1/4] mnl: Drop --echo support for non-batch calls

2017-08-15 Thread Pablo Neira Ayuso
On Tue, Aug 15, 2017 at 01:43:02AM +0200, Phil Sutter wrote: > Echo support in nft_mnl_talk() was broken: nft_mnl_talk_cb() passed > cbdata->data as second parameter to netlink_echo_callback() which > expected it to be of type struct netlink_ctx while in fact it was > whatever callers of

Re: [nft PATCH 2/4] netlink: Fix segfault when using --echo flag

2017-08-15 Thread Pablo Neira Ayuso
On Tue, Aug 15, 2017 at 01:43:03AM +0200, Phil Sutter wrote: > Commit 07b45939972eb ("src: introduce struct nft_cache") added cache > pointer to struct netlink_mon_handler and the code assumes it is never > NULL. Therefore initialize it in the dummy version of > netlink_mon_handler in

Re: [nft PATCH 3/4] echo: Fix for added delays in rule updates

2017-08-15 Thread Pablo Neira Ayuso
On Tue, Aug 15, 2017 at 01:43:04AM +0200, Phil Sutter wrote: > The added cache update upon every command dealing with rules was a > bummer. Instead, perform the needed cache update only if echo option was > set. > > Initially, I tried to perform the cache update from within >

Re: [nft PATCH 4/4] tests: Merge monitor and echo test suites

2017-08-15 Thread Pablo Neira Ayuso
On Tue, Aug 15, 2017 at 01:43:05AM +0200, Phil Sutter wrote: > The two test suites were pretty similar already, and since echo output > is supposed to be identical to monitor output apart from delete > commands, they can be merged together with litte effort. Applied, thanks Phil. -- To

Re: [nft PATCH 1/4] mnl: Drop --echo support for non-batch calls

2017-08-15 Thread Phil Sutter
Hi, On Tue, Aug 15, 2017 at 12:25:00PM +0200, Pablo Neira Ayuso wrote: > On Tue, Aug 15, 2017 at 01:43:02AM +0200, Phil Sutter wrote: [...] > > I didn't notice this because I didn't test for kernels without support > > for transactions. This has been added to nftables in kernel version 3.16 > >

Re: [nft PATCH 3/4] echo: Fix for added delays in rule updates

2017-08-15 Thread Phil Sutter
On Tue, Aug 15, 2017 at 01:27:56PM +0200, Phil Sutter wrote: > On Tue, Aug 15, 2017 at 12:35:30PM +0200, Pablo Neira Ayuso wrote: > > On Tue, Aug 15, 2017 at 01:43:04AM +0200, Phil Sutter wrote: > [...] > > > diff --git a/include/netlink.h b/include/netlink.h > > > index

Re: [nft PATCH 1/4] mnl: Drop --echo support for non-batch calls

2017-08-15 Thread Pablo Neira Ayuso
On Tue, Aug 15, 2017 at 01:05:04PM +0200, Phil Sutter wrote: > Hi, > > On Tue, Aug 15, 2017 at 12:25:00PM +0200, Pablo Neira Ayuso wrote: > > On Tue, Aug 15, 2017 at 01:43:02AM +0200, Phil Sutter wrote: > [...] > > > I didn't notice this because I didn't test for kernels without support > > > for

Re: [nft PATCH 3/4] echo: Fix for added delays in rule updates

2017-08-15 Thread Pablo Neira Ayuso
On Tue, Aug 15, 2017 at 01:34:25PM +0200, Phil Sutter wrote: > On Tue, Aug 15, 2017 at 01:27:56PM +0200, Phil Sutter wrote: > > On Tue, Aug 15, 2017 at 12:35:30PM +0200, Pablo Neira Ayuso wrote: > > > On Tue, Aug 15, 2017 at 01:43:04AM +0200, Phil Sutter wrote: > > [...] > > > > diff --git

[nft PATCH v2] echo: Fix for added delays in rule updates

2017-08-15 Thread Phil Sutter
The added cache update upon every command dealing with rules was a bummer. Instead, perform the needed cache update only if echo option was set. Initially, I tried to perform the cache update from within netlink_echo_callback(), but that turned into a mess since the shared socket between

Re: [nft PATCH v2] echo: Fix for added delays in rule updates

2017-08-15 Thread Pablo Neira Ayuso
On Tue, Aug 15, 2017 at 01:59:12PM +0200, Phil Sutter wrote: > The added cache update upon every command dealing with rules was a > bummer. Instead, perform the needed cache update only if echo option was > set. > > Initially, I tried to perform the cache update from within >

Re: [nft PATCH 3/4] echo: Fix for added delays in rule updates

2017-08-15 Thread Phil Sutter
Hi, On Tue, Aug 15, 2017 at 12:35:30PM +0200, Pablo Neira Ayuso wrote: > On Tue, Aug 15, 2017 at 01:43:04AM +0200, Phil Sutter wrote: [...] > > diff --git a/include/netlink.h b/include/netlink.h > > index 3726171424c33..e7e4bbcfc0f51 100644 > > --- a/include/netlink.h > > +++ b/include/netlink.h

[conntrack-tools PATCH] tests: don't fail on modprobe since the driver might be built-in

2017-08-15 Thread Arturo Borrero Gonzalez
From: Steve Langasek Any of these nf drivers could be built-ins instead of modules; don't cause the testsuite to fail on modprobe, instead let it proceed and succeed/fail later based on actual test results. Ideally we would check up front if the driver is loaded