diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/rule.h | 6 | ||||
| -rw-r--r-- | include/statement.h | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/rule.h b/include/rule.h index c59bcea7..4912aa16 100644 --- a/include/rule.h +++ b/include/rule.h @@ -361,6 +361,8 @@ enum cmd_ops { * @CMD_OBJ_EXPR: expression * @CMD_OBJ_MONITOR: monitor * @CMD_OBJ_EXPORT: export + * @CMD_OBJ_METER: meter + * @CMD_OBJ_METERS: meters * @CMD_OBJ_COUNTER: counter * @CMD_OBJ_COUNTERS: multiple counters * @CMD_OBJ_QUOTA: quota @@ -381,8 +383,8 @@ enum cmd_obj { CMD_OBJ_EXPR, CMD_OBJ_MONITOR, CMD_OBJ_EXPORT, - CMD_OBJ_FLOWTABLE, - CMD_OBJ_FLOWTABLES, + CMD_OBJ_METER, + CMD_OBJ_METERS, CMD_OBJ_MAP, CMD_OBJ_MAPS, CMD_OBJ_COUNTER, diff --git a/include/statement.h b/include/statement.h index 2f702c3c..23a551b6 100644 --- a/include/statement.h +++ b/include/statement.h @@ -165,14 +165,14 @@ struct set_stmt { extern struct stmt *set_stmt_alloc(const struct location *loc); -struct flow_stmt { +struct meter_stmt { struct expr *set; struct expr *key; struct stmt *stmt; - const char *table; + const char *name; }; -extern struct stmt *flow_stmt_alloc(const struct location *loc); +extern struct stmt *meter_stmt_alloc(const struct location *loc); /** * enum nft_xt_type - xtables statement types @@ -209,7 +209,7 @@ struct xt_stmt { * @STMT_INVALID: uninitialised * @STMT_EXPRESSION: expression statement (relational) * @STMT_VERDICT: verdict statement - * @STMT_FLOW: flow statement + * @STMT_METER: meter statement * @STMT_COUNTER: counters * @STMT_PAYLOAD: payload statement * @STMT_META: meta statement @@ -234,7 +234,7 @@ enum stmt_types { STMT_INVALID, STMT_EXPRESSION, STMT_VERDICT, - STMT_FLOW, + STMT_METER, STMT_COUNTER, STMT_PAYLOAD, STMT_META, @@ -296,7 +296,7 @@ struct stmt { union { struct expr *expr; struct exthdr_stmt exthdr; - struct flow_stmt flow; + struct meter_stmt meter; struct counter_stmt counter; struct payload_stmt payload; struct meta_stmt meta; |