218b7521aa
Current implementation of socat's init service doesn't allow to run more
complex configurations. As an example there's no possibility to execute
following command:
socat TCP-LISTEN:8080,fork,reuseaddr,bind=192.168.1.1 \
EXEC:"/sbin/ip netns exec somenetns socat STDIO TCP:10.0.0.1:80"
In such command the first line is argv[1] and the second line is
argv[2]. SocatOptions config option is a string. As as a consequence of
this each word will be passed as a separate argv element. Socat won't be
able to parse arguments correctly.
In order to mitigate this issue, we can also accept SocatOptions as a
list of strings. Following config file will work correctly:
config socat 'tunnel_8080_into_somenetns'
option enable '1'
list SocatOptions 'TCP-LISTEN:8080,fork,reuseaddr,bind=192.168.1.1'
list SocatOptions 'EXEC:"/sbin/ip netns exec somenetns socat STDIO TCP:10.0.0.1:80"'
While we're at it, pass stdout and stderr into logread.
Signed-off-by: Dobroslaw Kijowski <dobo90@gmail.com>
93 lines
2.4 KiB
Makefile
93 lines
2.4 KiB
Makefile
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=socat
|
|
PKG_VERSION:=1.7.3.4
|
|
PKG_RELEASE:=2
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
|
PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download
|
|
PKG_HASH:=972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc
|
|
|
|
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
|
|
PKG_LICENSE:=GPL-2.0-or-later OpenSSL
|
|
PKG_LICENSE_FILES:=COPYING COPYING.OpenSSL
|
|
PKG_CPE_ID:=cpe:/a:dest-unreach:socat
|
|
|
|
PKG_INSTALL:=1
|
|
PKG_BUILD_PARALLEL:=1
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
|
|
define Package/socat
|
|
SECTION:=net
|
|
CATEGORY:=Network
|
|
DEPENDS:=+libpthread +librt +SOCAT_SSL:libopenssl
|
|
TITLE:=A multipurpose relay (SOcket CAT)
|
|
URL:=http://www.dest-unreach.org/socat/
|
|
endef
|
|
|
|
define Package/socat/description
|
|
SoCat (for SOcket CAT) establishes two bidirectional byte streams and
|
|
transfers data between them.
|
|
Data channels may be files, pipes, devices (terminal or modem, etc.), or
|
|
sockets (Unix, IPv4, IPv6, raw, UDP, TCP, SSL). It provides forking,
|
|
logging and tracing, different modes for interprocess communication and
|
|
many more options.
|
|
endef
|
|
|
|
define Package/socat/config
|
|
config SOCAT_SSL
|
|
bool "SSL support"
|
|
depends on PACKAGE_socat
|
|
default n
|
|
help
|
|
Implements SSL support in socat (using libopenssl).
|
|
endef
|
|
|
|
define Package/socat/conffiles
|
|
/etc/config/socat
|
|
endef
|
|
|
|
CONFIGURE_ARGS += \
|
|
--disable-libwrap \
|
|
--disable-readline \
|
|
--enable-termios
|
|
|
|
ifneq ($(CONFIG_SOCAT_SSL),y)
|
|
CONFIGURE_ARGS+= --disable-openssl
|
|
endif
|
|
|
|
# PowerPC has different TERMIOS bits
|
|
ifneq ($(findstring powerpc,$(CONFIG_ARCH)),)
|
|
CONFIGURE_VARS += \
|
|
sc_cv_sys_crdly_shift=12 \
|
|
sc_cv_sys_tabdly_shift=10 \
|
|
sc_cv_sys_csize_shift=8
|
|
else
|
|
CONFIGURE_VARS += \
|
|
sc_cv_sys_crdly_shift=9 \
|
|
sc_cv_sys_tabdly_shift=11 \
|
|
sc_cv_sys_csize_shift=4
|
|
endif
|
|
|
|
CONFIGURE_VARS += \
|
|
sc_cv_termios_ispeed="no" \
|
|
ac_cv_header_bsd_libutil_h=no \
|
|
ac_cv_lib_bsd_openpty=no \
|
|
BUILD_DATE=$(SOURCE_DATE_EPOCH)
|
|
|
|
define Package/socat/install
|
|
$(INSTALL_DIR) $(1)/usr/bin
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/
|
|
$(INSTALL_DIR) $(1)/etc/config
|
|
$(INSTALL_CONF) ./files/socat.config $(1)/etc/config/socat
|
|
$(INSTALL_DIR) $(1)/etc/init.d
|
|
$(INSTALL_BIN) ./files/socat.init $(1)/etc/init.d/socat
|
|
endef
|
|
|
|
$(eval $(call BuildPackage,socat))
|