diff options
| author | Maria Matejka <mq@ucw.cz> | 2019-07-03 08:44:42 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2019-07-03 08:44:42 +0200 |
| commit | 8816b6cdd98d24535eece6b5e35730aac57cd9f7 (patch) | |
| tree | 190aedf5b4d8c8c9df7ba91d16423aadc5fbe716 /nest | |
| parent | c376555cecbfea83314e9f76bce5002185d3566a (diff) | |
| parent | 84ac62d3967f5294f4dc208b803a273a101744a8 (diff) | |
Merge branch 'mq-filter-stack' of gitlab.labs.nic.cz:labs/bird into mq-filter-stack
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/a-path.c | 1 | ||||
| -rw-r--r-- | nest/config.Y | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nest/a-path.c b/nest/a-path.c index 62369af3..a1b7c42f 100644 --- a/nest/a-path.c +++ b/nest/a-path.c @@ -271,7 +271,6 @@ as_path_to_old(struct linpool *pool, const struct adata *path) /* * Cut the path to the length @num, measured to the usual path metric. Note that * AS_CONFED_* segments have zero length and must be added if they are on edge. - * In contrast to other as_path_* functions, @path is modified in place. */ struct adata * as_path_cut(struct linpool *pool, const struct adata *path, uint num) diff --git a/nest/config.Y b/nest/config.Y index e4dedc66..e97b8fb3 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -731,6 +731,8 @@ CF_CLI(DUMP ROUTES,,, [[Dump routing table]]) { rt_dump_all(); cli_msg(0, ""); } ; CF_CLI(DUMP PROTOCOLS,,, [[Dump protocol information]]) { protos_dump_all(); cli_msg(0, ""); } ; +CF_CLI(DUMP FILTER ALL,,, [[Dump all filters in linearized form]]) +{ filters_dump_all(); cli_msg(0, ""); } ; CF_CLI(EVAL, term, <expr>, [[Evaluate an expression]]) { cmd_eval(f_linearize($2)); } ; @@ -791,7 +793,7 @@ proto_patt2: | TEXT { $$.ptr = $1; $$.patt = 1; } ; -dynamic_attr: IGP_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, 0, T_INT, EA_GEN_IGP_METRIC); } ; +dynamic_attr: IGP_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_GEN_IGP_METRIC); } ; CF_CODE |