Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BIRD Internet Routing Daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
labs
BIRD Internet Routing Daemon
Commits
3e52d112
Commit
3e52d112
authored
Sep 27, 2017
by
Jan Maria Matejka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Docs: Update to v2.0
parent
517d05df
Pipeline
#27904
failed with stages
in 7 minutes and 28 seconds
Changes
5
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
665 additions
and
493 deletions
+665
-493
conf/conf.c
conf/conf.c
+0
-5
conf/conf.h
conf/conf.h
+0
-3
doc/bird.sgml
doc/bird.sgml
+656
-451
filter/config.Y
filter/config.Y
+8
-15
nest/config.Y
nest/config.Y
+1
-19
No files found.
conf/conf.c
View file @
3e52d112
...
...
@@ -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
View file @
3e52d112
...
...
@@ -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
View file @
3e52d112
This diff is collapsed.
Click to expand it.
filter/config.Y
View file @
3e52d112
...
...
@@ -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_tail
1 bgp_path_tail2
%type <h> bgp_path bgp_path_tail
%type <t> get_cf_position
CF_GRAMMAR
...
...
@@ -763,25 +763,18 @@ bgp_path_expr:
;
bgp_path:
PO bgp_path_tail1 PC { $$ = $2; }
| '/' bgp_path_tail2 '/' { $$ = $2; }
PO bgp_path_tail PC { $$ = $2; }
;
bgp_path_tail
1
:
NUM bgp_path_tail
1
{ $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASN; $$->val = $1; }
| NUM DDOT NUM bgp_path_tail
1
{ $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $4; $$->kind = PM_ASN_RANGE; $$->val = $1; $$->val2 = $3; }
| '*' bgp_path_tail
1
{ $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASTERISK; }
| '?' bgp_path_tail
1
{ $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_QUESTION; }
| bgp_path_expr bgp_path_tail
1
{ $$ = cfg_allocz(sizeof(struct f_path_mask)); $$->next = $2; $$->kind = PM_ASN_EXPR; $$->val = (uintptr_t) $1; }
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; }
;
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:
NUM { $$ = f_new_inst(); $$->code = 'c'; $$->aux = T_INT; $$->a2.i = $1; }
| TRUE { $$ = f_new_inst(); $$->code = 'c'; $$->aux = T_BOOL; $$->a2.i = 1; }
...
...
nest/config.Y
View file @
3e52d112
...
...
@@ -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; } ;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment