Merge pull request #2797 from aeolio/eventHorizon

Fix cross-compilation issues w/ custom toolchain

Author: DL6ER

src/CMakeLists.txt

@@ -348,6 +348,24 @@ add_subdirectory(config)
 add_subdirectory(tools)
 add_subdirectory(ntp)
 
+# optional headers - may depend on type or version of the C standard library
+include(CheckIncludeFile)
+
+check_include_file("sys/random.h" HAVE_RANDOM_H)
+if(HAVE_RANDOM_H)
+    target_compile_definitions(config PRIVATE USE_GETRANDOM)
+    target_compile_definitions(core PRIVATE USE_GETRANDOM)
+endif()
+
+check_include_file("execinfo.h" HAVE_EXECINFO_H)
+if(HAVE_EXECINFO_H)
+	message(STATUS "Building FTL with unwind support: YES")
+    target_compile_definitions(core PRIVATE USE_BACKTRACE)
+else()
+	message(STATUS "Building FTL with unwind support: NO")
+endif()
+
+
 option(USE_READLINE "Build FTL with readline support, if available" ON)
 
 find_library(LIBREADLINE NAMES libreadline${LIBRARY_SUFFIX} readline)

src/daemon.h

@@ -45,9 +45,10 @@ pid_t FTL_gettid(void);
 
 // getrandom() is only available since glibc 2.25
 // https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html
-#if !defined(__GLIBC__) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 25)
+#if defined(USE_GETRANDOM)
 #include <sys/random.h>
 #else
+#define GRND_NONBLOCK 0x0001
 #define getrandom getrandom_fallback
 #endif
 

src/signals.c

@@ -9,7 +9,8 @@
 *  Please see LICENSE file for your rights under this license. */
 
 #include "FTL.h"
-#if defined(__GLIBC__)
+#if defined(USE_BACKTRACE)
+// backtrace(), backtrace_symbols()
 #include <execinfo.h>
 #endif
 #include "signals.h"
@@ -53,7 +54,7 @@ static char * __attribute__ ((nonnull (1))) getthread_name(char buffer[16])
 	return buffer;
 }
 
-#if defined(__GLIBC__)
+#if defined(USE_BACKTRACE)
 static void print_addr2line(const char *symbol, const void *address, const int j, const void *offset)
 {
 	// Only do this analysis for our own binary (skip trying to analyse libc.so, etc.)
@@ -95,13 +96,13 @@ static void print_addr2line(const char *symbol, const void *address, const int j
 	if(addr2line != NULL)
 		pclose(addr2line);
 }
-#endif
+#endif // USE_BACKTRACE
 
 // Log backtrace
 void generate_backtrace(void)
 {
-// Check GLIBC availability as MUSL does not support live backtrace generation
-#if defined(__GLIBC__)
+// Live backtrace generation is not supported by every C standard library
+#if defined(USE_BACKTRACE)
 	// Try to obtain backtrace. This may not always be helpful, but it is better than nothing
 	void *buffer[255];
 	const int calls = backtrace(buffer, sizeof(buffer)/sizeof(void *));
@@ -137,7 +138,7 @@ void generate_backtrace(void)
 	free(bcktrace);
 #else
 	log_info("!!! INFO: pihole-FTL has not been compiled with glibc/backtrace support, not generating one !!!");
-#endif
+#endif // USE_BACKTRACE
 }
 
 /**
@@ -210,8 +211,14 @@ static void __attribute__((noreturn)) signal_handler(int sig, siginfo_t *si, voi
 			case BUS_ADRALN:    log_info("     with code:  BUS_ADRALN (Invalid address alignment)"); break;
 			case BUS_ADRERR:    log_info("     with code:  BUS_ADRERR (Non-existent physical address)"); break;
 			case BUS_OBJERR:    log_info("     with code:  BUS_OBJERR (Object specific hardware error)"); break;
+#if defined (BUS_MCEERR_AR)
+			// 2025-May: not defined by uClibc
 			case BUS_MCEERR_AR: log_info("     with code:  BUS_MCEERR_AR (Hardware memory error: action required)"); break;
+#endif
+#if defined (BUS_MCEERR_AO)
+			// 2025-May: not defined by uClibc
 			case BUS_MCEERR_AO: log_info("     with code:  BUS_MCEERR_AO (Hardware memory error: action optional)"); break;
+#endif
 			default:            log_info("     with code:  Unknown (%i)", si->si_code); break;
 		}
 	}

src/tools/netlink.c

@@ -610,8 +610,14 @@ static int nlparsemsg_link(struct ifinfomsg *ifi, void *buf, size_t len, cJSON *
 			case IFLA_ALT_IFNAME:
 			case IFLA_PHYS_PORT_NAME:
 			case IFLA_QDISC:
+#if defined (IFLA_PARENT_DEV_NAME)
+			// 2025-May: kernel version dependent
 			case IFLA_PARENT_DEV_NAME:
+#endif
+#if defined (IFLA_PARENT_DEV_BUS_NAME)
+			// 2025-May: kernel version dependent
 			case IFLA_PARENT_DEV_BUS_NAME:
+#endif
 			{
 				if(!detailed)
 					break;

src/tools/netlink_consts.h

@@ -37,7 +37,10 @@ static struct flag_names iflatypes[] =
 	{ ARPHRD_X25, "x25" },
 	{ ARPHRD_HWX25, "hwx25" },
 	{ ARPHRD_CAN, "can" },
+#if defined (ARPHRD_MCTP)
+	// 2025-May: kernel version dependent
 	{ ARPHRD_MCTP, "mctp" },
+#endif
 	{ ARPHRD_PPP, "ppp" },
 	{ ARPHRD_CISCO, "cisco" },
 	{ ARPHRD_HDLC, "hdlc" },
@@ -145,7 +148,10 @@ static struct flag_names rtprots[] = {
 	{ RTPROT_MROUTED, "mrouted" },
 	{ RTPROT_KEEPALIVED, "keepalived" },
 	{ RTPROT_BABEL, "babel" },
+#if defined (RTPROT_OPENR)
+	// 2025-May: kernel version dependent
 	{ RTPROT_OPENR, "openr" },
+#endif
 	{ RTPROT_BGP, "bgp" },
 	{ RTPROT_ISIS, "isis" },
 	{ RTPROT_OSPF, "ospf" },
@@ -185,7 +191,10 @@ static struct flag_names rtmflags[] = {
 	{ RTM_F_FIB_MATCH, "fib_match" },
 	{ RTM_F_OFFLOAD, "offload" },
 	{ RTM_F_TRAP, "trap" },
+#if defined (RTM_F_OFFLOAD_FAILED)
+	// 2025-May: kernel version dependent
 	{ RTM_F_OFFLOAD_FAILED, "offload_failed" },
+#endif
 };
 
 static struct flag_names rtnhflags[] = {
@@ -195,7 +204,10 @@ static struct flag_names rtnhflags[] = {
 	{ RTNH_F_OFFLOAD, "offload" },
 	{ RTNH_F_LINKDOWN, "linkdown" },
 	{ RTNH_F_UNRESOLVED, "unresolved" },
+#if defined (RTNH_F_TRAP)
+	// 2025-May: kernel version dependent
 	{ RTNH_F_TRAP, "trap" },
+#endif
 };
 
 static struct flag_names ifstates[] = {
@@ -439,10 +451,16 @@ static const char *__attribute__ ((const)) iflaTypeToString(const int ifla_type)
 			return "perm_address";
 		case IFLA_PROTO_DOWN_REASON:
 			return "proto_down_reason";
+#if defined (IFLA_PARENT_DEV_NAME)
+		// 2025-May: kernel version dependent
 		case IFLA_PARENT_DEV_NAME:
 			return "parent_dev_name";
+#endif
+#if defined (IFLA_PARENT_DEV_BUS_NAME)
+		// 2025-May: kernel version dependent
 		case IFLA_PARENT_DEV_BUS_NAME:
 			return "parent_dev_bus_name";
+#endif
 		default:
 			return "unknown";
 	}
@@ -522,10 +540,16 @@ static const char *__attribute__ ((const)) family_name(int family)
 			return "wanpipe";
 		case PF_LLC:
 			return "llc";
+#if defined (PF_IB)
+		// 2025-May: defined by glibc but not uClibc
 		case PF_IB:
 			return "ib";
+#endif
+#if defined (PF_MPLS)
+		// 2025-May: defined by glibc but not uClibc
 		case PF_MPLS:
 			return "mpls";
+#endif
 		case PF_CAN:
 			return "can";
 		case PF_TIPC:
@@ -556,8 +580,11 @@ static const char *__attribute__ ((const)) family_name(int family)
 			return "qipcrtr";
 		case PF_SMC:
 			return "smc";
+#if defined (PF_XDP)
+		// 2025-May: defined by glibc but not uClibc
 		case PF_XDP:
 			return "xdp";
+#endif
 #ifdef PF_MCTP
 		// 2024-July: defined by glibc but not musl
 		case PF_MCTP:

src/webserver/civetweb/CMakeLists.txt

@@ -32,5 +32,5 @@ target_compile_definitions(civetweb PRIVATE NO_CGI
                                             USE_LUA
                                             TIMER_RESOLUTION=1000)
 
-include_directories(${PROJECT_SOURCE_DIR}/src/lua /usr/local/include)
+include_directories(${PROJECT_SOURCE_DIR}/src/lua)
 target_include_directories(civetweb PRIVATE ${PROJECT_SOURCE_DIR}/src)