FPM add routing view global option (for FreeBSD for now).

set the route table FIB id to the sockets created within FPM up to
the max set by the system, avoiding having to use setfib command line.

Author: devnexen

sapi/fpm/config.m4

@@ -396,6 +396,23 @@ AC_DEFUN([AC_FPM_TIMES],
 	])
 ])
 
+AC_DEFUN([AC_FPM_SOCKETROUTE],
+[
+	have_socketroute=no
+	AC_MSG_CHECKING([for SO_SETFIB])
+
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[int x = SO_SETFIB;]])], [
+		have_socketroute=yes
+		AC_MSG_RESULT([yes])
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+	if test $have_socketroute = "yes"; then
+		AC_DEFINE([HAVE_SOCKETROUTE], 1, [do we have socket route capabilities])
+	fi
+])
+
 AC_DEFUN([AC_FPM_KQUEUE],
 [
 	AC_MSG_CHECKING([for kqueue])
@@ -539,6 +556,7 @@ if test "$PHP_FPM" != "no"; then
   AC_FPM_LQ
   AC_FPM_SYSCONF
   AC_FPM_TIMES
+  AC_FPM_SOCKETROUTE
   AC_FPM_KQUEUE
   AC_FPM_PORT
   AC_FPM_DEVPOLL

sapi/fpm/fpm/fpm_conf.c

@@ -70,6 +70,9 @@ struct fpm_global_config_s fpm_global_config = {
 #ifdef HAVE_SYSTEMD
 	.systemd_watchdog = 0,
 	.systemd_interval = -1, /* -1 means not set */
+#endif
+#ifdef HAVE_SOCKETROUTE
+	.socketroute = -1, /* -1 means not set */
 #endif
 	.log_buffering = ZLOG_DEFAULT_BUFFERING,
 	.log_limit = ZLOG_DEFAULT_LIMIT
@@ -104,6 +107,9 @@ static struct ini_value_parser_s ini_fpm_global_options[] = {
 	{ "events.mechanism",            &fpm_conf_set_string,          GO(events_mechanism) },
 #ifdef HAVE_SYSTEMD
 	{ "systemd_interval",            &fpm_conf_set_time,            GO(systemd_interval) },
+#endif
+#ifdef HAVE_SOCKETROUTE
+	{ "socket.route",                &fpm_conf_set_integer,         GO(socketroute) },
 #endif
 	{ 0, 0, 0 }
 };

sapi/fpm/fpm/fpm_conf.h

@@ -44,6 +44,9 @@ struct fpm_global_config_s {
 	int systemd_watchdog;
 	int systemd_interval;
 #endif
+#ifdef HAVE_SOCKETROUTE
+	int socketroute;
+#endif
 };
 
 extern struct fpm_global_config_s fpm_global_config;

sapi/fpm/fpm/fpm_sockets.c

@@ -39,6 +39,10 @@ static struct fpm_array_s sockets_list;
 
 enum { FPM_GET_USE_SOCKET = 1, FPM_STORE_SOCKET = 2, FPM_STORE_USE_SOCKET = 3 };
 
+#ifdef SO_SETFIB
+static int routemax = -1;
+#endif
+
 static inline void fpm_sockets_get_env_name(char *envname, unsigned idx) /* {{{ */
 {
 	if (!idx) {
@@ -250,6 +254,22 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
 		return -1;
 	}
 
+#ifdef HAVE_SOCKETROUTE
+	if (-1 < fpm_global_config.socketroute) {
+#ifdef SO_SETFIB
+		if (routemax < fpm_global_config.socketroute) {
+			zlog(ZLOG_ERROR, "Invalid routing table id %d, max is %d", fpm_global_config.socketroute, routemax);
+			close(sock);
+			return -1;
+		}
+
+		if (0 > setsockopt(sock, SOL_SOCKET, SO_SETFIB, &fpm_global_config.socketroute, sizeof(fpm_global_config.socketroute))) {
+			zlog(ZLOG_WARNING, "failed to change socket attribute");
+		}
+#endif
+	}
+#endif
+
 	return sock;
 }
 /* }}} */
@@ -386,6 +406,23 @@ static int fpm_socket_af_unix_listening_socket(struct fpm_worker_pool_s *wp) /*
 }
 /* }}} */
 
+#ifdef HAVE_SOCKETROUTE
+static int fpm_socket_setroute_init(void) /* {{{ */
+{
+#ifdef SO_SETFIB
+	/* potentially up to 65536 but needs to check the actual cap beforehand */
+	size_t len = sizeof(routemax);
+	if (sysctlbyname("net.fibs", &routemax, &len, NULL, 0) < 0) {
+		zlog(ZLOG_ERROR, "failed to get max routing table");
+		return -1;
+	}
+
+	return 0;
+#endif
+}
+/* }}} */
+#endif
+
 int fpm_sockets_init_main() /* {{{ */
 {
 	unsigned i, lq_len;
@@ -399,6 +436,12 @@ int fpm_sockets_init_main() /* {{{ */
 		return -1;
 	}
 
+#ifdef HAVE_SOCKETROUTE
+	if (fpm_socket_setroute_init() == -1) {
+		return -1;
+	}
+#endif
+
 	/* import inherited sockets */
 	for (i = 0; i < FPM_ENV_SOCKET_SET_MAX; i++) {
 		fpm_sockets_get_env_name(envname, i);

sapi/fpm/fpm/fpm_sockets.h

@@ -5,6 +5,9 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#if defined(__FreeBSD__)
+#include <sys/sysctl.h>
+#endif
 #include <sys/un.h>
 #include <unistd.h>
 #include <fcntl.h>

sapi/fpm/php-fpm.conf.in

@@ -125,6 +125,10 @@
 ; Default value: 10
 ;systemd_interval = 10
 
+; Sets the routing table for the sockets created within FPM
+; - FreeBSD from 0 up to 65536
+;socket.route = -1
+
 ;;;;;;;;;;;;;;;;;;;;
 ; Pool Definitions ;
 ;;;;;;;;;;;;;;;;;;;;