Docs: Update to v2.0 (3e52d112) · Commits · 戴 / Bird

conf/conf.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -219,11 +219,6 @@ global_commit(struct config new, struct config old)
		if (!old)
		return 0;

		if (!ipa_equal(old->listen_bgp_addr, new->listen_bgp_addr) \|\|
		(old->listen_bgp_port != new->listen_bgp_port) \|\|
		(old->listen_bgp_flags != new->listen_bgp_flags))
		log(L_WARN "Reconfiguration of BGP listening socket not implemented, please restart BIRD.");

		if (!new->router_id)
		{
		new->router_id = old->router_id;

conf/conf.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -32,9 +32,6 @@ struct config {
		struct iface_patt router_id_from; / Configured list of router ID iface patterns */

		u32 router_id; /* Our Router ID */
		ip_addr listen_bgp_addr; /* Listening BGP socket should use this address */
		unsigned listen_bgp_port; /* Listening BGP socket should use this port (0 is default) */
		u32 listen_bgp_flags; /* Listening BGP socket should use these flags */
		unsigned proto_default_debug; /* Default protocol debug mask */
		unsigned proto_default_mrtdump; /* Default protocol mrtdump mask */
		struct timeformat tf_route; /* Time format for 'show route' */

doc/bird.sgml

+656 −451

File changed.

Preview size limit exceeded, changes collapsed.

filter/config.Y

+8 −15

Original line number	Diff line number	Diff line
		@@ -421,7 +421,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
		%type <v> set_atom switch_atom fipa
		%type <px> fprefix
		%type <s> decls declsn one_decl function_params
		%type <h> bgp_path bgp_path_tail1 bgp_path_tail2
		%type <h> bgp_path bgp_path_tail
		%type <t> get_cf_position

		CF_GRAMMAR
		@@ -763,22 +763,15 @@ bgp_path_expr:
		;

		bgp_path:
		PO bgp_path_tail1 PC { $$ = $2; }
		\| '/' bgp_path_tail2 '/' { $$ = $2; }
		PO bgp_path_tail PC { $$ = $2; }
		;

		bgp_path_tail1:
		NUM bgp_path_tail1 { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASN; $$->val = $1; }
		\| NUM DDOT NUM bgp_path_tail1 { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $4; $$->kind = PM_ASN_RANGE; $$->val = $1; $$->val2 = $3; }
		\| '*' bgp_path_tail1 { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASTERISK; }
		\| '?' bgp_path_tail1 { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_QUESTION; }
		\| bgp_path_expr bgp_path_tail1 { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASN_EXPR; $$->val = (uintptr_t) $1; }
		\| { $$ = NULL; }
		;

		bgp_path_tail2:
		NUM bgp_path_tail2 { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASN; $$->val = $1; }
		\| '?' bgp_path_tail2 { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASTERISK; }
		bgp_path_tail:
		NUM bgp_path_tail { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASN; $$->val = $1; }
		\| NUM DDOT NUM bgp_path_tail { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $4; $$->kind = PM_ASN_RANGE; $$->val = $1; $$->val2 = $3; }
		\| '*' bgp_path_tail { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASTERISK; }
		\| '?' bgp_path_tail { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_QUESTION; }
		\| bgp_path_expr bgp_path_tail { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASN_EXPR; $$->val = (uintptr_t) $1; }
		\| { $$ = NULL; }
		;

nest/config.Y

+1 −19

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERE
		CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES)
		CF_KEYWORDS(ALGORITHM, KEYED, HMAC, MD5, SHA1, SHA256, SHA384, SHA512)
		CF_KEYWORDS(PRIMARY, STATS, COUNT, BY, FOR, COMMANDS, PREEXPORT, NOEXPORT, GENERATE)
		CF_KEYWORDS(LISTEN, BGP, V6ONLY, DUAL, ADDRESS, PORT, PASSWORDS, DESCRIPTION, SORTED)
		CF_KEYWORDS(BGP, PASSWORDS, DESCRIPTION, SORTED)
		CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC, CLASS, DSCP)
		CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US)
		CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, FLUSH, AS)
		@@ -124,24 +124,6 @@ idval:
		}
		;


		CF_ADDTO(conf, listen)

		listen: LISTEN BGP listen_opts ';' ;

		listen_opts:
		/* Nothing */
		\| listen_opts listen_opt
		;

		listen_opt:
		ADDRESS ipa { new_config->listen_bgp_addr = $2; }
		\| PORT expr { new_config->listen_bgp_port = $2; }
		\| V6ONLY { new_config->listen_bgp_flags = 0; }
		\| DUAL { new_config->listen_bgp_flags = 1; }
		;


		CF_ADDTO(conf, gr_opts)

		gr_opts: GRACEFUL RESTART WAIT expr ';' { new_config->gr_wait = $4; } ;

Admin message