[patch 2/4] Add support for --set-counters to iptables -P

[patch 2/4] Add support for --set-counters to iptables -P

[Henrik Nordstrom]

[-- Attachment #1: Type: text/plain, Size: 97 bytes --]

Adds support for setting the policy counters

iptables -P INPUT -J DROP -c 10 20

Regards
Henrik

[-- Attachment #2: policycounters.patch --]
[-- Type: text/x-patch, Size: 1914 bytes --]

Index: iptables/iptables.c
===================================================================
--- iptables.orig/iptables.c
+++ iptables/iptables.c
@@ -165,7 +165,7 @@ static char commands_v_options[NUMBER_OF
 /*ZERO*/      {'x','x','x','x','x',' ','x','x','x','x','x','x'},
 /*NEW_CHAIN*/ {'x','x','x','x','x',' ','x','x','x','x','x','x'},
 /*DEL_CHAIN*/ {'x','x','x','x','x',' ','x','x','x','x','x','x'},
-/*SET_POLICY*/{'x','x','x','x','x',' ','x','x','x','x','x','x'},
+/*SET_POLICY*/{'x','x','x','x','x',' ','x','x','x','x','x',' '},
 /*RENAME*/    {'x','x','x','x','x',' ','x','x','x','x','x','x'}
 };
 
@@ -1842,7 +1842,7 @@ int do_command(int argc, char *argv[], c
 		ret = iptc_rename_chain(chain, newname,	handle);
 		break;
 	case CMD_SET_POLICY:
-		ret = iptc_set_policy(chain, policy, NULL, handle);
+		ret = iptc_set_policy(chain, policy, options&OPT_COUNTERS ? &fw.counters : NULL, handle);
 		break;
 	default:
 		/* We should never reach this... */
Index: iptables/ip6tables.c
===================================================================
--- iptables.orig/ip6tables.c
+++ iptables/ip6tables.c
@@ -165,7 +165,7 @@ static char commands_v_options[NUMBER_OF
 /*ZERO*/      {'x','x','x','x','x',' ','x','x','x','x','x'},
 /*NEW_CHAIN*/ {'x','x','x','x','x',' ','x','x','x','x','x'},
 /*DEL_CHAIN*/ {'x','x','x','x','x',' ','x','x','x','x','x'},
-/*SET_POLICY*/{'x','x','x','x','x',' ','x','x','x','x','x'},
+/*SET_POLICY*/{'x','x','x','x','x',' ','x','x','x','x',' '},
 /*RENAME*/    {'x','x','x','x','x',' ','x','x','x','x','x'}
 };
 
@@ -1802,7 +1802,7 @@ int do_command6(int argc, char *argv[], 
 		ret = ip6tc_rename_chain(chain, newname,	handle);
 		break;
 	case CMD_SET_POLICY:
-		ret = ip6tc_set_policy(chain, policy, NULL, handle);
+		ret = ip6tc_set_policy(chain, policy, options&OPT_COUNTERS ? &fw.counters : NULL, handle);
 		break;
 	default:
 		/* We should never reach this... */

Re: [patch 2/4] Add support for --set-counters to iptables -P

[Jan Engelhardt]

On Monday 2008-05-12 20:25, Henrik Nordstrom wrote:

>Adds support for setting the policy counters
>
>iptables -P INPUT -J DROP -c 10 20

Could this perhaps be changed so that -c only takes one argument?
Like -c 10,20. This would ease integration with passthrough
argument parsing in 3rd party applications.

Re: [patch 2/4] Add support for --set-counters to iptables -P

[Patrick McHardy]

Henrik Nordstrom wrote:
> Adds support for setting the policy counters
> 
> iptables -P INPUT -J DROP -c 10 20

Applied, thanks.

Re: [patch 2/4] Add support for --set-counters to iptables -P

[Patrick McHardy]

Jan Engelhardt wrote:
> On Monday 2008-05-12 20:25, Henrik Nordstrom wrote:
> 
>> Adds support for setting the policy counters
>>
>> iptables -P INPUT -J DROP -c 10 20
> 
> Could this perhaps be changed so that -c only takes one argument?
> Like -c 10,20. This would ease integration with passthrough
> argument parsing in 3rd party applications.

I already applied it, in case you want to change anything, please
send a patch on top.

Re: [patch 2/4] Add support for --set-counters to iptables -P

[Henrik Nordstrom]

On mån, 2008-05-12 at 20:31 +0200, Jan Engelhardt wrote:
> On Monday 2008-05-12 20:25, Henrik Nordstrom wrote:
> 
> >Adds support for setting the policy counters
> >
> >iptables -P INPUT -J DROP -c 10 20
> 
> Could this perhaps be changed so that -c only takes one argument?
> Like -c 10,20. This would ease integration with passthrough
> argument parsing in 3rd party applications.

That's a different patch. All this patch does is enabling the existing
--set-counters (-c) option to be used with --set-policy (-P).

Regards
Henrik

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch 2/4] Add support for --set-counters to iptables -P

[Henrik Nordstrom]

On mån, 2008-05-12 at 20:40 +0200, Patrick McHardy wrote:

> > Could this perhaps be changed so that -c only takes one argument?
> > Like -c 10,20. This would ease integration with passthrough
> > argument parsing in 3rd party applications.
> 
> I already applied it, in case you want to change anything, please
> send a patch on top.

Done, but it is a separate issue not related to these patches.

Regards
Henrik

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html