From ebfd6822498965cdb9961ec1a986f0463de5c9c0 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Tue, 28 Jul 2009 14:17:35 +0200 Subject: add support for new set API and standalone sets Signed-off-by: Patrick McHardy --- src/evaluate.c | 284 ++++++++++++++++++++++++++++++----- src/expression.c | 42 +++++- src/netlink.c | 366 +++++++++++++++++++++++++++++++++++++++++++++- src/netlink_delinearize.c | 97 +++--------- src/netlink_linearize.c | 70 ++------- src/parser.y | 291 +++++++++++++++++++++++------------- src/rule.c | 178 ++++++++++++++++++++-- src/scanner.l | 6 +- 8 files changed, 1041 insertions(+), 293 deletions(-) (limited to 'src') diff --git a/src/evaluate.c b/src/evaluate.c index ed3c688c..f3723779 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -52,6 +52,78 @@ static int __fmtstring(4, 5) stmt_binary_error(struct eval_ctx *ctx, return -1; } +static int __fmtstring(3, 4) set_error(struct eval_ctx *ctx, + const struct set *set, + const char *fmt, ...) +{ + struct error_record *erec; + va_list ap; + + va_start(ap, fmt); + erec = erec_vcreate(EREC_ERROR, &set->location, fmt, ap); + va_end(ap); + erec_queue(erec, ctx->msgs); + return -1; +} + +static struct expr *implicit_set_declaration(struct eval_ctx *ctx, + const struct datatype *keytype, + unsigned int keylen, + struct expr *expr) +{ + struct cmd *cmd; + struct set *set; + + set = set_alloc(&expr->location); + set->flags = SET_F_CONSTANT | SET_F_ANONYMOUS | expr->set_flags; + set->handle.set = xstrdup(set->flags & SET_F_MAP ? "map%d" : "set%d"); + set->keytype = keytype; + set->keylen = keylen; + set->init = expr; + + if (ctx->table != NULL) + list_add_tail(&set->list, &ctx->table->sets); + else { + handle_merge(&set->handle, &ctx->cmd->handle); + cmd = cmd_alloc(CMD_ADD, CMD_OBJ_SET, &set->handle, set); + cmd->location = set->location; + list_add_tail(&cmd->list, &ctx->cmd->list); + } + + return set_ref_expr_alloc(&expr->location, set); +} + +// FIXME +#include +static struct set *get_set(struct eval_ctx *ctx, const struct handle *h, + const char *identifier) +{ + struct netlink_ctx nctx = { + .msgs = ctx->msgs, + }; + struct handle handle; + struct set *set; + int err; + + if (ctx->table != NULL) { + set = set_lookup(ctx->table, identifier); + if (set != NULL) + return set; + } + + init_list_head(&nctx.list); + + memset(&handle, 0, sizeof(handle)); + handle_merge(&handle, h); + handle.set = xstrdup(identifier); + err = netlink_get_set(&nctx, &handle); + handle_free(&handle); + + if (err < 0) + return NULL; + return list_first_entry(&nctx.list, struct set, list); +} + static enum ops byteorder_conversion_op(struct expr *expr, enum byteorder byteorder) { @@ -103,23 +175,32 @@ static int expr_evaluate_symbol(struct eval_ctx *ctx, struct expr **expr) { struct error_record *erec; struct symbol *sym; + struct set *set; struct expr *new; - (*expr)->dtype = ctx->ectx.dtype; - - if ((*expr)->scope != NULL) { + switch ((*expr)->symtype) { + case SYMBOL_VALUE: + (*expr)->dtype = ctx->ectx.dtype; + erec = symbol_parse(*expr, &new); + if (erec != NULL) { + erec_queue(erec, ctx->msgs); + return -1; + } + break; + case SYMBOL_DEFINE: sym = symbol_lookup((*expr)->scope, (*expr)->identifier); if (sym == NULL) return expr_error(ctx, *expr, "undefined identifier '%s'", (*expr)->identifier); new = expr_clone(sym->expr); - } else { - erec = symbol_parse(*expr, &new); - if (erec != NULL) { - erec_queue(erec, ctx->msgs); + break; + case SYMBOL_SET: + set = get_set(ctx, &ctx->cmd->handle, (*expr)->identifier); + if (set == NULL) return -1; - } + new = set_ref_expr_alloc(&(*expr)->location, set); + break; } expr_free(*expr); @@ -548,10 +629,18 @@ static int expr_evaluate_set(struct eval_ctx *ctx, struct expr **expr) list_for_each_entry_safe(i, next, &set->expressions, list) { if (list_member_evaluate(ctx, &i) < 0) return -1; + if (!expr_is_constant(i)) return expr_error(ctx, i, "Set member is not constant"); - if (!expr_is_singleton(i)) - set->flags |= SET_F_INTERVAL; + + if (i->ops->type == EXPR_SET) { + /* Merge recursive set definitions */ + list_splice_tail_init(&i->expressions, &i->list); + list_del(&i->list); + set->set_flags |= i->set_flags; + expr_free(i); + } else if (!expr_is_singleton(i)) + set->set_flags |= SET_F_INTERVAL; } set->dtype = ctx->ectx.dtype; @@ -563,7 +652,7 @@ static int expr_evaluate_set(struct eval_ctx *ctx, struct expr **expr) static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr) { struct expr_ctx ectx = ctx->ectx; - struct expr *map = *expr, *i; + struct expr *map = *expr, *mappings; if (expr_evaluate(ctx, &map->expr) < 0) return -1; @@ -571,39 +660,71 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr) return expr_error(ctx, map->expr, "Map expression can not be constant"); - /* FIXME: segtree needs to know the dimension of the *key*. - * The len should actually be the value of the mapping. */ - map->mappings->dtype = ctx->ectx.dtype; - map->mappings->len = ctx->ectx.len; + mappings = map->mappings; + mappings->set_flags |= SET_F_MAP; - list_for_each_entry(i, &map->mappings->expressions, list) { - expr_set_context(&ctx->ectx, map->expr->dtype, map->expr->len); - if (expr_evaluate(ctx, &i->left) < 0) + switch (map->mappings->ops->type) { + case EXPR_SET: + mappings = implicit_set_declaration(ctx, ctx->ectx.dtype, + ctx->ectx.len, mappings); + mappings->set->datatype = ectx.dtype; + mappings->set->datalen = ectx.len; + + map->mappings = mappings; + + ctx->set = mappings->set; + if (expr_evaluate(ctx, &map->mappings->set->init) < 0) return -1; - if (!expr_is_constant(i->left)) - return expr_error(ctx, i->left, - "Key must be a constant"); - if (!expr_is_singleton(i->left)) - map->mappings->flags |= SET_F_INTERVAL; - - expr_set_context(&ctx->ectx, ectx.dtype, ectx.len); - if (expr_evaluate(ctx, &i->right) < 0) + ctx->set = NULL; + break; + case EXPR_SYMBOL: + if (expr_evaluate(ctx, &map->mappings) < 0) return -1; - if (!expr_is_constant(i->right)) - return expr_error(ctx, i->right, - "Mapping must be a constant"); - if (!expr_is_singleton(i->right)) - return expr_error(ctx, i->right, - "Mapping must be a singleton"); + if (map->mappings->ops->type != EXPR_SET_REF) + return expr_error(ctx, map->mappings, + "Expression is not a map"); + break; + default: + BUG(); } map->dtype = ctx->ectx.dtype; map->flags |= EXPR_F_CONSTANT; /* Data for range lookups needs to be in big endian order */ - if (map->mappings->flags & SET_F_INTERVAL && + if (map->mappings->set_flags & SET_F_INTERVAL && byteorder_conversion(ctx, &map->expr, BYTEORDER_BIG_ENDIAN) < 0) return -1; + + return 0; +} + +static int expr_evaluate_mapping(struct eval_ctx *ctx, struct expr **expr) +{ + struct expr *mapping = *expr; + struct set *set = ctx->set; + + if (set == NULL) + return expr_error(ctx, mapping, "mapping outside of map context"); + if (!(set->flags & SET_F_MAP)) + return set_error(ctx, set, "set is not a map"); + + expr_set_context(&ctx->ectx, set->keytype, set->keylen); + if (expr_evaluate(ctx, &mapping->left) < 0) + return -1; + if (!expr_is_constant(mapping->left)) + return expr_error(ctx, mapping->left, "Key must be a constant"); + mapping->flags |= mapping->left->flags & EXPR_F_SINGLETON; + + expr_set_context(&ctx->ectx, set->datatype, set->datalen); + if (expr_evaluate(ctx, &mapping->right) < 0) + return -1; + if (!expr_is_constant(mapping->right)) + return expr_error(ctx, mapping->right, "Value must be a constant"); + if (!expr_is_singleton(mapping->right)) + return expr_error(ctx, mapping->right, "Value must be a singleton"); + + mapping->flags |= EXPR_F_CONSTANT; return 0; } @@ -719,6 +840,7 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr) rel->op = OP_RANGE; break; case EXPR_SET: + case EXPR_SET_REF: rel->op = OP_LOOKUP; break; case EXPR_LIST: @@ -732,10 +854,21 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr) switch (rel->op) { case OP_LOOKUP: + /* A literal set expression implicitly declares the set */ + if (right->ops->type == EXPR_SET) + right = rel->right = + implicit_set_declaration(ctx, left->dtype, left->len, right); + else if (left->dtype != right->dtype) + return expr_binary_error(ctx, right, left, + "datatype mismatch, expected %s, " + "set has type %s", + left->dtype->desc, + right->dtype->desc); + /* Data for range lookups needs to be in big endian order */ - if (right->flags & SET_F_INTERVAL && + if (right->set->flags & SET_F_INTERVAL && byteorder_conversion(ctx, &rel->left, - BYTEORDER_BIG_ENDIAN) < 0) + BYTEORDER_BIG_ENDIAN) < 0) return -1; left = rel->left; break; @@ -839,6 +972,8 @@ static int expr_evaluate(struct eval_ctx *ctx, struct expr **expr) switch ((*expr)->ops->type) { case EXPR_SYMBOL: return expr_evaluate_symbol(ctx, expr); + case EXPR_SET_REF: + return 0; case EXPR_VALUE: return expr_evaluate_value(ctx, expr); case EXPR_VERDICT: @@ -864,6 +999,8 @@ static int expr_evaluate(struct eval_ctx *ctx, struct expr **expr) return expr_evaluate_set(ctx, expr); case EXPR_MAP: return expr_evaluate_map(ctx, expr); + case EXPR_MAPPING: + return expr_evaluate_mapping(ctx, expr); case EXPR_RELATIONAL: return expr_evaluate_relational(ctx, expr); default: @@ -879,6 +1016,7 @@ static int stmt_evaluate_expr(struct eval_ctx *ctx, struct stmt *stmt) static int stmt_evaluate_verdict(struct eval_ctx *ctx, struct stmt *stmt) { + expr_set_context(&ctx->ectx, &verdict_type, 0); if (expr_evaluate(ctx, &stmt->expr) < 0) return -1; @@ -962,6 +1100,52 @@ static int stmt_evaluate(struct eval_ctx *ctx, struct stmt *stmt) } } +static int setelem_evaluate(struct eval_ctx *ctx, struct expr **expr) +{ + struct set *set; + + set = get_set(ctx, &ctx->cmd->handle, ctx->cmd->handle.set); + if (set == NULL) + return -1; + + ctx->set = set; + expr_set_context(&ctx->ectx, set->keytype, set->keylen); + if (expr_evaluate(ctx, expr) < 0) + return -1; + ctx->set = NULL; + return 0; +} + +static int set_evaluate(struct eval_ctx *ctx, struct set *set) +{ + const char *type; + + type = set->flags & SET_F_MAP ? "map" : "set"; + + if (set->keytype == NULL) + return set_error(ctx, set, "%s definition does not specify " + "key data type", type); + + set->keylen = set->keytype->size; + if (set->keylen == 0) + return set_error(ctx, set, "unqualified key data type " + "specified in %s definition", type); + + if (!(set->flags & SET_F_MAP)) + return 0; + + if (set->datatype == NULL) + return set_error(ctx, set, "map definition does not specify " + "mapping data type"); + + set->datalen = set->datatype->size; + if (set->datalen == 0 && set->datatype->type != TYPE_VERDICT) + return set_error(ctx, set, "unqualified mapping data type " + "specified in map definition"); + + return 0; +} + static int rule_evaluate(struct eval_ctx *ctx, struct rule *rule) { struct stmt *stmt, *tstmt = NULL; @@ -999,18 +1183,31 @@ static int chain_evaluate(struct eval_ctx *ctx, struct chain *chain) static int table_evaluate(struct eval_ctx *ctx, struct table *table) { struct chain *chain; + struct set *set; + ctx->table = table; + list_for_each_entry(set, &table->sets, list) { + handle_merge(&set->handle, &table->handle); + if (set_evaluate(ctx, set) < 0) + return -1; + } list_for_each_entry(chain, &table->chains, list) { handle_merge(&chain->handle, &table->handle); if (chain_evaluate(ctx, chain) < 0) return -1; } + ctx->table = NULL; return 0; } static int cmd_evaluate_add(struct eval_ctx *ctx, struct cmd *cmd) { switch (cmd->obj) { + case CMD_OBJ_SETELEM: + return setelem_evaluate(ctx, &cmd->expr); + case CMD_OBJ_SET: + handle_merge(&cmd->set->handle, &cmd->handle); + return set_evaluate(ctx, cmd->set); case CMD_OBJ_RULE: handle_merge(&cmd->rule->handle, &cmd->handle); return rule_evaluate(ctx, cmd->rule); @@ -1027,6 +1224,21 @@ static int cmd_evaluate_add(struct eval_ctx *ctx, struct cmd *cmd) } } +static int cmd_evaluate_delete(struct eval_ctx *ctx, struct cmd *cmd) +{ + switch (cmd->obj) { + case CMD_OBJ_SETELEM: + return setelem_evaluate(ctx, &cmd->expr); + case CMD_OBJ_SET: + case CMD_OBJ_RULE: + case CMD_OBJ_CHAIN: + case CMD_OBJ_TABLE: + return 0; + default: + BUG(); + } +} + static int cmd_evaluate(struct eval_ctx *ctx, struct cmd *cmd) { #if TRACE @@ -1035,10 +1247,12 @@ static int cmd_evaluate(struct eval_ctx *ctx, struct cmd *cmd) erec_print(stdout, erec); printf("\n\n"); #endif + ctx->cmd = cmd; switch (cmd->op) { case CMD_ADD: return cmd_evaluate_add(ctx, cmd); case CMD_DELETE: + return cmd_evaluate_delete(ctx, cmd); case CMD_LIST: case CMD_FLUSH: return 0; diff --git a/src/expression.c b/src/expression.c index d854eb29..dffe7a8b 100644 --- a/src/expression.c +++ b/src/expression.c @@ -188,6 +188,7 @@ static void symbol_expr_print(const struct expr *expr) static void symbol_expr_clone(struct expr *new, const struct expr *expr) { + new->symtype = expr->symtype; new->scope = expr->scope; new->identifier = xstrdup(expr->identifier); } @@ -206,12 +207,15 @@ static const struct expr_ops symbol_expr_ops = { }; struct expr *symbol_expr_alloc(const struct location *loc, + enum symbol_types type, struct scope *scope, const char *identifier) { struct expr *expr; expr = expr_alloc(loc, &symbol_expr_ops, &invalid_type, BYTEORDER_INVALID, 0); + expr->symtype = type; + expr->scope = scope; expr->identifier = xstrdup(identifier); return expr; } @@ -702,14 +706,42 @@ static const struct expr_ops map_expr_ops = { }; struct expr *map_expr_alloc(const struct location *loc, struct expr *arg, - struct expr *list) + struct expr *mappings) { struct expr *expr; - assert(list->ops->type == EXPR_SET); - expr = expr_alloc(loc, &map_expr_ops, list->dtype, - list->byteorder, list->len); + expr = expr_alloc(loc, &map_expr_ops, &invalid_type, BYTEORDER_INVALID, 0); expr->expr = arg; - expr->mappings = list; + expr->mappings = mappings; + return expr; +} + +static void set_ref_expr_print(const struct expr *expr) +{ + if (expr->set->flags & SET_F_ANONYMOUS) + expr_print(expr->set->init); + else + printf("@%s", expr->set->handle.set); +} + +static void set_ref_expr_destroy(struct expr *expr) +{ + set_free(expr->set); +} + +static const struct expr_ops set_ref_expr_ops = { + .type = EXPR_SET_REF, + .name = "set reference", + .print = set_ref_expr_print, + .destroy = set_ref_expr_destroy, +}; + +struct expr *set_ref_expr_alloc(const struct location *loc, struct set *set) +{ + struct expr *expr; + + expr = expr_alloc(loc, &set_ref_expr_ops, set->keytype, 0, 0); + expr->set = set_get(set); + expr->flags |= EXPR_F_CONSTANT; return expr; } diff --git a/src/netlink.c b/src/netlink.c index 8ef14011..37981542 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include @@ -30,10 +32,13 @@ static struct nl_sock *nf_sock; static void __init netlink_open_sock(void) { - // FIXME: should be done dynamically by nft_set and based on set members nlmsg_set_default_size(65536); nf_sock = nl_socket_alloc(); + if (nf_sock == NULL) + memory_allocation_error(); + nfnl_connect(nf_sock); + nl_socket_set_nonblocking(nf_sock); } static void __exit netlink_close_sock(void) @@ -123,6 +128,42 @@ struct nfnl_nft_expr *alloc_nft_expr(int (*init)(struct nfnl_nft_expr *)) return nle; } +struct nfnl_nft_set *alloc_nft_set(const struct handle *h) +{ + struct nfnl_nft_set *nls; + + nls = nfnl_nft_set_alloc(); + if (nls == NULL) + memory_allocation_error(); + nfnl_nft_set_set_family(nls, h->family); + nfnl_nft_set_set_table(nls, h->table, strlen(h->table) + 1); + if (h->set != NULL) + nfnl_nft_set_set_name(nls, h->set, strlen(h->set) + 1); + return nls; +} + +static struct nfnl_nft_setelem *alloc_nft_setelem(const struct expr *expr) +{ + struct nfnl_nft_setelem *nlse; + + nlse = nfnl_nft_setelem_alloc(); + if (nlse == NULL) + memory_allocation_error(); + + if (expr->ops->type == EXPR_VALUE || expr->flags & EXPR_F_INTERVAL_END) + nfnl_nft_setelem_set_key(nlse, netlink_gen_data(expr)); + else { + assert(expr->ops->type == EXPR_MAPPING); + nfnl_nft_setelem_set_key(nlse, netlink_gen_data(expr->left)); + nfnl_nft_setelem_set_data(nlse, netlink_gen_data(expr->right)); + } + + if (expr->flags & EXPR_F_INTERVAL_END) + nfnl_nft_setelem_set_flags(nlse, NFT_SET_ELEM_INTERVAL_END); + + return nlse; +} + struct nfnl_nft_data *alloc_nft_data(const void *data, unsigned int len) { struct nfnl_nft_data *nld; @@ -585,3 +626,326 @@ int netlink_flush_table(struct netlink_ctx *ctx, const struct handle *h) { return netlink_flush_rules(ctx, h); } + +static enum nft_data_types dtype_map_to_kernel(const struct datatype *dtype) +{ + switch (dtype->type) { + case TYPE_VERDICT: + return NFT_DATA_VERDICT; + default: + return dtype->type; + } +} + +static const struct datatype *dtype_map_from_kernel(enum nft_data_types type) +{ + switch (type) { + case NFT_DATA_VERDICT: + return &verdict_type; + default: + return datatype_lookup(type); + } +} + +static void add_set_cb(struct nl_object *obj, void *arg) +{ + struct nfnl_nft_set *nls = (struct nfnl_nft_set *)obj; + struct netlink_ctx *ctx = arg; + struct set *set = ctx->set; + +#if TRACE + netlink_dump_object(OBJ_CAST(nls)); +#endif + set->handle.set = xstrdup(nfnl_nft_set_get_name(nls)); +} + +static int netlink_add_set_cb(struct nl_msg *msg, void *arg) +{ + return nl_msg_parse(msg, add_set_cb, arg); +} + +int netlink_add_set(struct netlink_ctx *ctx, const struct handle *h, + struct set *set) +{ + struct nfnl_nft_set *nls; + int err; + + nls = alloc_nft_set(h); + nfnl_nft_set_set_flags(nls, set->flags); + nfnl_nft_set_set_keytype(nls, dtype_map_to_kernel(set->keytype)); + nfnl_nft_set_set_keylen(nls, set->keylen / BITS_PER_BYTE); + if (set->flags & NFT_SET_MAP) { + nfnl_nft_set_set_datatype(nls, dtype_map_to_kernel(set->datatype)); + nfnl_nft_set_set_datalen(nls, set->datalen / BITS_PER_BYTE); + } +#if TRACE + netlink_dump_object(OBJ_CAST(nls)); +#endif + + ctx->set = set; + netlink_set_callback(netlink_add_set_cb, ctx); + err = nfnl_nft_set_add(nf_sock, nls, NLM_F_EXCL | NLM_F_ECHO); + if (err == 0) + err = nl_recvmsgs_default(nf_sock); + netlink_set_callback(NULL, NULL); + nfnl_nft_set_put(nls); + ctx->set = NULL; + + if (err < 0) + netlink_io_error(ctx, NULL, "Could not add set: %s", + nl_geterror(err)); + return err; +} + +int netlink_delete_set(struct netlink_ctx *ctx, const struct handle *h) +{ + struct nfnl_nft_set *nls; + int err; + + nls = alloc_nft_set(h); + err = nfnl_nft_set_delete(nf_sock, nls, 0); + nfnl_nft_set_put(nls); + + if (err < 0) + netlink_io_error(ctx, NULL, "Could not delete set: %s", + nl_geterror(err)); + return err; +} + +static void list_set_cb(struct nl_object *obj, void *arg) +{ + struct nfnl_nft_set *nls = (struct nfnl_nft_set *)obj; + struct netlink_ctx *ctx = arg; + const struct datatype *keytype, *datatype; + uint32_t flags; + struct set *set; +#if TRACE + netlink_dump_object(obj); +#endif + if (!nfnl_nft_set_test_family(nls) || + !nfnl_nft_set_test_table(nls) || + !nfnl_nft_set_test_name(nls) || + !nfnl_nft_set_test_keytype(nls) || + !nfnl_nft_set_test_keylen(nls)) { + netlink_io_error(ctx, NULL, "Incomplete set received"); + return; + } + + keytype = dtype_map_from_kernel(nfnl_nft_set_get_keytype(nls)); + if (keytype == NULL) { + netlink_io_error(ctx, NULL, "Unknown data type in set key %u", + nfnl_nft_set_get_keytype(nls)); + return; + } + + flags = nfnl_nft_set_get_flags(nls); + if (flags & NFT_SET_MAP) { + datatype = dtype_map_from_kernel(nfnl_nft_set_get_datatype(nls)); + if (datatype == NULL) { + netlink_io_error(ctx, NULL, "Unknown data type in set key %u", + nfnl_nft_set_get_datatype(nls)); + return; + } + } else + datatype = NULL; + + set = set_alloc(&internal_location); + set->handle.family = nfnl_nft_set_get_family(nls); + set->handle.table = xstrdup(nfnl_nft_set_get_table(nls)); + set->handle.set = xstrdup(nfnl_nft_set_get_name(nls)); + set->keytype = keytype; + set->keylen = nfnl_nft_set_get_keylen(nls) * BITS_PER_BYTE; + set->flags = flags; + set->datatype = datatype; + set->datalen = nfnl_nft_set_get_datalen(nls) * BITS_PER_BYTE; + list_add_tail(&set->list, &ctx->list); +} + +int netlink_list_sets(struct netlink_ctx *ctx, const struct handle *h) +{ + struct nl_cache *set_cache; + int err; + + err = nfnl_nft_set_alloc_cache(nf_sock, h->family, h->table, &set_cache); + if (err < 0) + return netlink_io_error(ctx, NULL, + "Could not receive sets from kernel: %s", + nl_geterror(err)); + + nl_cache_foreach(set_cache, list_set_cb, ctx); + nl_cache_free(set_cache); + return 0; +} + +static int netlink_get_set_cb(struct nl_msg *msg, void *arg) +{ + return nl_msg_parse(msg, list_set_cb, arg); +} + +int netlink_get_set(struct netlink_ctx *ctx, const struct handle *h) +{ + struct nfnl_nft_set *nls; + int err; + + nls = alloc_nft_set(h); +#if TRACE + netlink_dump_object(OBJ_CAST(nls)); +#endif + netlink_set_callback(netlink_get_set_cb, ctx); + err = nfnl_nft_set_query(nf_sock, nls, 0); + if (err == 0) + err = nl_recvmsgs_default(nf_sock); + netlink_set_callback(NULL, NULL); + + nfnl_nft_set_put(nls); + + if (err < 0) + return netlink_io_error(ctx, NULL, + "Could not receive set from kernel: %s", + nl_geterror(err)); + return err; +} + +static int alloc_setelem_cache(const struct expr *set, struct nl_cache **res) +{ + struct nfnl_nft_setelem *nlse; + struct nl_cache *elements; + const struct expr *expr; + int err; + + err = nl_cache_alloc_name("netfilter/nft_setelem", &elements); + if (err < 0) + return err; + list_for_each_entry(expr, &set->expressions, list) { + nlse = alloc_nft_setelem(expr); + nl_cache_add(elements, OBJ_CAST(nlse)); + } + *res = elements; + return 0; +} + +int netlink_add_setelems(struct netlink_ctx *ctx, const struct handle *h, + const struct expr *expr) +{ + struct nfnl_nft_set *nls; + struct nl_cache *elements; + int err; + + nls = alloc_nft_set(h); +#if TRACE + netlink_dump_object(OBJ_CAST(nls)); +#endif + err = alloc_setelem_cache(expr, &elements); + if (err < 0) + goto out; + err = nfnl_nft_setelem_add(nf_sock, nls, elements, 0); + if (err < 0) + goto out; + err = nl_recvmsgs_default(nf_sock); +out: + nfnl_nft_set_put(nls); + if (err < 0) + netlink_io_error(ctx, NULL, "Could not add set elements: %s", + nl_geterror(err)); + return err; +} + +int netlink_delete_setelems(struct netlink_ctx *ctx, const struct handle *h, + const struct expr *expr) +{ + struct nfnl_nft_set *nls; + struct nl_cache *elements; + int err; + + nls = alloc_nft_set(h); + err = alloc_setelem_cache(expr, &elements); + if (err < 0) + goto out; + err = nfnl_nft_setelem_delete(nf_sock, nls, elements, 0); + if (err < 0) + goto out; + err = nl_recvmsgs_default(nf_sock); +out: + nfnl_nft_set_put(nls); + if (err < 0) + netlink_io_error(ctx, NULL, "Could not delete set elements: %s", + nl_geterror(err)); + return err; +} + +static void list_setelem_cb(struct nl_object *obj, void *arg) +{ + struct nfnl_nft_setelem *nlse = nl_object_priv(obj); + struct nfnl_nft_data *nld; + struct netlink_ctx *ctx = arg; + struct set *set = ctx->set; + struct expr *expr, *data; + uint32_t flags; +#if TRACE + netlink_dump_object(obj); +#endif + if (!nfnl_nft_setelem_test_key(nlse)) { + netlink_io_error(ctx, NULL, "Incomplete set element received"); + return; + } + + nld = nfnl_nft_setelem_get_key(nlse); + flags = nfnl_nft_setelem_get_flags(nlse); + + expr = netlink_alloc_value(&internal_location, nld); + expr->dtype = set->keytype; + expr->byteorder = set->keytype->byteorder; + if (expr->byteorder == BYTEORDER_HOST_ENDIAN) + mpz_switch_byteorder(expr->value, expr->len / BITS_PER_BYTE); + + if (flags & NFT_SET_ELEM_INTERVAL_END) + expr->flags |= EXPR_F_INTERVAL_END; + else if (nfnl_nft_setelem_test_data(nlse)) { + nld = nfnl_nft_setelem_get_data(nlse); + + data = netlink_alloc_data(&internal_location, nld, + set->datatype->type == EXPR_VERDICT ? + NFT_REG_VERDICT : NFT_REG_1); + data->dtype = set->datatype; + + expr = mapping_expr_alloc(&internal_location, expr, data); + } + + compound_expr_add(set->init, expr); +} + +extern void interval_map_decompose(struct expr *set); + +int netlink_get_setelems(struct netlink_ctx *ctx, const struct handle *h, + struct set *set) +{ + struct nl_cache *elements; + struct nfnl_nft_set *nls; + int err; + + nls = alloc_nft_set(h); +#if TRACE + netlink_dump_object(OBJ_CAST(nls)); +#endif + err = nfnl_nft_setelem_alloc_cache(nf_sock, nls, &elements); + if (err < 0) + goto out; + err = nl_recvmsgs_default(nf_sock); + if (err < 0) + goto out; + + ctx->set = set; + set->init = set_expr_alloc(&internal_location); + nl_cache_foreach(elements, list_setelem_cb, ctx); + nl_cache_free(elements); + ctx->set = NULL; + + if (set->flags & NFT_SET_INTERVAL) + interval_map_decompose(set->init); +out: + nfnl_nft_set_put(nls); + if (err < 0) + netlink_io_error(ctx, NULL, "Could not receive set elements: %s", + nl_geterror(err)); + return err; +} diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 4b559399..a511313e 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -19,6 +19,7 @@ struct netlink_parse_ctx { struct list_head *msgs; + struct table *table; struct rule *rule; struct expr *registers[NFT_REG_MAX + 1]; }; @@ -132,91 +133,34 @@ static void netlink_parse_cmp(struct netlink_parse_ctx *ctx, list_add_tail(&stmt->list, &ctx->rule->stmts); } -struct netlink_data_ctx { - const struct location *location; - struct expr *expr; - enum nft_registers dreg; -}; - -static void netlink_data_ctx_init(struct netlink_data_ctx *dctx, - const struct location *loc, - struct expr *expr, enum nft_registers dreg) -{ - dctx->location = loc; - dctx->expr = expr; - dctx->dreg = dreg; -} - -static void netlink_set_parse_data(struct nfnl_nft_data *data, - enum nft_set_elem_flags flags, - void *arg) -{ - struct netlink_data_ctx *dctx = arg; - struct expr *expr; - - assert(dctx->dreg != NFT_REG_VERDICT); - expr = netlink_alloc_value(dctx->location, data); - if (flags & NFT_SE_INTERVAL_END) - expr->flags |= EXPR_F_INTERVAL_END; - compound_expr_add(dctx->expr, expr); -} - -static void netlink_set_parse_mapping(struct nfnl_nft_data *data, - struct nfnl_nft_data *mapping, - enum nft_set_elem_flags flags, - void *arg) -{ - struct netlink_data_ctx *dctx = arg; - struct expr *expr, *left, *right; - - left = netlink_alloc_value(dctx->location, data); - if (mapping != NULL) { - right = netlink_alloc_data(dctx->location, mapping, dctx->dreg); - expr = mapping_expr_alloc(dctx->location, left, right); - } else - expr = left; - - if (flags & NFT_SE_INTERVAL_END) - expr->flags |= EXPR_F_INTERVAL_END; - compound_expr_add(dctx->expr, expr); -} - -extern void interval_map_decompose(struct expr *set); - -static void netlink_parse_set(struct netlink_parse_ctx *ctx, - const struct location *loc, - const struct nfnl_nft_expr *nle) +static void netlink_parse_lookup(struct netlink_parse_ctx *ctx, + const struct location *loc, + const struct nfnl_nft_expr *nle) { struct stmt *stmt; struct expr *expr, *left, *right; - struct netlink_data_ctx dctx; + struct set *set; enum nft_registers dreg; - enum nft_set_flags flags; - left = netlink_get_register(ctx, loc, nfnl_nft_set_get_sreg(nle)); + left = netlink_get_register(ctx, loc, nfnl_nft_lookup_get_sreg(nle)); if (left == NULL) return netlink_error(ctx, loc, - "Set expression has no left hand side"); + "Lookup expression has no left hand side"); - right = set_expr_alloc(loc); + set = set_lookup(ctx->table, nfnl_nft_lookup_get_set(nle)); + if (set == NULL) + return netlink_error(ctx, loc, + "Unknown set '%s' in lookup expression", + nfnl_nft_lookup_get_set(nle)); - flags = nfnl_nft_set_get_flags(nle); - if (flags & NFT_SET_MAP) { - dreg = nfnl_nft_set_get_dreg(nle); - netlink_data_ctx_init(&dctx, loc, right, dreg); - nfnl_nft_set_foreach_mapping(nle, netlink_set_parse_mapping, - &dctx); + right = set_ref_expr_alloc(loc, set); + if (nfnl_nft_lookup_test_dreg(nle)) { + dreg = nfnl_nft_lookup_get_dreg(nle); expr = map_expr_alloc(loc, left, right); if (dreg != NFT_REG_VERDICT) return netlink_set_register(ctx, dreg, expr); } else { - netlink_data_ctx_init(&dctx, loc, right, EXPR_VALUE); - nfnl_nft_set_foreach_elem(nle, netlink_set_parse_data, &dctx); - if (flags & NFT_SET_INTERVAL) { - interval_map_decompose(right); - right->flags |= NFT_SET_INTERVAL; - } expr = relational_expr_alloc(loc, OP_LOOKUP, left, right); } @@ -487,7 +431,7 @@ static const struct { } netlink_parsers[] = { { .name = "immediate", .parse = netlink_parse_immediate }, { .name = "cmp", .parse = netlink_parse_cmp }, - { .name = "set", .parse = netlink_parse_set }, + { .name = "lookup", .parse = netlink_parse_lookup }, { .name = "bitwise", .parse = netlink_parse_bitwise }, { .name = "byteorder", .parse = netlink_parse_byteorder }, { .name = "payload", .parse = netlink_parse_payload }, @@ -586,12 +530,6 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, switch (expr->ops->type) { case EXPR_MAP: expr_postprocess(ctx, stmt, &expr->expr); - list_for_each_entry(i, &expr->mappings->expressions, list) { - if (i->flags & EXPR_F_INTERVAL_END) - continue; - expr_set_type(i->left, expr->expr->dtype, - expr->expr->byteorder); - } expr_postprocess(ctx, stmt, &expr->mappings); break; case EXPR_MAPPING: @@ -682,6 +620,7 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, expr->len = len; } break; + case EXPR_SET_REF: case EXPR_EXTHDR: case EXPR_META: case EXPR_CT: @@ -734,6 +673,8 @@ struct rule *netlink_delinearize_rule(struct netlink_ctx *ctx, h.handle = nfnl_nft_rule_get_handle(nlr); pctx->rule = rule_alloc(&internal_location, &h); + pctx->table = table_lookup(&h); + assert(pctx->table != NULL); nfnl_nft_rule_foreach_expr(nlr, netlink_parse_expr, pctx); rule_parse_postprocess(pctx, pctx->rule); diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c index 65e4b69b..121dca15 100644 --- a/src/netlink_linearize.c +++ b/src/netlink_linearize.c @@ -105,17 +105,10 @@ static void netlink_gen_map(struct netlink_linearize_ctx *ctx, enum nft_registers dreg) { struct nfnl_nft_expr *nle; - struct nfnl_nft_data *data; - struct nfnl_nft_data *mapping; - const struct expr *i; - enum nft_set_elem_flags flags; enum nft_registers sreg; - unsigned int klen, dlen; - assert(expr->mappings->ops->type == EXPR_SET); + assert(expr->mappings->ops->type == EXPR_SET_REF); - klen = expr->expr->len / BITS_PER_BYTE; - dlen = expr->mappings->len / BITS_PER_BYTE; if (dreg == NFT_REG_VERDICT) sreg = get_register(ctx); else @@ -123,38 +116,10 @@ static void netlink_gen_map(struct netlink_linearize_ctx *ctx, netlink_gen_expr(ctx, expr->expr, sreg); - nle = alloc_nft_expr(nfnl_nft_set_init); - nfnl_nft_set_set_flags(nle, NFT_SET_MAP); - nfnl_nft_set_set_sreg(nle, sreg); - nfnl_nft_set_set_klen(nle, klen); - nfnl_nft_set_set_dreg(nle, dreg); - nfnl_nft_set_set_dlen(nle, dlen); - - if (expr->mappings->flags & SET_F_INTERVAL) { - set_to_intervals(expr->mappings); - nfnl_nft_set_set_flags(nle, NFT_SET_INTERVAL); - } - - list_for_each_entry(i, &expr->mappings->expressions, list) { - flags = 0; - - switch (i->ops->type) { - case EXPR_MAPPING: - data = netlink_gen_data(i->left); - mapping = netlink_gen_data(i->right); - break; - case EXPR_VALUE: - assert(i->flags & EXPR_F_INTERVAL_END); - data = netlink_gen_data(i); - mapping = NULL; - flags = NFT_SE_INTERVAL_END; - break; - default: - BUG(); - } - - nfnl_nft_set_add_mapping(nle, data, mapping, flags); - } + nle = alloc_nft_expr(nfnl_nft_lookup_init); + nfnl_nft_lookup_set_sreg(nle, sreg); + nfnl_nft_lookup_set_dreg(nle, dreg); + nfnl_nft_lookup_set_set(nle, expr->mappings->set->handle.set); if (dreg == NFT_REG_VERDICT) release_register(ctx); @@ -167,34 +132,17 @@ static void netlink_gen_lookup(struct netlink_linearize_ctx *ctx, enum nft_registers dreg) { struct nfnl_nft_expr *nle; - const struct expr *i; - enum nft_set_elem_flags flags; enum nft_registers sreg; - assert(expr->right->ops->type == EXPR_SET); + assert(expr->right->ops->type == EXPR_SET_REF); assert(dreg == NFT_REG_VERDICT); sreg = get_register(ctx); netlink_gen_expr(ctx, expr->left, sreg); - nle = alloc_nft_expr(nfnl_nft_set_init); - nfnl_nft_set_set_sreg(nle, sreg); - nfnl_nft_set_set_klen(nle, expr->left->len / BITS_PER_BYTE); - - if (expr->right->flags & SET_F_INTERVAL) { - set_to_intervals(expr->right); - nfnl_nft_set_set_flags(nle, NFT_SET_INTERVAL); - } - - list_for_each_entry(i, &expr->right->expressions, list) { - assert(i->ops->type == EXPR_VALUE); - - flags = 0; - if (i->flags & EXPR_F_INTERVAL_END) - flags = NFT_SE_INTERVAL_END; - - nfnl_nft_set_add_elem(nle, netlink_gen_data(i), flags); - } + nle = alloc_nft_expr(nfnl_nft_lookup_init); + nfnl_nft_lookup_set_sreg(nle, sreg); + nfnl_nft_lookup_set_set(nle, expr->right->set->handle.set); release_register(ctx); nfnl_nft_rule_add_expr(ctx->nlr, nle); diff --git a/src/parser.y b/src/parser.y index c63a14e0..419dcd72 100644 --- a/src/parser.y +++ b/src/parser.y @@ -119,6 +119,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) struct rule *rule; struct stmt *stmt; struct expr *expr; + struct set *set; } %token TOKEN_EOF 0 "end of file" @@ -146,9 +147,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token DASH "-" %token AT "@" %token ARROW "=>" -%token MAP "map" %token VMAP "vmap" -%token SET "set" %token INCLUDE "include" %token DEFINE "define" @@ -158,6 +157,10 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token TABLE "table" %token CHAIN "chain" %token RULE "rule" +%token SETS "sets" +%token SET "set" +%token ELEMENT "element" +%token MAP "map" %token HANDLE "handle" %token ADD "add" @@ -327,15 +330,23 @@ static void location_update(struct location *loc, struct location *rhs, int n) %type table_spec chain_spec chain_identifier ruleid_spec %destructor { handle_free(&$$); } table_spec chain_spec chain_identifier ruleid_spec +%type set_spec set_identifier +%destructor { handle_free(&$$); } set_spec set_identifier %type handle_spec family_spec %type table_block_alloc table_block %destructor { table_free($$); } table_block_alloc -%type table_line chain_block_alloc chain_block -%destructor { chain_free($$); } table_line chain_block_alloc +%type chain_block_alloc chain_block +%destructor { chain_free($$); } chain_block_alloc %type rule %destructor { rule_free($$); } rule +%type set_block_alloc set_block +%destructor { set_free($$); } set_block_alloc + +%type map_block_alloc map_block +%destructor { set_free($$); } map_block_alloc + %type stmt_list %destructor { stmt_list_free($$); xfree($$); } stmt_list %type stmt match_stmt verdict_stmt @@ -372,11 +383,11 @@ static void location_update(struct location *loc, struct location *rhs, int n) %type concat_expr map_lhs_expr %destructor { expr_free($$); } concat_expr map_lhs_expr -%type map_expr map_list map_list_expr -%destructor { expr_free($$); } map_expr map_list map_list_expr +%type map_expr +%destructor { expr_free($$); } map_expr -%type verdict_map_expr verdict_map_list verdict_map_list_expr -%destructor { expr_free($$); } verdict_map_expr verdict_map_list verdict_map_list_expr +%type verdict_map_expr +%destructor { expr_free($$); } verdict_map_expr %type set_expr set_list_expr set_list_member_expr %destructor { expr_free($$); } set_expr set_list_expr set_list_member_expr @@ -384,10 +395,8 @@ static void location_update(struct location *loc, struct location *rhs, int n) %type expr initializer_expr %destructor { expr_free($$); } expr initializer_expr -%type match_expr -%destructor { expr_free($$); } match_expr -%type relational_expr membership_expr -%destructor { expr_free($$); } relational_expr membership_expr +%type relational_expr +%destructor { expr_free($$); } relational_expr %type relational_op %type payload_expr payload_raw_expr @@ -520,6 +529,24 @@ add_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_ADD, CMD_OBJ_RULE, &$1, $2); } + | SET set_spec set_block_alloc + '{' set_block '}' + { + $5->location = @5; + handle_merge(&$3->handle, &$2); + $$ = cmd_alloc(CMD_ADD, CMD_OBJ_SET, &$2, $5); + } + | MAP set_spec map_block_alloc + '{' map_block '}' + { + $5->location = @5; + handle_merge(&$3->handle, &$2); + $$ = cmd_alloc(CMD_ADD, CMD_OBJ_SET, &$2, $5); + } + | ELEMENT set_spec set_expr + { + $$ = cmd_alloc(CMD_ADD, CMD_OBJ_SETELEM, &$2, $3); + } ; delete_cmd : TABLE table_spec @@ -534,6 +561,14 @@ delete_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_DELETE, CMD_OBJ_RULE, &$2, NULL); } + | SET set_spec + { + $$ = cmd_alloc(CMD_DELETE, CMD_OBJ_SET, &$2, NULL); + } + | ELEMENT set_spec set_expr + { + $$ = cmd_alloc(CMD_DELETE, CMD_OBJ_SETELEM, &$2, $3); + } ; list_cmd : TABLE table_spec @@ -544,6 +579,14 @@ list_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_CHAIN, &$2, NULL); } + | SETS table_spec + { + $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$2, NULL); + } + | SET set_spec + { + $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SET, &$2, NULL); + } ; flush_cmd : TABLE table_spec @@ -554,6 +597,10 @@ flush_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_FLUSH, CMD_OBJ_CHAIN, &$2, NULL); } + | SET set_spec + { + $$ = cmd_alloc(CMD_FLUSH, CMD_OBJ_SET, &$2, NULL); + } ; table_block_alloc : /* empty */ @@ -566,20 +613,35 @@ table_block_alloc : /* empty */ table_block : /* empty */ { $$ = $
-1; } | table_block common_block | table_block stmt_seperator - | table_block table_line stmt_seperator + | table_block CHAIN chain_identifier + chain_block_alloc '{' chain_block '}' + stmt_seperator { - list_add_tail(&$2->list, &$1->chains); + handle_merge(&$4->handle, &$3); + handle_free(&$3); + close_scope(state); + list_add_tail(&$4->list, &$1->chains); $$ = $1; } - ; - -table_line : CHAIN chain_identifier chain_block_alloc - '{' chain_block '}' - { - handle_merge(&$3->handle, &$2); - handle_free(&$2); - close_scope(state); - $$ = $3; + | table_block SET set_identifier + set_block_alloc '{' set_block '}' + stmt_seperator + { + $4->location = @3; + handle_merge(&$4->handle, &$3); + handle_free(&$3); + list_add_tail(&$4->list, &$1->sets); + $$ = $1; + } + | table_block MAP set_identifier + map_block_alloc '{' map_block '}' + stmt_seperator + { + $4->location = @3; + handle_merge(&$4->handle, &$3); + handle_free(&$3); + list_add_tail(&$4->list, &$1->sets); + $$ = $1; } ; @@ -601,6 +663,59 @@ chain_block : /* empty */ { $$ = $-1; } } ; +set_block_alloc : /* empty */ + { + $$ = set_alloc(NULL); + } + ; + +set_block : /* empty */ { $$ = $-1; } + | set_block common_block + | set_block stmt_seperator + | set_block TYPE identifier stmt_seperator + { + $1->keytype = datatype_lookup_byname($3); + if ($1->keytype == NULL) { + erec_queue(error(&@3, "unknown datatype %s", $3), + state->msgs); + YYERROR; + } + $$ = $1; + } + ; + +map_block_alloc : /* empty */ + { + $$ = set_alloc(NULL); + $$->flags |= NFT_SET_MAP; + } + ; + +map_block : /* empty */ { $$ = $-1; } + | map_block common_block + | map_block stmt_seperator + | map_block TYPE + identifier ARROW identifier + stmt_seperator + { + $1->keytype = datatype_lookup_byname($3); + if ($1->keytype == NULL) { + erec_queue(error(&@3, "unknown datatype %s", $3), + state->msgs); + YYERROR; + } + + $1->datatype = datatype_lookup_byname($5); + if ($1->datatype == NULL) { + erec_queue(error(&@5, "unknown datatype %s", $5), + state->msgs); + YYERROR; + } + + $$ = $1; + } + ; + hook_spec : HOOK HOOKNUM NUM { $0->hooknum = $2; @@ -649,6 +764,20 @@ chain_identifier : identifier } ; +set_spec : table_spec identifier + { + $$ = $1; + $$.set = $2; + } + ; + +set_identifier : identifier + { + memset(&$$, 0, sizeof($$)); + $$.set = $1; + } + ; + handle_spec : /* empty */ { $$ = 0; @@ -806,7 +935,7 @@ nat_stmt_args : expr } ; -match_stmt : match_expr +match_stmt : relational_expr { $$ = expr_stmt_alloc(&@$, $1); } @@ -814,13 +943,23 @@ match_stmt : match_expr symbol_expr : string { - $$ = symbol_expr_alloc(&@$, $1); + $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, + current_scope(state), + $1); xfree($1); } | '$' identifier { - $$ = symbol_expr_alloc(&@$, $2); - $$->scope = current_scope(state); + $$ = symbol_expr_alloc(&@$, SYMBOL_DEFINE, + current_scope(state), + $2); + xfree($2); + } + | AT identifier + { + $$ = symbol_expr_alloc(&@$, SYMBOL_SET, + current_scope(state), + $2); xfree($2); } ; @@ -830,7 +969,9 @@ integer_expr : NUM char str[64]; snprintf(str, sizeof(str), "%" PRIu64, $1); - $$ = symbol_expr_alloc(&@$, str); + $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, + current_scope(state), + str); } ; @@ -938,76 +1079,62 @@ map_lhs_expr : multiton_expr | concat_expr ; -map_expr : concat_expr MAP '{' map_list '}' +map_expr : concat_expr MAP expr { - $$ = map_expr_alloc(&@$, $1, $4); + $$ = map_expr_alloc(&@$, $1, $3); } ; -map_list : map_list_expr +verdict_map_expr : concat_expr VMAP expr { - $$ = set_expr_alloc(&@$); - compound_expr_add($$, $1); + $$ = map_expr_alloc(&@$, $1, $3); } - | map_list COMMA map_list_expr - { - compound_expr_add($1, $3); - $1->location = @$; - $$ = $1; - } - | map_list COMMA opt_newline ; -map_list_expr : opt_newline map_lhs_expr opt_newline - ARROW opt_newline - concat_expr opt_newline - { - $$ = mapping_expr_alloc(&@$, $2, $6); - } +expr : concat_expr + | set_expr + | map_expr + | multiton_expr ; -verdict_map_expr : concat_expr VMAP '{' verdict_map_list '}' +set_expr : '{' set_list_expr '}' { - $$ = map_expr_alloc(&@$, $1, $4); + $2->location = @$; + $$ = $2; } ; -verdict_map_list : verdict_map_list_expr +set_list_expr : set_list_member_expr { $$ = set_expr_alloc(&@$); compound_expr_add($$, $1); } - | verdict_map_list COMMA verdict_map_list_expr + | set_list_expr COMMA set_list_member_expr { compound_expr_add($1, $3); - $1->location = @$; $$ = $1; } - | verdict_map_list COMMA opt_newline + | set_list_expr COMMA opt_newline ; -verdict_map_list_expr : opt_newline map_lhs_expr opt_newline - ARROW opt_newline - verdict_expr opt_newline +set_list_member_expr : opt_newline expr opt_newline { - $$ = mapping_expr_alloc(&@$, $2, $6); + $$ = $2; + } + | opt_newline map_lhs_expr ARROW concat_expr opt_newline + { + $$ = mapping_expr_alloc(&@$, $2, $4); + } + | opt_newline map_lhs_expr ARROW verdict_expr opt_newline + { + $$ = mapping_expr_alloc(&@$, $2, $4); } - ; - -expr : concat_expr - | map_expr - | multiton_expr ; initializer_expr : expr - | set_expr | list_expr ; -match_expr : relational_expr - | membership_expr - ; - relational_expr : expr /* implicit */ expr { $$ = relational_expr_alloc(&@$, OP_IMPLICIT, $1, $2); @@ -1030,38 +1157,6 @@ relational_op : EQ { $$ = OP_EQ; } | LTE { $$ = OP_LTE; } ; -membership_expr : expr set_expr - { - $$ = relational_expr_alloc(&@$, OP_LOOKUP, $1, $2); - } - ; - -set_expr : '{' set_list_expr '}' - { - $2->location = @$; - $$ = $2; - } - ; - -set_list_expr : set_list_member_expr - { - $$ = set_expr_alloc(&@$); - compound_expr_add($$, $1); - } - | set_list_expr COMMA set_list_member_expr - { - compound_expr_add($1, $3); - $$ = $1; - } - | set_list_expr COMMA opt_newline - ; - -set_list_member_expr : opt_newline expr opt_newline - { - $$ = $2; - } - ; - verdict_expr : ACCEPT { $$ = verdict_expr_alloc(&@$, NF_ACCEPT, NULL); diff --git a/src/rule.c b/src/rule.c index 6f322b8b..a5032cf7 100644 --- a/src/rule.c +++ b/src/rule.c @@ -23,6 +23,7 @@ void handle_free(struct handle *h) { xfree(h->table); xfree(h->chain); + xfree(h->set); } void handle_merge(struct handle *dst, const struct handle *src) @@ -33,10 +34,80 @@ void handle_merge(struct handle *dst, const struct handle *src) dst->table = xstrdup(src->table); if (dst->chain == NULL && src->chain != NULL) dst->chain = xstrdup(src->chain); + if (dst->set == NULL && src->set != NULL) + dst->set = xstrdup(src->set); if (dst->handle == 0) dst->handle = src->handle; } +struct set *set_alloc(const struct location *loc) +{ + struct set *set; + + set = xzalloc(sizeof(*set)); + set->refcnt = 1; + if (loc != NULL) + set->location = *loc; + return set; +} + +struct set *set_get(struct set *set) +{ + set->refcnt++; + return set; +} + +void set_free(struct set *set) +{ + if (--set->refcnt > 0) + return; + handle_free(&set->handle); + xfree(set); +} + +void set_add_hash(struct set *set, struct table *table) +{ + list_add_tail(&set->list, &table->sets); +} + +struct set *set_lookup(const struct table *table, const char *name) +{ + struct set *set; + + list_for_each_entry(set, &table->sets, list) { + if (!strcmp(set->handle.set, name)) + return set; + } + return NULL; +} + +void set_print(const struct set *set) +{ + const char *type; + + type = set->flags & SET_F_MAP ? "map" : "set"; + printf("\t%s %s {\n", type, set->handle.set); + + printf("\t\ttype %s", set->keytype->name); + if (set->flags & SET_F_MAP) + printf(" => %s", set->datatype->name); + printf("\n"); + + if (set->flags & SET_F_ANONYMOUS) + printf("\t\tanonymous\n"); + if (set->flags & SET_F_CONSTANT) + printf("\t\tconstant\n"); + if (set->flags & SET_F_INTERVAL) + printf("\t\tinterval\n"); + + if (set->init != NULL && set->init->size > 0) { + printf("\t\telements = "); + expr_print(set->init); + printf("\n"); + } + printf("\t}\n"); +} + struct rule *rule_alloc(const struct location *loc, const struct handle *h) { struct rule *rule; @@ -168,6 +239,7 @@ struct table *table_alloc(void) table = xzalloc(sizeof(*table)); init_list_head(&table->chains); + init_list_head(&table->sets); return table; } @@ -204,9 +276,17 @@ struct table *table_lookup(const struct handle *h) static void table_print(const struct table *table) { struct chain *chain; + struct set *set; const char *delim = ""; printf("table %s {\n", table->handle.table); + list_for_each_entry(set, &table->sets, list) { + if (set->flags & SET_F_ANONYMOUS) + continue; + printf("%s", delim); + set_print(set); + delim = "\n"; + } list_for_each_entry(chain, &table->chains, list) { printf("%s", delim); chain_print(chain); @@ -233,6 +313,12 @@ void cmd_free(struct cmd *cmd) handle_free(&cmd->handle); if (cmd->data != NULL) { switch (cmd->obj) { + case CMD_OBJ_SETELEM: + expr_free(cmd->expr); + break; + case CMD_OBJ_SET: + set_free(cmd->set); + break; case CMD_OBJ_RULE: rule_free(cmd->rule); break; @@ -267,14 +353,42 @@ static int do_add_chain(struct netlink_ctx *ctx, const struct handle *h, return 0; } +static int do_add_setelems(struct netlink_ctx *ctx, const struct handle *h, + const struct expr *expr) +{ + if (netlink_add_setelems(ctx, h, expr) < 0) + return -1; + return 0; +} + +static int do_add_set(struct netlink_ctx *ctx, const struct handle *h, + struct set *set) +{ + if (netlink_add_set(ctx, h, set) < 0) + return -1; + if (set->init != NULL) { + if (set->flags & SET_F_INTERVAL) + set_to_intervals(set->init); + if (do_add_setelems(ctx, &set->handle, set->init) < 0) + return -1; + } + return 0; +} + static int do_add_table(struct netlink_ctx *ctx, const struct handle *h, struct table *table) { struct chain *chain; + struct set *set; if (netlink_add_table(ctx, h, table) < 0) return -1; if (table != NULL) { + list_for_each_entry(set, &table->sets, list) { + handle_merge(&set->handle, &table->handle); + if (do_add_set(ctx, &set->handle, set) < 0) + return -1; + } list_for_each_entry(chain, &table->chains, list) { if (do_add_chain(ctx, &chain->handle, chain) < 0) return -1; @@ -292,6 +406,10 @@ static int do_command_add(struct netlink_ctx *ctx, struct cmd *cmd) return do_add_chain(ctx, &cmd->handle, cmd->chain); case CMD_OBJ_RULE: return netlink_add_rule(ctx, &cmd->handle, cmd->rule); + case CMD_OBJ_SET: + return do_add_set(ctx, &cmd->handle, cmd->set); + case CMD_OBJ_SETELEM: + return do_add_setelems(ctx, &cmd->handle, cmd->expr); default: BUG(); } @@ -307,39 +425,76 @@ static int do_command_delete(struct netlink_ctx *ctx, struct cmd *cmd) return netlink_delete_chain(ctx, &cmd->handle); case CMD_OBJ_RULE: return netlink_delete_rule(ctx, &cmd->handle); + case CMD_OBJ_SET: + return netlink_delete_set(ctx, &cmd->handle); + case CMD_OBJ_SETELEM: + return netlink_delete_setelems(ctx, &cmd->handle, cmd->expr); default: BUG(); } } +static int do_list_sets(struct netlink_ctx *ctx, struct table *table) +{ + struct set *set, *nset; + + if (netlink_list_sets(ctx, &table->handle) < 0) + return -1; + + list_for_each_entry_safe(set, nset, &ctx->list, list) { + if (set->flags & SET_F_ANONYMOUS && + netlink_get_setelems(ctx, &set->handle, set) < 0) + return -1; + list_move_tail(&set->list, &table->sets); + } + return 0; +} + static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd) { struct table *table; struct chain *chain; - struct rule *rule, *next; + struct rule *rule, *nrule; + struct set *set, *nset; + + table = table_alloc(); + handle_merge(&table->handle, &cmd->handle); + table_add_hash(table); switch (cmd->obj) { case CMD_OBJ_TABLE: + if (do_list_sets(ctx, table) < 0) + return -1; if (netlink_list_table(ctx, &cmd->handle) < 0) return -1; break; case CMD_OBJ_CHAIN: + if (do_list_sets(ctx, table) < 0) + return -1; if (netlink_list_chain(ctx, &cmd->handle) < 0) return -1; break; + case CMD_OBJ_SETS: + if (netlink_list_sets(ctx, &cmd->handle) < 0) + return -1; + list_for_each_entry_safe(set, nset, &ctx->list, list) + list_move_tail(&set->list, &table->sets); + break; + case CMD_OBJ_SET: + if (netlink_get_set(ctx, &cmd->handle) < 0) + return -1; + list_for_each_entry(set, &ctx->list, list) { + if (netlink_get_setelems(ctx, &cmd->handle, set) < 0) + return -1; + set_print(set); + } + return 0; default: BUG(); } - table = NULL; - list_for_each_entry_safe(rule, next, &ctx->list, list) { + list_for_each_entry_safe(rule, nrule, &ctx->list, list) { table = table_lookup(&rule->handle); - if (table == NULL) { - table = table_alloc(); - handle_merge(&table->handle, &rule->handle); - table_add_hash(table); - } - chain = chain_lookup(table, &rule->handle); if (chain == NULL) { chain = chain_alloc(rule->handle.chain); @@ -349,10 +504,7 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd) list_move_tail(&rule->list, &chain->rules); } - if (table != NULL) - table_print(table); - else - printf("table %s does not exist\n", cmd->handle.table); + table_print(table); return 0; } diff --git a/src/scanner.l b/src/scanner.l index f8d018bb..de2373da 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -210,9 +210,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "$" { return '$'; } "=" { return '='; } "=>" { return ARROW; } -"map" { return MAP; } "vmap" { return VMAP; } -"set" { return SET; } "NF_INET_PRE_ROUTING" { yylval->val = NF_INET_PRE_ROUTING; return HOOKNUM; } "NF_INET_LOCAL_IN" { yylval->val = NF_INET_LOCAL_IN; return HOOKNUM; } @@ -229,6 +227,10 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "table" { return TABLE; } "chain" { return CHAIN; } "rule" { return RULE; } +"sets" { return SETS; } +"set" { return SET; } +"element" { return ELEMENT; } +"map" { return MAP; } "handle" { return HANDLE; } "accept" { return ACCEPT; } -- cgit v1.2.3