mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 07:31:54 +00:00
Code Releases Activity

Merge commit '1149aa977d906a6400f998d5f6600871584395d0' into integrated

Browse Source
This commit is contained in:
Ondrej Zajicek 2014-05-18 14:51:18 +02:00
commit c8f2f4811d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nest/proto.c
View File

@ -605,6 +605,7 @@ proto_rethink_goal(struct proto *p)
{ {
struct proto_config *nc = p->cf_new; struct proto_config *nc = p->cf_new;
DBG("%s has shut down for reconfiguration\n", p->name); DBG("%s has shut down for reconfiguration\n", p->name);
p->cf->proto = NULL;
config_del_obstacle(p->cf->global); config_del_obstacle(p->cf->global);
rem_node(&p->n); rem_node(&p->n);
rem_node(&p->glob_node); rem_node(&p->glob_node);

2
proto/bgp/packets.c
View File

@ -1112,7 +1112,7 @@ bgp_do_rx_update(struct bgp_conn *conn,
if (conn->state != BS_ESTABLISHED) /* fatal error during decoding */ if (conn->state != BS_ESTABLISHED) /* fatal error during decoding */
return; return;
if (a0 && ! bgp_set_next_hop(p, a0)) if (a0 && nlri_len && !bgp_set_next_hop(p, a0))
a0 = NULL; a0 = NULL;
last_id = 0; last_id = 0;