From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 18 Sep 2018 10:46:42 +0000 (+0200)
Subject: Merge branch 'pr/2986'
X-Git-Tag: frr-7.1-dev~358
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2564f080da643863d031a39c8079aec9c34718b3;p=matthieu%2Ffrr.git

Merge branch 'pr/2986'

Conflicts:
	bgpd/bgp_network.c (BGP_ERR_* -> EC_BGP_*)

Signed-off-by: David Lamparter <equinox@diac24.net>
---

2564f080da643863d031a39c8079aec9c34718b3
diff --cc bgpd/bgp_network.c
index 458edab50d,f6cad64617..d56fdd75ce
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@@ -618,15 -619,12 +620,12 @@@ int bgp_getsockname(struct peer *peer
  	if (!peer->su_remote)
  		return -1;
  
- 	if (bgp_nexthop_set(peer->su_local, peer->su_remote, &peer->nexthop,
- 			    peer)) {
- #if defined(HAVE_CUMULUS)
- 		flog_err(
- 			EC_BGP_NH_UPD,
- 			"%s: nexthop_set failed, resetting connection - intf %p",
- 			peer->host, peer->nexthop.ifp);
+ 	if (!bgp_zebra_nexthop_set(peer->su_local, peer->su_remote,
+ 				   &peer->nexthop, peer)) {
 -		flog_err(BGP_ERR_NH_UPD,
++		flog_err(EC_BGP_NH_UPD,
+ 			 "%s: nexthop_set failed, resetting connection - intf %p",
+ 			 peer->host, peer->nexthop.ifp);
  		return -1;
- #endif
  	}
  	return 0;
  }