mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-22 09:41:54 +00:00
Docs: Update to v2.0
This commit is contained in:
parent
517d05dff1
commit
3e52d112d7
@ -219,11 +219,6 @@ global_commit(struct config *new, struct config *old)
|
|||||||
if (!old)
|
if (!old)
|
||||||
return 0;
|
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)
|
if (!new->router_id)
|
||||||
{
|
{
|
||||||
new->router_id = old->router_id;
|
new->router_id = old->router_id;
|
||||||
|
@ -32,9 +32,6 @@ struct config {
|
|||||||
struct iface_patt *router_id_from; /* Configured list of router ID iface patterns */
|
struct iface_patt *router_id_from; /* Configured list of router ID iface patterns */
|
||||||
|
|
||||||
u32 router_id; /* Our Router ID */
|
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_debug; /* Default protocol debug mask */
|
||||||
unsigned proto_default_mrtdump; /* Default protocol mrtdump mask */
|
unsigned proto_default_mrtdump; /* Default protocol mrtdump mask */
|
||||||
struct timeformat tf_route; /* Time format for 'show route' */
|
struct timeformat tf_route; /* Time format for 'show route' */
|
||||||
|
1049
doc/bird.sgml
1049
doc/bird.sgml
File diff suppressed because it is too large
Load Diff
@ -421,7 +421,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
|
|||||||
%type <v> set_atom switch_atom fipa
|
%type <v> set_atom switch_atom fipa
|
||||||
%type <px> fprefix
|
%type <px> fprefix
|
||||||
%type <s> decls declsn one_decl function_params
|
%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
|
%type <t> get_cf_position
|
||||||
|
|
||||||
CF_GRAMMAR
|
CF_GRAMMAR
|
||||||
@ -763,25 +763,18 @@ bgp_path_expr:
|
|||||||
;
|
;
|
||||||
|
|
||||||
bgp_path:
|
bgp_path:
|
||||||
PO bgp_path_tail1 PC { $$ = $2; }
|
PO bgp_path_tail PC { $$ = $2; }
|
||||||
| '/' bgp_path_tail2 '/' { $$ = $2; }
|
|
||||||
;
|
;
|
||||||
|
|
||||||
bgp_path_tail1:
|
bgp_path_tail:
|
||||||
NUM bgp_path_tail1 { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASN; $$->val = $1; }
|
NUM bgp_path_tail { $$ = 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; }
|
| 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_tail1 { $$ = 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_ASTERISK; }
|
||||||
| '?' bgp_path_tail1 { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_QUESTION; }
|
| '?' bgp_path_tail { $$ = 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; }
|
| bgp_path_expr bgp_path_tail { $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASN_EXPR; $$->val = (uintptr_t) $1; }
|
||||||
| { $$ = NULL; }
|
| { $$ = 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; }
|
|
||||||
| { $$ = NULL; }
|
|
||||||
;
|
|
||||||
|
|
||||||
constant:
|
constant:
|
||||||
NUM { $$ = f_new_inst(); $$->code = 'c'; $$->aux = T_INT; $$->a2.i = $1; }
|
NUM { $$ = f_new_inst(); $$->code = 'c'; $$->aux = T_INT; $$->a2.i = $1; }
|
||||||
| TRUE { $$ = f_new_inst(); $$->code = 'c'; $$->aux = T_BOOL; $$->a2.i = 1; }
|
| TRUE { $$ = f_new_inst(); $$->code = 'c'; $$->aux = T_BOOL; $$->a2.i = 1; }
|
||||||
|
@ -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(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES)
|
||||||
CF_KEYWORDS(ALGORITHM, KEYED, HMAC, MD5, SHA1, SHA256, SHA384, SHA512)
|
CF_KEYWORDS(ALGORITHM, KEYED, HMAC, MD5, SHA1, SHA256, SHA384, SHA512)
|
||||||
CF_KEYWORDS(PRIMARY, STATS, COUNT, BY, FOR, COMMANDS, PREEXPORT, NOEXPORT, GENERATE)
|
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(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(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US)
|
||||||
CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, FLUSH, AS)
|
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)
|
CF_ADDTO(conf, gr_opts)
|
||||||
|
|
||||||
gr_opts: GRACEFUL RESTART WAIT expr ';' { new_config->gr_wait = $4; } ;
|
gr_opts: GRACEFUL RESTART WAIT expr ';' { new_config->gr_wait = $4; } ;
|
||||||
|
Loading…
Reference in New Issue
Block a user