diff options
| -rw-r--r-- | ipsvd/Config.in | 20 | ||||
| -rw-r--r-- | ipsvd/Kbuild | 9 | ||||
| -rw-r--r-- | networking/tcpudp.c (renamed from ipsvd/tcpudp.c) | 5 | ||||
| -rw-r--r-- | networking/tcpudp_perhost.c (renamed from ipsvd/ipsvd_perhost.c) | 2 | ||||
| -rw-r--r-- | networking/tcpudp_perhost.h (renamed from ipsvd/ipsvd_perhost.h) | 0 |
5 files changed, 4 insertions, 32 deletions
diff --git a/ipsvd/Config.in b/ipsvd/Config.in deleted file mode 100644 index 0cb8c62de..000000000 --- a/ipsvd/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "ipsvd Utilities" - -config TCPSVD - bool "tcpsvd" - default n - help - tcpsvd listens on a tcp port and runs a program for each new connection - -config UDPSVD - bool "udpsvd" - default n - help - udpsvd listens on a udp port and runs a program for each new connection - -endmenu diff --git a/ipsvd/Kbuild b/ipsvd/Kbuild deleted file mode 100644 index fc34fea49..000000000 --- a/ipsvd/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> -# -# Licensed under the GPL v2, see the file LICENSE in this tarball. - -lib-y:= -lib-$(CONFIG_TCPSVD) += tcpudp.o ipsvd_perhost.o -lib-$(CONFIG_UDPSVD) += tcpudp.o ipsvd_perhost.o diff --git a/ipsvd/tcpudp.c b/networking/tcpudp.c index 729b7bca9..f97787497 100644 --- a/ipsvd/tcpudp.c +++ b/networking/tcpudp.c @@ -7,7 +7,7 @@ * Licensed under GPLv2, see file LICENSE in this tarball for details. */ -/* Based on ipsvd ipsvd-0.12.1. This tcpsvd accepts all options +/* Based on ipsvd-0.12.1. This tcpsvd accepts all options * which are supported by one from ipsvd-0.12.1, but not all are * functional. See help text at the end of this file for details. * @@ -33,7 +33,8 @@ #include <linux/netfilter_ipv4.h> /* wants <limits.h> */ #include "libbb.h" -#include "ipsvd_perhost.h" +// TODO: move into this file: +#include "tcpudp_perhost.h" #ifdef SSLSVD #include "matrixSsl.h" diff --git a/ipsvd/ipsvd_perhost.c b/networking/tcpudp_perhost.c index 6075c0a3a..3005f12c0 100644 --- a/ipsvd/ipsvd_perhost.c +++ b/networking/tcpudp_perhost.c @@ -8,7 +8,7 @@ */ #include "libbb.h" -#include "ipsvd_perhost.h" +#include "tcpudp_perhost.h" static struct hcc *cc; static unsigned cclen; diff --git a/ipsvd/ipsvd_perhost.h b/networking/tcpudp_perhost.h index 9fc8cee61..9fc8cee61 100644 --- a/ipsvd/ipsvd_perhost.h +++ b/networking/tcpudp_perhost.h |