Commit c8f2f481 authored by Ondrej Zajicek's avatar Ondrej Zajicek
Browse files

Merge commit '1149aa97' into integrated

parents abffa9d4 1149aa97

nest/proto.c

+1 −0
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ proto_rethink_goal(struct proto *p) 
    {

      struct proto_config *nc = p->cf_new;

      DBG("%s has shut down for reconfiguration\n", p->name);

      p->cf->proto = NULL;

      config_del_obstacle(p->cf->global);

      rem_node(&p->n);

      rem_node(&p->glob_node);

proto/bgp/packets.c

+1 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ bgp_do_rx_update(struct bgp_conn *conn, 
  if (conn->state != BS_ESTABLISHED)	/* fatal error during decoding */

    return;



  if (a0 && ! bgp_set_next_hop(p, a0))

  if (a0 && nlri_len && !bgp_set_next_hop(p, a0))

    a0 = NULL;



  last_id = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE