Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes a problem with BGP protocols and implicit router IDs.

Browse source
This commit is contained in:
Ondrej Zajicek 2011-04-01 13:54:39 +02:00
parent d93a43a57d
commit 4ef0950603
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nest/proto.c
View file

@ -31,6 +31,7 @@ list active_proto_list;
static list inactive_proto_list; static list inactive_proto_list;
static list initial_proto_list; static list initial_proto_list;
static list flush_proto_list; static list flush_proto_list;
static struct proto *initial_device_proto;
static event *proto_flush_event; static event *proto_flush_event;
@ -248,6 +249,8 @@ protos_postconfig(struct config *c)
DBG("\n"); DBG("\n");
} }
extern struct protocol proto_unix_iface;
static struct proto * static struct proto *
proto_init(struct proto_config *c) proto_init(struct proto_config *c)
{ {
@ -257,6 +260,9 @@ proto_init(struct proto_config *c)
q->proto_state = PS_DOWN; q->proto_state = PS_DOWN;
q->core_state = FS_HUNGRY; q->core_state = FS_HUNGRY;
proto_enqueue(&initial_proto_list, q); proto_enqueue(&initial_proto_list, q);
if (p == &proto_unix_iface)
initial_device_proto = q;
add_tail(&proto_list, &q->glob_node); add_tail(&proto_list, &q->glob_node);
PD(q, "Initializing%s", q->disabled ? " [disabled]" : ""); PD(q, "Initializing%s", q->disabled ? " [disabled]" : "");
return q; return q;
@ -413,6 +419,14 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
DBG("\tdone\n"); DBG("\tdone\n");
DBG("Protocol start\n"); DBG("Protocol start\n");
/* Start device protocol first */
if (initial_device_proto)
{
proto_rethink_goal(initial_device_proto);
initial_device_proto = NULL;
}
WALK_LIST_DELSAFE(p, n, initial_proto_list) WALK_LIST_DELSAFE(p, n, initial_proto_list)
proto_rethink_goal(p); proto_rethink_goal(p);
} }
@ -741,8 +755,6 @@ proto_notify_state(struct proto *p, unsigned ps)
} }
} }
extern struct protocol proto_unix_iface;
static void static void
proto_flush_all(void *unused UNUSED) proto_flush_all(void *unused UNUSED)
{ {

7
proto/bgp/bgp.c
View file

@ -798,6 +798,10 @@ bgp_start(struct proto *P)
p->startup_timer->hook = bgp_startup_timeout; p->startup_timer->hook = bgp_startup_timeout;
p->startup_timer->data = p; p->startup_timer->data = p;
p->local_id = proto_get_router_id(P->cf);
if (p->rr_client)
p->rr_cluster_id = p->cf->rr_cluster_id ? p->cf->rr_cluster_id : p->local_id;
p->remote_id = 0; p->remote_id = 0;
p->source_addr = p->cf->source_addr; p->source_addr = p->cf->source_addr;
@ -874,11 +878,8 @@ bgp_init(struct proto_config *C)
p->local_as = c->local_as; p->local_as = c->local_as;
p->remote_as = c->remote_as; p->remote_as = c->remote_as;
p->is_internal = (c->local_as == c->remote_as); p->is_internal = (c->local_as == c->remote_as);
p->local_id = proto_get_router_id(C);
p->rs_client = c->rs_client; p->rs_client = c->rs_client;
p->rr_client = c->rr_client; p->rr_client = c->rr_client;
if (p->rr_client)
p->rr_cluster_id = c->rr_cluster_id ? c->rr_cluster_id : p->local_id;
p->igp_table = get_igp_table(c); p->igp_table = get_igp_table(c);
return P; return P;