Remove xinetd (which has little to do) (#292)

Switch olsrd dot_draw plugin to directly accept connections and not pass through xinetd.
This commit is contained in:
Tim Wilkinson 2022-03-14 19:23:03 -07:00 committed by GitHub
parent 7dde68bbb5
commit 49300073dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 20 deletions

View File

@ -75,7 +75,7 @@ CONFIG_PACKAGE_perlbase-perlio=y
CONFIG_PACKAGE_libpcap=m CONFIG_PACKAGE_libpcap=m
CONFIG_PACKAGE_tcpdump-mini=m CONFIG_PACKAGE_tcpdump-mini=m
CONFIG_PACKAGE_ntpclient=y CONFIG_PACKAGE_ntpclient=y
CONFIG_PACKAGE_xinetd=y CONFIG_PACKAGE_xinetd=m
CONFIG_PACKAGE_kmod-ipv6=n CONFIG_PACKAGE_kmod-ipv6=n
CONFIG_PACKAGE_ip6tables=n CONFIG_PACKAGE_ip6tables=n
CONFIG_PACKAGE_kmod-ip6tables=n CONFIG_PACKAGE_kmod-ip6tables=n

View File

@ -26,8 +26,8 @@ config LoadPlugin
config LoadPlugin config LoadPlugin
option library 'olsrd_dot_draw.so.0.3' option library 'olsrd_dot_draw.so.0.3'
option accept '127.0.0.1' option accept '0.0.0.0'
option port '2003' option port '2004'
config LoadPlugin config LoadPlugin
option library 'olsrd_watchdog.so.0.1' option library 'olsrd_watchdog.so.0.1'

View File

@ -79,4 +79,3 @@ ubusd
uci uci
uhttpd uhttpd
wpad-mini wpad-mini
xinetd

View File

@ -1,15 +0,0 @@
# description: a workaround for the overly restrictive olsr dot_draw plugin
# - open up the port to anyone instead of just one specific ip address
service dotdraw
{
disable = no
socket_type = stream
protocol = tcp
wait = no
user = root
group = root
server = /usr/bin/nc
server_args = 127.0.0.1 2003
}

View File

@ -2,7 +2,7 @@
# Alphabetical except where noted below # Alphabetical except where noted below
# log needs to start first to be detected for logging. # log needs to start first to be detected for logging.
serviceslist="log dropbear manager vtund vtundsrv xinetd" serviceslist="log dropbear manager vtund vtundsrv"
start_upgrade_mode() { start_upgrade_mode() {