diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:26:25 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:26:25 +0200 |
| commit | 41508ceac3cdd74ca705d3bfc6a79464bf38e0b5 (patch) | |
| tree | 4a0506a93849b3b7e61faeeaba1af289e13d646a /filter | |
| parent | 65254128e105903b6b470c6b4bb4729f56cf81bc (diff) | |
| parent | 1c30b689ddd032ef8000fb7836348a48ba3184ff (diff) | |
Merge commit '1c30b689ddd032ef8000fb7836348a48ba3184ff' into haugesund
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/config.Y | 3 | ||||
| -rw-r--r-- | filter/data.h | 1 | ||||
| -rw-r--r-- | filter/f-inst.c | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/filter/config.Y b/filter/config.Y index 6af39c10..ca792593 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -285,7 +285,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN, SET, STRING, BGPMASK, BGPPATH, CLIST, ECLIST, LCLIST, IF, THEN, ELSE, CASE, TRUE, FALSE, RT, RO, UNKNOWN, GENERIC, - FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, DEST, IFNAME, IFINDEX, WEIGHT, GW_MPLS, + FROM, GW, NET, MASK, PROTO, SCOPE, DEST, IFNAME, IFINDEX, WEIGHT, GW_MPLS, ROA_CHECK, ASN, SRC, DST, IS_V4, IS_V6, LEN, MAXLEN, @@ -765,7 +765,6 @@ static_attr: GW { $$ = f_new_static_attr(T_IP, SA_GW, 0); } | NET { $$ = f_new_static_attr(T_NET, SA_NET, 1); } | PROTO { $$ = f_new_static_attr(T_STRING, SA_PROTO, 1); } - | SOURCE { $$ = f_new_static_attr(T_ENUM_RTS, SA_SOURCE, 1); } | DEST { $$ = f_new_static_attr(T_ENUM_RTD, SA_DEST, 0); } | IFNAME { $$ = f_new_static_attr(T_STRING, SA_IFNAME, 0); } | IFINDEX { $$ = f_new_static_attr(T_INT, SA_IFINDEX, 1); } diff --git a/filter/data.h b/filter/data.h index 49b29499..23db4a85 100644 --- a/filter/data.h +++ b/filter/data.h @@ -25,7 +25,6 @@ enum f_sa_code { SA_GW = 1, SA_NET, SA_PROTO, - SA_SOURCE, SA_DEST, SA_IFNAME, SA_IFINDEX, diff --git a/filter/f-inst.c b/filter/f-inst.c index 7fa1c8b8..caf473f0 100644 --- a/filter/f-inst.c +++ b/filter/f-inst.c @@ -536,7 +536,6 @@ case SA_GW: RESULT(sa.type, ip, rta->nh.gw); break; case SA_NET: RESULT(sa.type, net, fs->rte->net); break; case SA_PROTO: RESULT(sa.type, s, fs->rte->src->proto->name); break; - case SA_SOURCE: RESULT(sa.type, i, rta->source); break; case SA_DEST: RESULT(sa.type, i, rta->dest); break; case SA_IFNAME: RESULT(sa.type, s, rta->nh.iface ? rta->nh.iface->name : ""); break; case SA_IFINDEX: RESULT(sa.type, i, rta->nh.iface ? rta->nh.iface->index : 0); break; |