Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
labs
BIRD Internet Routing Daemon
Commits
39c028e9
Commit
39c028e9
authored
Jan 24, 2012
by
Ondřej Zajíček
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Assign default protocol preference via proto_config_new().
The patch from Alexander V. Chernikov.
parent
09686693
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
10 additions
and
8 deletions
+10
-8
nest/config.Y
nest/config.Y
+0
-1
nest/proto.c
nest/proto.c
+1
-0
nest/protocol.h
nest/protocol.h
+1
-0
nest/rt-dev.c
nest/rt-dev.c
+1
-0
proto/bgp/bgp.c
proto/bgp/bgp.c
+1
-0
proto/bgp/config.Y
proto/bgp/config.Y
+0
-1
proto/ospf/config.Y
proto/ospf/config.Y
+0
-1
proto/ospf/ospf.c
proto/ospf/ospf.c
+1
-0
proto/pipe/config.Y
proto/pipe/config.Y
+0
-1
proto/pipe/pipe.c
proto/pipe/pipe.c
+1
-0
proto/rip/rip.c
proto/rip/rip.c
+1
-1
proto/static/static.c
proto/static/static.c
+1
-1
sysdep/unix/krt.Y
sysdep/unix/krt.Y
+0
-2
sysdep/unix/krt.c
sysdep/unix/krt.c
+2
-0
No files found.
nest/config.Y
View file @
39c028e9
...
...
@@ -219,7 +219,6 @@ CF_ADDTO(proto, dev_proto '}')
dev_proto_start: proto_start DIRECT {
this_proto = proto_config_new(&proto_device, sizeof(struct rt_dev_config), $1);
this_proto->preference = DEF_PREF_DIRECT;
init_list(&DIRECT_CFG->iface_list);
}
;
...
...
nest/proto.c
View file @
39c028e9
...
...
@@ -200,6 +200,7 @@ proto_config_new(struct protocol *pr, unsigned size, int class)
c
->
global
=
new_config
;
c
->
protocol
=
pr
;
c
->
name
=
pr
->
name
;
c
->
preference
=
pr
->
preference
;
c
->
class
=
class
;
c
->
out_filter
=
FILTER_REJECT
;
c
->
table
=
c
->
global
->
master_rtc
;
...
...
nest/protocol.h
View file @
39c028e9
...
...
@@ -39,6 +39,7 @@ struct protocol {
char
*
template
;
/* Template for automatic generation of names */
int
name_counter
;
/* Counter for automatic name generation */
int
attr_class
;
/* Attribute class known to this protocol */
unsigned
preference
;
/* Default protocol preference */
void
(
*
preconfig
)(
struct
protocol
*
,
struct
config
*
);
/* Just before configuring */
void
(
*
postconfig
)(
struct
proto_config
*
);
/* After configuring each instance */
...
...
nest/rt-dev.c
View file @
39c028e9
...
...
@@ -109,6 +109,7 @@ dev_copy_config(struct proto_config *dest, struct proto_config *src)
struct
protocol
proto_device
=
{
name:
"Direct"
,
template:
"direct%d"
,
preference:
DEF_PREF_DIRECT
,
init:
dev_init
,
reconfigure:
dev_reconfigure
,
copy_config:
dev_copy_config
...
...
proto/bgp/bgp.c
View file @
39c028e9
...
...
@@ -1178,6 +1178,7 @@ struct protocol proto_bgp = {
name:
"BGP"
,
template:
"bgp%d"
,
attr_class:
EAP_BGP
,
preference:
DEF_PREF_BGP
,
init:
bgp_init
,
start:
bgp_start
,
shutdown:
bgp_shutdown
,
...
...
proto/bgp/config.Y
View file @
39c028e9
...
...
@@ -33,7 +33,6 @@ CF_ADDTO(proto, bgp_proto '}' { bgp_check_config(BGP_CFG); } )
bgp_proto_start: proto_start BGP {
this_proto = proto_config_new(&proto_bgp, sizeof(struct bgp_config), $1);
this_proto->preference = DEF_PREF_BGP;
BGP_CFG->hold_time = 240;
BGP_CFG->connect_retry_time = 120;
BGP_CFG->initial_hold_time = 240;
...
...
proto/ospf/config.Y
View file @
39c028e9
...
...
@@ -129,7 +129,6 @@ CF_ADDTO(proto, ospf_proto '}' { ospf_proto_finish(); } )
ospf_proto_start: proto_start OSPF {
this_proto = proto_config_new(&proto_ospf, sizeof(struct ospf_config), $1);
this_proto->preference = DEF_PREF_OSPF;
init_list(&OSPF_CFG->area_list);
init_list(&OSPF_CFG->vlink_list);
OSPF_CFG->rfc1583 = DEFAULT_RFC1583;
...
...
proto/ospf/ospf.c
View file @
39c028e9
...
...
@@ -1542,6 +1542,7 @@ struct protocol proto_ospf = {
name:
"OSPF"
,
template:
"ospf%d"
,
attr_class:
EAP_OSPF
,
preference:
DEF_PREF_OSPF
,
init:
ospf_init
,
dump:
ospf_dump
,
start:
ospf_start
,
...
...
proto/pipe/config.Y
View file @
39c028e9
...
...
@@ -24,7 +24,6 @@ CF_ADDTO(proto, pipe_proto '}')
pipe_proto_start: proto_start PIPE {
this_proto = proto_config_new(&proto_pipe, sizeof(struct pipe_config), $1);
this_proto->preference = DEF_PREF_PIPE;
PIPE_CFG->mode = PIPE_TRANSPARENT;
}
;
...
...
proto/pipe/pipe.c
View file @
39c028e9
...
...
@@ -197,6 +197,7 @@ pipe_get_status(struct proto *P, byte *buf)
struct
protocol
proto_pipe
=
{
name:
"Pipe"
,
template:
"pipe%d"
,
preference:
DEF_PREF_PIPE
,
postconfig:
pipe_postconfig
,
init:
pipe_init
,
start:
pipe_start
,
...
...
proto/rip/rip.c
View file @
39c028e9
...
...
@@ -975,7 +975,6 @@ void
rip_init_config
(
struct
rip_proto_config
*
c
)
{
init_list
(
&
c
->
iface_list
);
c
->
c
.
preference
=
DEF_PREF_RIP
;
c
->
infinity
=
16
;
c
->
port
=
520
;
c
->
period
=
30
;
...
...
@@ -1032,6 +1031,7 @@ struct protocol proto_rip = {
name:
"RIP"
,
template:
"rip%d"
,
attr_class:
EAP_RIP
,
preference:
DEF_PREF_RIP
,
get_route_info:
rip_get_route_info
,
get_attr:
rip_get_attr
,
...
...
proto/static/static.c
View file @
39c028e9
...
...
@@ -353,7 +353,6 @@ static_if_notify(struct proto *p, unsigned flags, struct iface *i)
void
static_init_config
(
struct
static_config
*
c
)
{
c
->
c
.
preference
=
DEF_PREF_STATIC
;
init_list
(
&
c
->
iface_routes
);
init_list
(
&
c
->
other_routes
);
}
...
...
@@ -523,6 +522,7 @@ static_copy_config(struct proto_config *dest, struct proto_config *src)
struct
protocol
proto_static
=
{
name:
"Static"
,
template:
"static%d"
,
preference:
DEF_PREF_STATIC
,
init:
static_init
,
dump:
static_dump
,
start:
static_start
,
...
...
sysdep/unix/krt.Y
View file @
39c028e9
...
...
@@ -31,7 +31,6 @@ kern_proto_start: proto_start KERNEL {
cf_error("Kernel protocol already defined");
#endif
cf_krt = this_proto = proto_config_new(&proto_unix_kernel, sizeof(struct krt_config), $1);
this_proto->preference = DEF_PREF_INHERITED;
THIS_KRT->scan_time = 60;
THIS_KRT->learn = THIS_KRT->persist = 0;
krt_scan_construct(THIS_KRT);
...
...
@@ -67,7 +66,6 @@ kif_proto_start: proto_start DEVICE {
if (cf_kif)
cf_error("Kernel device protocol already defined");
cf_kif = this_proto = proto_config_new(&proto_unix_iface, sizeof(struct kif_config), $1);
this_proto->preference = DEF_PREF_DIRECT;
THIS_KIF->scan_time = 60;
init_list(&THIS_KIF->primary);
krt_if_construct(THIS_KIF);
...
...
sysdep/unix/krt.c
View file @
39c028e9
...
...
@@ -243,6 +243,7 @@ kif_copy_config(struct proto_config *dest, struct proto_config *src)
struct
protocol
proto_unix_iface
=
{
name:
"Device"
,
template:
"device%d"
,
preference:
DEF_PREF_DIRECT
,
preconfig:
kif_preconfig
,
init:
kif_init
,
start:
kif_start
,
...
...
@@ -968,6 +969,7 @@ struct protocol proto_unix_kernel = {
name:
"Kernel"
,
template:
"kernel%d"
,
attr_class:
EAP_KRT
,
preference:
DEF_PREF_INHERITED
,
preconfig:
krt_preconfig
,
postconfig:
krt_postconfig
,
init:
krt_init
,
...
...
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