From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Thu, 4 Apr 2024 17:07:53 +0000 (+0300)
Subject: Revert "bgpd: fix 6vpe nexthop"
X-Git-Tag: docker/10.0~3^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0966f80ff74338f59e71b439970ae37e91f6d45c;p=matthieu%2Ffrr.git

Revert "bgpd: fix 6vpe nexthop"

This reverts commit 0325116a27258e1df773a046e8668a029bead60c.
---

diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c
index bff52c80d8..7502bf2ec6 100644
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@ -523,16 +523,11 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
 			gnh_modified = 1;
 		}
 
-		if (peer->nexthop.v4.s_addr != INADDR_ANY &&
-		    (IN6_IS_ADDR_UNSPECIFIED(mod_v6nhg) ||
-		     (peer->connection->su.sa.sa_family == AF_INET &&
-		      paf->afi == AFI_IP6))) {
-			/* set a IPv4 mapped IPv6 address if no global IPv6
-			 * address is found or if announcing IPv6 prefix
-			 * over an IPv4 BGP session.
-			 */
-			ipv4_to_ipv4_mapped_ipv6(mod_v6nhg, peer->nexthop.v4);
-			gnh_modified = 1;
+		if (IN6_IS_ADDR_UNSPECIFIED(mod_v6nhg)) {
+			if (peer->nexthop.v4.s_addr != INADDR_ANY) {
+				ipv4_to_ipv4_mapped_ipv6(mod_v6nhg,
+							 peer->nexthop.v4);
+			}
 		}
 
 		if (IS_MAPPED_IPV6(&peer->nexthop.v6_global)) {