diff options
| author | Rafael Zalamena <rzalamena@users.noreply.github.com> | 2018-03-19 15:35:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 15:35:37 +0100 |
| commit | 5a52387a11c907f6435e76ac27741f734106b5a5 (patch) | |
| tree | d4900a7c5da162f7f0643fe8f992c116690bdbf6 | |
| parent | Merge pull request #1924 from donaldsharp/cs (diff) | |
| parent | bgpd: Clean up peer status checking for a received nlri (diff) | |
| download | frr-5a52387a11c907f6435e76ac27741f734106b5a5.tar.xz frr-5a52387a11c907f6435e76ac27741f734106b5a5.zip | |
Merge pull request #1908 from donaldsharp/peer_established
bgpd: Clean up peer status checking for a received nlri
| -rw-r--r-- | bgpd/bgp_evpn.c | 7 | ||||
| -rw-r--r-- | bgpd/bgp_label.c | 4 | ||||
| -rw-r--r-- | bgpd/bgp_mplsvpn.c | 4 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 4 |
4 files changed, 0 insertions, 19 deletions
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c index 94d9cb465..b3d6f388b 100644 --- a/bgpd/bgp_evpn.c +++ b/bgpd/bgp_evpn.c @@ -3754,13 +3754,6 @@ int bgp_nlri_parse_evpn(struct peer *peer, struct attr *attr, u_char rlen; struct prefix p; - /* Check peer status. */ - if (peer->status != Established) { - zlog_err("%u:%s - EVPN update received in state %d", - peer->bgp->vrf_id, peer->host, peer->status); - return -1; - } - /* Start processing the NLRI - there may be multiple in the MP_REACH */ pnt = packet->nlri; lim = pnt + packet->length; diff --git a/bgpd/bgp_label.c b/bgpd/bgp_label.c index 38b39075b..546ed0ed6 100644 --- a/bgpd/bgp_label.c +++ b/bgpd/bgp_label.c @@ -212,10 +212,6 @@ int bgp_nlri_parse_label(struct peer *peer, struct attr *attr, mpls_label_t label = MPLS_INVALID_LABEL; u_char llen; - /* Check peer status. */ - if (peer->status != Established) - return 0; - pnt = packet->nlri; lim = pnt + packet->length; afi = packet->afi; diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 3096afc4c..56676e62c 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -109,10 +109,6 @@ int bgp_nlri_parse_vpn(struct peer *peer, struct attr *attr, int addpath_encoded; u_int32_t addpath_id; - /* Check peer status. */ - if (peer->status != Established) - return 0; - /* Make prefix_rd */ prd.family = AF_UNSPEC; prd.prefixlen = 64; diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 032b33229..35732d1bf 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -4060,10 +4060,6 @@ int bgp_nlri_parse_ip(struct peer *peer, struct attr *attr, int addpath_encoded; u_int32_t addpath_id; - /* Check peer status. */ - if (peer->status != Established) - return 0; - pnt = packet->nlri; lim = pnt + packet->length; afi = packet->afi; |