diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-04 12:41:54 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-04 15:39:21 +0200 |
| commit | 702c04fbef222e802ca4dfac645dc75ede522db6 (patch) | |
| tree | cf962b4003b0e7115ab230924cbdb0775a7cba45 /filter | |
| parent | 0c4e0e4a635169cada395144dd67d1e66f1c9649 (diff) | |
Removing the route scope attribute. Use custom attributes instead.
The route scope attribute was used for simple user route marking. As
there is a better tool for this (custom attributes), the old and limited
way can be dropped.
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/config.Y | 1 | ||||
| -rw-r--r-- | filter/data.h | 1 | ||||
| -rw-r--r-- | filter/f-inst.c | 5 | ||||
| -rw-r--r-- | filter/test.conf2 | 6 |
4 files changed, 0 insertions, 13 deletions
diff --git a/filter/config.Y b/filter/config.Y index 7dcdb779..6af39c10 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -766,7 +766,6 @@ static_attr: | 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); } - | SCOPE { $$ = f_new_static_attr(T_ENUM_SCOPE, SA_SCOPE, 0); } | 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 a0a164ed..49b29499 100644 --- a/filter/data.h +++ b/filter/data.h @@ -26,7 +26,6 @@ enum f_sa_code { SA_NET, SA_PROTO, SA_SOURCE, - SA_SCOPE, SA_DEST, SA_IFNAME, SA_IFINDEX, diff --git a/filter/f-inst.c b/filter/f-inst.c index 7158d22e..5eacc716 100644 --- a/filter/f-inst.c +++ b/filter/f-inst.c @@ -537,7 +537,6 @@ case SA_NET: RESULT(sa.type, net, (*fs->rte)->net->n.addr); 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_SCOPE: RESULT(sa.type, i, rta->scope); 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; @@ -579,10 +578,6 @@ } break; - case SA_SCOPE: - rta->scope = v1.val.i; - break; - case SA_DEST: { int i = v1.val.i; diff --git a/filter/test.conf2 b/filter/test.conf2 index e95f9563..9fc8330f 100644 --- a/filter/test.conf2 +++ b/filter/test.conf2 @@ -38,12 +38,6 @@ protocol static { print from; from = 1.2.3.4; print from; - print scope; - scope = SCOPE_HOST; - print scope; - if !(scope ~ [ SCOPE_HOST, SCOPE_SITE ]) then { - print "Failed in test"; - } preference = 15; print preference; |