Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allows some modifications of dest attribute in filters.

Browse source
This commit is contained in:
Ondrej Zajicek 2012-04-29 01:35:52 +02:00
parent bf42207332
commit 182a78957d
3 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/bird.sgml
View file

@ -1072,7 +1072,16 @@ undefined value is regarded as empty clist for most purposes.
routes). Read-only. routes). Read-only.
<tag><m/enum/ dest</tag> <tag><m/enum/ dest</tag>
Type of destination the packets should be sent to (<cf/RTD_ROUTER/ for forwarding to a neighboring router, <cf/RTD_DEVICE/ for routing to a directly-connected network, <cf/RTD_BLACKHOLE/ for packets to be silently discarded, <cf/RTD_UNREACHABLE/, <cf/RTD_PROHIBIT/ for packets that should be returned with ICMP host unreachable / ICMP administratively prohibited messages). Read-only. Type of destination the packets should be sent to
(<cf/RTD_ROUTER/ for forwarding to a neighboring router,
<cf/RTD_DEVICE/ for routing to a directly-connected network,
<cf/RTD_MULTIPATH/ for multipath destinations,
<cf/RTD_BLACKHOLE/ for packets to be silently discarded,
<cf/RTD_UNREACHABLE/, <cf/RTD_PROHIBIT/ for packets that
should be returned with ICMP host unreachable / ICMP
administratively prohibited messages). Can be changed, but
only to <cf/RTD_BLACKHOLE/, <cf/RTD_UNREACHABLE/ or
<cf/RTD_PROHIBIT/.
<tag><m/int/ igp_metric</tag> <tag><m/int/ igp_metric</tag>
The optional attribute that can be used to specify a distance The optional attribute that can be used to specify a distance

2
filter/config.Y
View file

@ -703,7 +703,7 @@ static_attr:
| SOURCE { $$ = f_new_inst(); $$->aux = T_ENUM_RTS; $$->a2.i = OFFSETOF(struct rta, source); } | SOURCE { $$ = f_new_inst(); $$->aux = T_ENUM_RTS; $$->a2.i = OFFSETOF(struct rta, source); }
| SCOPE { $$ = f_new_inst(); $$->aux = T_ENUM_SCOPE; $$->a2.i = OFFSETOF(struct rta, scope); $$->a1.i = 1; } | SCOPE { $$ = f_new_inst(); $$->aux = T_ENUM_SCOPE; $$->a2.i = OFFSETOF(struct rta, scope); $$->a1.i = 1; }
| CAST { $$ = f_new_inst(); $$->aux = T_ENUM_RTC; $$->a2.i = OFFSETOF(struct rta, cast); } | CAST { $$ = f_new_inst(); $$->aux = T_ENUM_RTC; $$->a2.i = OFFSETOF(struct rta, cast); }
| DEST { $$ = f_new_inst(); $$->aux = T_ENUM_RTD; $$->a2.i = OFFSETOF(struct rta, dest); } | DEST { $$ = f_new_inst(); $$->aux = T_ENUM_RTD; $$->a2.i = OFFSETOF(struct rta, dest); $$->a1.i = 1; }
; ;
term: term:

19
filter/filter.c
View file

@ -852,12 +852,25 @@ interpret(struct f_inst *what)
{ {
struct rta *rta = (*f_rte)->attrs; struct rta *rta = (*f_rte)->attrs;
switch (what->aux) { switch (what->aux) {
case T_ENUM:
* ((char *) rta + what->a2.i) = v1.val.i;
break;
case T_IP: case T_IP:
* (ip_addr *) ((char *) rta + what->a2.i) = v1.val.px.ip; * (ip_addr *) ((char *) rta + what->a2.i) = v1.val.px.ip;
break; break;
case T_ENUM_SCOPE:
rta->scope = v1.val.i;
break;
case T_ENUM_RTD:
i = v1.val.i;
if ((i != RTD_BLACKHOLE) && (i != RTD_UNREACHABLE) && (i != RTD_PROHIBIT))
runtime( "Destination can be changed only to blackhole, unreachable or prohibit" );
rta->dest = i;
rta->gw = IPA_NONE;
rta->iface = NULL;
rta->nexthops = NULL;
break;
default: default:
bug( "Unknown type in set of static attribute" ); bug( "Unknown type in set of static attribute" );
} }