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

Changed syntax of attaching filters to protocols to hopefully the final

Browse source 
version:

	EXPORT <filter-spec>	for outbound routes (i.e., those announced
				by BIRD to the rest of the world).
	IMPORT <filter-spec>	for inbound routes (i.e., those imported
				by BIRD from the rest of the world).

where <filter-spec> is one of:

	ALL			pass all routes
	NONE			drop all routes
	FILTER <name>		use named filter
	FILTER { <filter> }	use explicitly defined filter

For all protocols, the default is IMPORT ALL, EXPORT NONE. This includes
the kernel protocol, so that you need to add EXPORT ALL to get the previous
configuration of kernel syncer (as usually, see doc/bird.conf.example for
a bird.conf example :)).
This commit is contained in:
Martin Mares 1999-04-05 20:15:31 +00:00
parent 63a381dbf5
commit 5056c559c4
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/bird.conf.example
View file

@ -27,8 +27,8 @@ protocol kernel {
persist; # Don't remove routes on bird shutdown persist; # Don't remove routes on bird shutdown
scan time 20; # Scan kernel routing table every 20 seconds scan time 20; # Scan kernel routing table every 20 seconds
# async off; # Netlink: Disable asynchronous events # async off; # Netlink: Disable asynchronous events
# input filter sink; # import none; # Default is import all
# output filter okay; export all; # Default is export none
} }
protocol device { protocol device {

13
nest/config.Y
View file

@ -17,9 +17,10 @@ void rt_dev_add_iface(char *);
CF_DECLS CF_DECLS
CF_KEYWORDS(ROUTER, ID, PROTOCOL, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT) CF_KEYWORDS(ROUTER, ID, PROTOCOL, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT)
CF_KEYWORDS(INTERFACE, INPUT, OUTPUT, FILTER) CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE)
%type <i> idval %type <i> idval
%type <f> imexport
CF_GRAMMAR CF_GRAMMAR
@ -67,8 +68,14 @@ proto_item:
| DEBUG expr { this_proto->debug = $2; } | DEBUG expr { this_proto->debug = $2; }
| DEBUG ALL { this_proto->debug = ~0; } | DEBUG ALL { this_proto->debug = ~0; }
| DEBUG OFF { this_proto->debug = 0; } | DEBUG OFF { this_proto->debug = 0; }
| INPUT FILTER filter { this_proto->in_filter = $3; } | IMPORT imexport { this_proto->in_filter = $2; }
| OUTPUT FILTER filter { this_proto->out_filter = $3; } | EXPORT imexport { this_proto->out_filter = $2; }
;
imexport:
FILTER filter { $$ = $2; }
| ALL { $$ = FILTER_ACCEPT; }
| NONE { $$ = FILTER_REJECT; }
; ;
/* Direct device route protocol */ /* Direct device route protocol */

7
nest/proto.c
View file

@ -111,6 +111,7 @@ proto_config_new(struct protocol *pr, unsigned size)
c->proto = pr; c->proto = pr;
c->debug = pr->debug; c->debug = pr->debug;
c->name = pr->name; c->name = pr->name;
c->out_filter = FILTER_REJECT;
return c; return c;
} }
@ -247,9 +248,9 @@ protos_dump_all(void)
debug(" protocol %s (pri=%d): state %s/%s\n", p->name, p->proto->priority, debug(" protocol %s (pri=%d): state %s/%s\n", p->name, p->proto->priority,
p_states[p->proto_state], c_states[p->core_state]); p_states[p->proto_state], c_states[p->core_state]);
if (p->in_filter) if (p->in_filter)
debug("\tInput filter: %s\n", p->in_filter->name); debug("\tInput filter: %s\n", filter_name(p->in_filter));
if (p->out_filter) if (p->out_filter != FILTER_REJECT)
debug("\tOutput filter: %s\n", p->out_filter->name); debug("\tOutput filter: %s\n", filter_name(p->out_filter));
if (p->disabled) if (p->disabled)
debug("\tDISABLED\n"); debug("\tDISABLED\n");
else if (p->proto->dump) else if (p->proto->dump)