diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/netlink.c | 22 | ||||
| -rw-r--r-- | src/parser.y | 30 | ||||
| -rw-r--r-- | src/rule.c | 2 | ||||
| -rw-r--r-- | src/scanner.l | 1 |
4 files changed, 50 insertions, 5 deletions
diff --git a/src/netlink.c b/src/netlink.c index 102f799a..7d3e71ff 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -1444,6 +1444,28 @@ int netlink_batch_send(struct list_head *err_list) return mnl_batch_talk(nf_sock, err_list); } +int netlink_flush_ruleset(struct netlink_ctx *ctx, const struct handle *h, + const struct location *loc) +{ + int err; + struct nft_table *nlt; + + if (!ctx->batch_supported) { + netlink_io_error(ctx, loc, "Operation not supported."); + return -1; + } + + nlt = alloc_nft_table(h); + err = mnl_nft_table_batch_del(nf_sock, nlt, 0, ctx->seqnum); + nft_table_free(nlt); + + if (err < 0) + netlink_io_error(ctx, loc, "Could not flush the ruleset: %s", + strerror(errno)); + + return err; +} + struct nft_ruleset *netlink_dump_ruleset(struct netlink_ctx *ctx, const struct handle *h, const struct location *loc) diff --git a/src/parser.y b/src/parser.y index a4ccf732..aa40f905 100644 --- a/src/parser.y +++ b/src/parser.y @@ -187,6 +187,7 @@ static int monitor_lookup_event(const char *event) %token ELEMENT "element" %token MAP "map" %token HANDLE "handle" +%token RULESET "ruleset" %token INET "inet" @@ -397,11 +398,11 @@ static int monitor_lookup_event(const char *event) %type <cmd> base_cmd add_cmd create_cmd insert_cmd delete_cmd list_cmd flush_cmd rename_cmd export_cmd monitor_cmd %destructor { cmd_free($$); } base_cmd add_cmd create_cmd insert_cmd delete_cmd list_cmd flush_cmd rename_cmd export_cmd monitor_cmd -%type <handle> table_spec tables_spec chain_spec chain_identifier ruleid_spec -%destructor { handle_free(&$$); } table_spec tables_spec chain_spec chain_identifier ruleid_spec +%type <handle> table_spec tables_spec chain_spec chain_identifier ruleid_spec ruleset_spec +%destructor { handle_free(&$$); } table_spec tables_spec chain_spec chain_identifier ruleid_spec ruleset_spec %type <handle> set_spec set_identifier %destructor { handle_free(&$$); } set_spec set_identifier -%type <val> handle_spec family_spec position_spec +%type <val> handle_spec family_spec family_spec_explicit position_spec %type <table> table_block_alloc table_block %destructor { close_scope(state); table_free($$); } table_block_alloc @@ -775,6 +776,10 @@ flush_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_FLUSH, CMD_OBJ_SET, &$2, &@$, NULL); } + | RULESET ruleset_spec + { + $$ = cmd_alloc(CMD_FLUSH, CMD_OBJ_RULESET, &$2, &@$, NULL); + } ; rename_cmd : CHAIN chain_spec identifier @@ -1164,8 +1169,11 @@ string : STRING | QUOTED_STRING ; -family_spec : /* empty */ { $$ = NFPROTO_IPV4; } - | IP { $$ = NFPROTO_IPV4; } +family_spec : /* empty */ { $$ = NFPROTO_IPV4; } + | family_spec_explicit + ; + +family_spec_explicit : IP { $$ = NFPROTO_IPV4; } | IP6 { $$ = NFPROTO_IPV6; } | INET { $$ = NFPROTO_INET; } | ARP { $$ = NFPROTO_ARP; } @@ -1254,6 +1262,18 @@ comment_spec : /* empty */ } ; +ruleset_spec : /* empty */ + { + memset(&$$, 0, sizeof($$)); + $$.family = NFPROTO_UNSPEC; + } + | family_spec_explicit + { + memset(&$$, 0, sizeof($$)); + $$.family = $1; + } + ; + rule : stmt_list comment_spec { struct stmt *i; @@ -820,6 +820,8 @@ static int do_command_flush(struct netlink_ctx *ctx, struct cmd *cmd) return netlink_flush_table(ctx, &cmd->handle, &cmd->location); case CMD_OBJ_CHAIN: return netlink_flush_chain(ctx, &cmd->handle, &cmd->location); + case CMD_OBJ_RULESET: + return netlink_flush_ruleset(ctx, &cmd->handle, &cmd->location); default: BUG("invalid command object type %u\n", cmd->obj); } diff --git a/src/scanner.l b/src/scanner.l index 929dbf6e..601ea3c1 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -240,6 +240,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "element" { return ELEMENT; } "map" { return MAP; } "handle" { return HANDLE; } +"ruleset" { return RULESET; } "accept" { return ACCEPT; } "drop" { return DROP; } |