Merge pull request #18860 from opensourcerouting/build-config-h-20250521

build: the great war against `config.h`, issue 0 of ∞

Author: donaldsharp

bgpd/bgp_bmp.c

@@ -2645,8 +2645,7 @@ static void bmp_active_connect(struct bmp_active *ba)
 		}
 
 
-		res = sockunion_connect(ba->socket, &ba->addrs[ba->addrpos],
-				      htons(ba->port), 0);
+		res = sockunion_connect(ba->socket, &ba->addrs[ba->addrpos], htons(ba->port));
 		switch (res) {
 		case connect_error:
 			zlog_warn("bmp[%s]: failed to connect to %pSU:%d",

bgpd/bgp_network.c

@@ -793,7 +793,6 @@ enum connect_result bgp_connect(struct peer_connection *connection)
 
 	assert(!CHECK_FLAG(connection->thread_flags, PEER_THREAD_WRITES_ON));
 	assert(!CHECK_FLAG(connection->thread_flags, PEER_THREAD_READS_ON));
-	ifindex_t ifindex = 0;
 
 	if (peer->bgp->router_id.s_addr == INADDR_ANY) {
 		peer->last_reset = PEER_DOWN_ROUTER_ID_ZERO;
@@ -880,19 +879,14 @@ enum connect_result bgp_connect(struct peer_connection *connection)
 		return connect_error;
 	}
 
-	if (peer->conf_if || peer->ifname)
-		ifindex = ifname2ifindex(peer->conf_if ? peer->conf_if
-						       : peer->ifname,
-					 peer->bgp->vrf_id);
-
 	if (bgp_debug_neighbor_events(peer))
 		zlog_debug("%s [Event] Connect start to %s fd %d", peer->host,
 			   peer->host, connection->fd);
 
 	/* Connect to the remote peer. */
 	enum connect_result res;
 
-	res = sockunion_connect(connection->fd, &connection->su, htons(peer->port), ifindex);
+	res = sockunion_connect(connection->fd, &connection->su, htons(peer->port));
 
 	if (connection->su_remote)
 		sockunion_free(connection->su_remote);

bgpd/bgp_zebra.c

@@ -911,18 +911,6 @@ bool bgp_zebra_nexthop_set(union sockunion *local, union sockunion *remote,
 	if (shared_network_original != peer->shared_network)
 		bgp_peer_bfd_update_source(peer);
 
-/* KAME stack specific treatment.  */
-#ifdef KAME
-	if (IN6_IS_ADDR_LINKLOCAL(&nexthop->v6_global)
-	    && IN6_LINKLOCAL_IFINDEX(nexthop->v6_global)) {
-		SET_IN6_LINKLOCAL_IFINDEX(nexthop->v6_global, 0);
-	}
-	if (IN6_IS_ADDR_LINKLOCAL(&nexthop->v6_local)
-	    && IN6_LINKLOCAL_IFINDEX(nexthop->v6_local)) {
-		SET_IN6_LINKLOCAL_IFINDEX(nexthop->v6_local, 0);
-	}
-#endif /* KAME */
-
 	/* If we have identified the local interface, there is no error for now.
 	 */
 	return v6_ll_avail;

configure.ac

@@ -1130,14 +1130,15 @@ dnl -------------------------
 dnl Check other header files.
 dnl -------------------------
 AC_CHECK_HEADERS([stropts.h sys/ksym.h \
-	linux/version.h asm/types.h endian.h sys/endian.h])
+	linux/version.h asm/types.h sys/endian.h])
+
+AC_CHECK_HEADER([endian.h], [], [
+  AC_MSG_ERROR([missing endian.h])
+])
 
 AC_CHECK_LIB([atomic], [main], [LIBS="$LIBS -latomic"], [], [])
 
-ac_stdatomic_ok=false
-AC_DEFINE([FRR_AUTOCONF_ATOMIC], [1], [did autoconf checks for atomic funcs])
 AC_CHECK_HEADER([stdatomic.h],[
-
   AC_MSG_CHECKING([whether _Atomic qualifier works])
   AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <stdatomic.h>
@@ -1151,52 +1152,7 @@ int main(int argc, char **argv) {
     ac_stdatomic_ok=true
   ], [
     AC_MSG_RESULT([no])
-  ])
-])
-
-AS_IF([$ac_stdatomic_ok], [true], [
-  AC_MSG_CHECKING([for __atomic_* builtins])
-  AC_LINK_IFELSE([AC_LANG_SOURCE([[
-int main(int argc, char **argv) {
-  volatile int i = 1;
-  __atomic_store_n (&i, 0, __ATOMIC_RELEASE);
-  return __atomic_load_n (&i, __ATOMIC_ACQUIRE);
-}
-]])], [
-    AC_DEFINE([HAVE___ATOMIC], [1], [found __atomic builtins])
-    AC_MSG_RESULT([yes])
-  ], [
-    AC_MSG_RESULT([no])
-
-    dnl FreeBSD 9 has a broken stdatomic.h where _Atomic doesn't work
-    AC_MSG_CHECKING([for __sync_* builtins])
-    AC_LINK_IFELSE([AC_LANG_SOURCE([[
-int main(int argc, char **argv) {
-  volatile int i = 1;
-  __sync_fetch_and_sub (&i, 1);
-  return __sync_val_compare_and_swap (&i, 0, 1);
-}
-]])], [
-      AC_DEFINE([HAVE___SYNC], [1], [found __sync builtins])
-      AC_MSG_RESULT([yes])
-
-      AC_MSG_CHECKING([for __sync_swap builtin])
-      AC_LINK_IFELSE([AC_LANG_SOURCE([[
-int main(int argc, char **argv) {
-  volatile int i = 1;
-  return __sync_swap (&i, 2);
-}
-]])], [
-        AC_DEFINE([HAVE___SYNC_SWAP], 1, [found __sync_swap builtin])
-        AC_MSG_RESULT([yes])
-      ], [
-        AC_MSG_RESULT([no])
-      ])
-
-    ], [
-      AC_MSG_RESULT([no])
-      AC_MSG_FAILURE([stdatomic.h unavailable and $CC has neither __atomic nor __sync builtins])
-    ])
+    AC_MSG_ERROR([building FRR requires an ISO C11 compliant compiler with atomics support])
   ])
 ])
 
@@ -1310,7 +1266,7 @@ FRR_INCLUDES
 
 AC_CHECK_HEADERS([netinet/in_var.h \
 	net/if_dl.h net/netopt.h \
-	inet/nd.h netinet/ip_icmp.h \
+	netinet/ip_icmp.h \
 	sys/sysctl.h sys/sockio.h sys/conf.h],
 	[], [], [FRR_INCLUDES])
 
@@ -1348,9 +1304,6 @@ FRR_INCLUDES
 # include <net/netopt.h>
 #endif
 #include <net/route.h>
-#ifdef HAVE_INET_ND_H
-# include <inet/nd.h>
-#endif
 #include <arpa/inet.h>
 /* Required for IDRP */
 #ifdef HAVE_NETINET_IP_ICMP_H
@@ -1387,14 +1340,12 @@ case "$host_os" in
     AC_MSG_RESULT([OpenBSD])
 
     AC_DEFINE([OPEN_BSD], [1], [OpenBSD])
-    AC_DEFINE([KAME], [1], [KAME IPv6])
     AC_DEFINE([BSD_V6_SYSCTL], [1], [BSD v6 sysctl to turn on and off forwarding])
     ;;
   *)
     AC_MSG_RESULT([BSD])
 
     AC_DEFINE([HAVE_NET_RT_IFLIST], [1], [NET_RT_IFLIST])
-    AC_DEFINE([KAME], [1], [KAME IPv6])
     AC_DEFINE([BSD_V6_SYSCTL], [1], [BSD v6 sysctl to turn on and off forwarding])
     ;;
 esac
@@ -1430,6 +1381,32 @@ AC_CHECK_FUNCS([ \
 	explicit_bzero \
 	])
 
+dnl note the trailing _ in the following macros; this is neccessary since
+dnl otherwise autoheader *replaces* the #define with the block...
+dnl
+dnl yes this might include stddef.h 3 times but who cares
+
+AH_VERBATIM(HAVE_STRLCAT_, [
+#ifndef HAVE_STRLCAT
+#include <stddef.h>
+size_t strlcat(char *__restrict dest,
+	       const char *__restrict src, size_t destsize);
+#endif
+])
+AH_VERBATIM(HAVE_STRLCPY_, [
+#ifndef HAVE_STRLCPY
+#include <stddef.h>
+size_t strlcpy(char *__restrict dest,
+	       const char *__restrict src, size_t destsize);
+#endif
+])
+AH_VERBATIM(HAVE_EXPLICIT_BZERO_, [
+#ifndef HAVE_EXPLICIT_BZERO
+#include <stddef.h>
+void explicit_bzero(void *buf, size_t len);
+#endif
+])
+
 AC_CHECK_MEMBERS([struct mmsghdr.msg_hdr], [], [], FRR_INCLUDES)
 
 dnl ##########################################################################
@@ -2359,7 +2336,7 @@ dnl ---------------------------
 dnl IRDP/pktinfo/icmphdr checks
 dnl ---------------------------
 
-AC_CHECK_TYPES([struct in_pktinfo], [
+AC_CHECK_TYPE([struct in_pktinfo], [
   AC_CHECK_TYPES([struct icmphdr], [
     IRDP=true
   ], [
@@ -2474,9 +2451,7 @@ AC_CHECK_DECLS([be32enc, be32dec], [], [], [
         #ifdef HAVE_SYS_ENDIAN_H
         #include <sys/endian.h>
         #endif
-        #ifdef HAVE_ENDIAN_H
         #include <endian.h>
-        #endif
 ])
 
 dnl --------------------------------------

lib/command.c

@@ -14,6 +14,13 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#ifndef HAVE_LIBCRYPT
+#ifdef HAVE_LIBCRYPTO
+#include <openssl/des.h>
+#define crypt DES_crypt
+#endif
+#endif
+
 #include <lib/version.h>
 
 #include "command.h"