diff options
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/bgp/bgp.c | 1 | ||||
| -rw-r--r-- | proto/bgp/config.Y | 1 | ||||
| -rw-r--r-- | proto/ospf/config.Y | 1 | ||||
| -rw-r--r-- | proto/ospf/ospf.c | 1 | ||||
| -rw-r--r-- | proto/pipe/config.Y | 1 | ||||
| -rw-r--r-- | proto/pipe/pipe.c | 1 | ||||
| -rw-r--r-- | proto/rip/rip.c | 2 | ||||
| -rw-r--r-- | proto/static/static.c | 2 |
8 files changed, 5 insertions, 5 deletions
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index 66fdc603..4d3c32fb 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -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, diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y index 5fb60940..78ca52de 100644 --- a/proto/bgp/config.Y +++ b/proto/bgp/config.Y @@ -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; diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 4ada41e8..24e125a7 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -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; diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index ce7ad37c..73c06c27 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -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, diff --git a/proto/pipe/config.Y b/proto/pipe/config.Y index 4478afe7..40637558 100644 --- a/proto/pipe/config.Y +++ b/proto/pipe/config.Y @@ -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; } ; diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c index 420c5a9d..fe8618b6 100644 --- a/proto/pipe/pipe.c +++ b/proto/pipe/pipe.c @@ -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, diff --git a/proto/rip/rip.c b/proto/rip/rip.c index 543aa306..f0a41347 100644 --- a/proto/rip/rip.c +++ b/proto/rip/rip.c @@ -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, diff --git a/proto/static/static.c b/proto/static/static.c index f6c2a33f..aaa9bfad 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -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, |