diff options
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/bgp/bgp.c | 2 | ||||
| -rw-r--r-- | proto/bgp/packets.c | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index 8dedde9f..512220ae 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -1405,7 +1405,7 @@ bgp_start_locked(struct object_lock *lock) p->neigh = n; - if (n->scope <= 0) + if (n->scope < 0) BGP_TRACE(D_EVENTS, "Waiting for %I%J to become my neighbor", cf->remote_ip, cf->iface); else if (p->cf->check_link && !(n->iface->flags & IF_LINK_UP)) BGP_TRACE(D_EVENTS, "Waiting for link on %s", n->iface->name); diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c index 26716573..cc3ab6f7 100644 --- a/proto/bgp/packets.c +++ b/proto/bgp/packets.c @@ -775,7 +775,8 @@ bgp_rx_open(struct bgp_conn *conn, byte *pkt, uint len) ({ REPORT(msg, ## args); s->err_withdraw = 1; return; }) #define BAD_AFI "Unexpected AF <%u/%u> in UPDATE" -#define BAD_NEXT_HOP "Invalid NEXT_HOP attribute" +#define BAD_NEXT_HOP "Invalid NEXT_HOP attribute %d" +#define BAD_NEXT_HOP2 "Invalid NEXT_HOP attribute %d %I %I" #define NO_NEXT_HOP "Missing NEXT_HOP attribute" #define NO_LABEL_STACK "Missing MPLS stack" @@ -796,8 +797,10 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll) else if (ipa_nonzero(ll)) nbr = neigh_find(&p->p, ll, p->neigh->iface, 0); + REPORT("DIRECT: %d %d %p %d", ipa_nonzero(gw), ipa_nonzero(ll), nbr, nbr?nbr->scope == SCOPE_HOST:-1); + if (!nbr || (nbr->scope == SCOPE_HOST)) - WITHDRAW(BAD_NEXT_HOP); + WITHDRAW(BAD_NEXT_HOP, 1); a->dest = RTD_UNICAST; a->nh.gw = nbr->addr; @@ -806,7 +809,7 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll) else /* GW_RECURSIVE */ { if (ipa_zero(gw)) - WITHDRAW(BAD_NEXT_HOP); + WITHDRAW(BAD_NEXT_HOP, 2); rtable *tab = ipa_is_ip4(gw) ? c->igp_table_ip4 : c->igp_table_ip6; s->hostentry = rt_get_hostentry(tab, gw, ll, c->c.table); @@ -967,16 +970,16 @@ bgp_update_next_hop_ip(struct bgp_export_state *s, eattr *a, ea_list **to) /* Forbid zero next hop */ if (ipa_zero(nh[0]) && ((len != 32) || ipa_zero(nh[1]))) - WITHDRAW(BAD_NEXT_HOP); + WITHDRAW(BAD_NEXT_HOP2, 3, nh[0], nh[1]); /* Forbid next hop equal to neighbor IP */ if (ipa_equal(peer, nh[0]) || ((len == 32) && ipa_equal(peer, nh[1]))) - WITHDRAW(BAD_NEXT_HOP); + WITHDRAW(BAD_NEXT_HOP, 4); /* Forbid next hop with non-matching AF */ if ((ipa_is_ip4(nh[0]) != bgp_channel_is_ipv4(s->channel)) && !s->channel->ext_next_hop) - WITHDRAW(BAD_NEXT_HOP); + WITHDRAW(BAD_NEXT_HOP, 5); /* Just check if MPLS stack */ if (s->mpls && !bgp_find_attr(*to, BA_MPLS_LABEL_STACK)) @@ -1048,7 +1051,7 @@ bgp_decode_next_hop_ip(struct bgp_parse_state *s, byte *data, uint len, rta *a) ad->length = 16; if ((bgp_channel_is_ipv4(c) != ipa_is_ip4(nh[0])) && !c->ext_next_hop) - WITHDRAW(BAD_NEXT_HOP); + WITHDRAW(BAD_NEXT_HOP, 6); // XXXX validate next hop @@ -1129,7 +1132,7 @@ bgp_decode_next_hop_vpn(struct bgp_parse_state *s, byte *data, uint len, rta *a) bgp_parse_error(s, 9); if ((bgp_channel_is_ipv4(c) != ipa_is_ip4(nh[0])) && !c->ext_next_hop) - WITHDRAW(BAD_NEXT_HOP); + WITHDRAW(BAD_NEXT_HOP, 7); // XXXX validate next hop |