diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-04-20 12:24:26 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-04 15:39:21 +0200 |
| commit | 337c04c45e1472d6d9b531a3c55f1f2d30ebf308 (patch) | |
| tree | 7526f6f33a6a57404ed9b15588b1a3fc3eb40182 /filter | |
| parent | d8661a4397e4576ac404661b192dd99d928e7890 (diff) | |
Moved route preference to eattrs
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/config.Y | 2 | ||||
| -rw-r--r-- | filter/data.h | 1 | ||||
| -rw-r--r-- | filter/f-inst.c | 5 |
3 files changed, 0 insertions, 8 deletions
diff --git a/filter/config.Y b/filter/config.Y index f21f1c8e..dcfae788 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -286,7 +286,6 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN, IF, THEN, ELSE, CASE, TRUE, FALSE, RT, RO, UNKNOWN, GENERIC, FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, DEST, IFNAME, IFINDEX, WEIGHT, GW_MPLS, - PREFERENCE, ROA_CHECK, ASN, SRC, DST, IS_V4, IS_V6, LEN, MAXLEN, @@ -773,7 +772,6 @@ static_attr: | IFNAME { $$ = f_new_static_attr(T_STRING, SA_IFNAME, 0); } | IFINDEX { $$ = f_new_static_attr(T_INT, SA_IFINDEX, 1); } | WEIGHT { $$ = f_new_static_attr(T_INT, SA_WEIGHT, 0); } - | PREFERENCE { $$ = f_new_static_attr(T_INT, SA_PREF, 0); } | GW_MPLS { $$ = f_new_static_attr(T_INT, SA_GW_MPLS, 0); } ; diff --git a/filter/data.h b/filter/data.h index 4d2622ab..0e25ccd9 100644 --- a/filter/data.h +++ b/filter/data.h @@ -32,7 +32,6 @@ enum f_sa_code { SA_IFNAME, SA_IFINDEX, SA_WEIGHT, - SA_PREF, SA_GW_MPLS, } PACKED; diff --git a/filter/f-inst.c b/filter/f-inst.c index c5947955..9530d9ad 100644 --- a/filter/f-inst.c +++ b/filter/f-inst.c @@ -543,7 +543,6 @@ 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; case SA_WEIGHT: RESULT(sa.type, i, rta->nh.weight + 1); break; - case SA_PREF: RESULT(sa.type, i, rta->pref); break; case SA_GW_MPLS: RESULT(sa.type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break; default: @@ -648,10 +647,6 @@ } break; - case SA_PREF: - rta->pref = v1.val.i; - break; - default: bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code); } |