From 9c9050ff12c52762708dadda78a05108a5b533b2 Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Wed, 13 Jun 2018 14:47:37 +0200 Subject: [PATCH] BGP: Handle missing NEXT_HOP attribute properly RFC 7606 specifies handle-as-withdraw instead of session reset. --- proto/bgp/attrs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c index 9003feb2..d7a4e692 100644 --- a/proto/bgp/attrs.c +++ b/proto/bgp/attrs.c @@ -1109,6 +1109,9 @@ bgp_decode_attrs(struct bgp_parse_state *s, byte *data, uint len) if (!BIT32_TEST(s->attrs_seen, BA_AS_PATH)) { REPORT(NO_MANDATORY, "AS_PATH"); goto withdraw; } + if (s->ip_reach_len && !BIT32_TEST(s->attrs_seen, BA_NEXT_HOP)) + { REPORT(NO_MANDATORY, "NEXT_HOP"); goto withdraw; } + /* When receiving attributes from non-AS4-aware BGP speaker, we have to reconstruct AS_PATH and AGGREGATOR attributes; RFC 6793 4.2.3 */ if (!p->as4_session)