mirror of
https://github.com/sheumann/hush.git
synced 2024-08-20 19:29:02 +00:00
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>
This commit is contained in:
parent
29885114a5
commit
2ea12d8b6d
@ -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.
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user