xtables: arp: add delete operation
PATCH 1/2 xtables: arp: add delete operation
The following patch permit to delete the rules specifying an entry or a rule number.
Signed-off-by Giuseppe Longo <[email protected]>
--- iptables/xtables-arp.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-)
iptables/xtables-arp.c +28 -5
@@ -911,6 +911,30 @@ replace_entry(const char *chain,return nft_rule_replace (h, chain, table, fw, rulenum, verbose); } +static int +delete_entry (const char *chain, +const char *table, +struct arpt_entry *fw, +unsigned int nsaddrs, +const struct in_addr saddrs[], +unsigned int ndaddrs, +const struct in_addr daddrs[], +bool verbose,struct nft_handle *h) +{ +unsigned int i, j; +int ret =1 ; + +for (i =0 ; i < nsaddrs; i++) { + fw->arp.src.s_addr = saddrs[i].s_addr; +for (j =0 ; j < ndaddrs; j++) { + fw->arp.tgt.s_addr = daddrs[j].s_addr; + ret =nft_rule_delete (h, chain, table, fw, verbose); + } + } + +return ret; +} +int do_commandarp (struct nft_handle *h,int argc,char *argv[],char **table) {struct arpt_entry fw, *e =NULL ;
@@ -1402,13 +1426,12 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table) options&OPT_VERBOSE, true);break ;case CMD_DELETE : -/*ret = delete_entry(chain, e, -nsaddrs, saddrs, ndaddrs, daddrs, -options&OPT_VERBOSE, -handle);*/ + ret =delete_entry (chain, *table, e, + nsaddrs, saddrs, ndaddrs, daddrs, + options&OPT_VERBOSE , h);break ;case CMD_DELETE_NUM : -/*ret = arptc_delete_num_entry(chain, rulenum - 1, handle);*/ + ret =nft_rule_delete_num (h, chain, *table, rulenum -1 , verbose);break ;case CMD_REPLACE : ret = replace_entry(chain, *table, e, rulenum - 1,
Signature · 1 line
1.7.8.6
PATCH 2/2 xtables: arp: zeroing chain counters
This small patch permit to reset the chain counters.
Signed-off-by Giuseppe Longo <[email protected]>
--- iptables/xtables-arp.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
iptables/xtables-arp.c +2 -3
@@ -1462,9 +1462,8 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table) options&OPT_NUMERIC ,/*options&OPT_EXPANDED*/ 0 , options&OPT_LINENUMBERS); -/*if (ret) -ret = zero_entries(chain, -options&OPT_VERBOSE, handle);*/ +if (ret && (command &CMD_ZERO )) + ret =nft_chain_zero_counters (h, chain, *table);break ;case CMD_NEW_CHAIN : ret =nft_chain_user_add (h, chain, *table);
Signature · 1 line
1.7.8.6
Pablo Neira Ayuso
maintainerRe: [iptables-nftables PATCH 2/2] xtables: arp: zeroing chain counters
Quoted 1 line · Giuseppe Longo
This small patch permit to reset the chain counters.
Applied with minor change.
Quoted 10 lines
Signed-off-by Giuseppe Longo <[email protected]>--- iptables/xtables-arp.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)iptables/xtables-arp.c +0
-0
iptables/xtables-arp.c int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table) · line 1465
Quoted 7 lines
iptables/xtables-arp.c +1
-3@@ -1462,9 +1462,8 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table) options&OPT_NUMERIC ,/*options&OPT_EXPANDED*/ 0 , options&OPT_LINENUMBERS); -/*if (ret) -ret = zero_entries(chain, -options&OPT_VERBOSE, handle);*/ +if (ret && (command &CMD_ZERO ))
^---------------------^
that seems redundant, we already checked for this above.
Mangled and applied, thanks.
Quoted 2 lines · Giuseppe Longo
The following patch permit to delete the rules specifying an entry or a rule number.
Applied, thanks.