tcpsvd,udpsvd: conditionalize usage of SO_ORIGINAL_DST

On systems without this call, $TCPORIGDSTADDR is not set.

Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/networking/Config.src b/networking/Config.src
index fc613e8d3885a88dd76ab1f27edab361e9bf8a96..2d29c423a2d1d6825a21b086e177f1b9d6c4544f 100644 (file)
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -733,7 +733,6 @@ config SLATTACH
 config TCPSVD
        bool "tcpsvd"
        default y
-       depends on PLATFORM_LINUX
        help
          tcpsvd listens on a TCP port and runs a program for each new
          connection.
@@ -966,7 +965,6 @@ config IFUPDOWN_UDHCPC_CMD_OPTIONS
 config UDPSVD
        bool "udpsvd"
        default y
-       depends on PLATFORM_LINUX
        help
          udpsvd listens on an UDP port and runs a program for each new
          connection.

diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 53e622b56b186ecf46cf8d5dddc06735d01ad488..40f68258ec0c3a47c8576dac3aae6ba4b9612bd6 100644 (file)
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -30,9 +30,12 @@
  */
 
 #include "libbb.h"
+
 /* Wants <limits.h> etc, thus included after libbb.h: */
+#ifdef __linux__
 #include <linux/types.h> /* for __be32 etc */
 #include <linux/netfilter_ipv4.h>
+#endif
 
 // TODO: move into this file:
 #include "tcpudp_perhost.h"
@@ -464,6 +467,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
                        /* setup ucspi env */
                        const char *proto = tcp ? "TCP" : "UDP";
 
+#ifdef SO_ORIGINAL_DST
                        /* Extract "original" destination addr:port
                         * from Linux firewall. Useful when you redirect
                         * an outbond connection to local handler, and it needs
@@ -473,6 +477,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
                                xsetenv_plain("TCPORIGDSTADDR", addr);
                                free(addr);
                        }
+#endif
                        xsetenv_plain("PROTO", proto);
                        xsetenv_proto(proto, "LOCALADDR", local_addr);
                        xsetenv_proto(proto, "REMOTEADDR", remote_addr);