From 49300073dc279dee4dfd2723bfdb4ef4f54f1189 Mon Sep 17 00:00:00 2001
From: Tim Wilkinson <tim.j.wilkinson@gmail.com>
Date: Mon, 14 Mar 2022 19:23:03 -0700
Subject: [PATCH] Remove xinetd (which has little to do) (#292)

Switch olsrd dot_draw plugin to directly accept connections and not pass through xinetd.
---
 configs/common.config                 |  2 +-
 files/etc/config.mesh/olsrd           |  4 ++--
 files/etc/permpkg                     |  1 -
 files/etc/xinetd.d/dotdraw            | 15 ---------------
 files/usr/local/bin/uploadctlservices |  2 +-
 5 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 files/etc/xinetd.d/dotdraw

diff --git a/configs/common.config b/configs/common.config
index 37b961e4..ca2f2465 100644
--- a/configs/common.config
+++ b/configs/common.config
@@ -75,7 +75,7 @@ CONFIG_PACKAGE_perlbase-perlio=y
 CONFIG_PACKAGE_libpcap=m
 CONFIG_PACKAGE_tcpdump-mini=m
 CONFIG_PACKAGE_ntpclient=y
-CONFIG_PACKAGE_xinetd=y
+CONFIG_PACKAGE_xinetd=m
 CONFIG_PACKAGE_kmod-ipv6=n
 CONFIG_PACKAGE_ip6tables=n
 CONFIG_PACKAGE_kmod-ip6tables=n
diff --git a/files/etc/config.mesh/olsrd b/files/etc/config.mesh/olsrd
index b02e1dd0..0afc16c9 100644
--- a/files/etc/config.mesh/olsrd
+++ b/files/etc/config.mesh/olsrd
@@ -26,8 +26,8 @@ config LoadPlugin
 
 config LoadPlugin
 	option library 'olsrd_dot_draw.so.0.3'
-	option accept '127.0.0.1'
-	option port '2003'
+	option accept '0.0.0.0'
+	option port '2004'
 
 config LoadPlugin
 	option library 'olsrd_watchdog.so.0.1'
diff --git a/files/etc/permpkg b/files/etc/permpkg
index 47678d94..fef9c61b 100644
--- a/files/etc/permpkg
+++ b/files/etc/permpkg
@@ -79,4 +79,3 @@ ubusd
 uci
 uhttpd
 wpad-mini
-xinetd
diff --git a/files/etc/xinetd.d/dotdraw b/files/etc/xinetd.d/dotdraw
deleted file mode 100644
index 60c11ad0..00000000
--- a/files/etc/xinetd.d/dotdraw
+++ /dev/null
@@ -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
-}
-                                                                                
diff --git a/files/usr/local/bin/uploadctlservices b/files/usr/local/bin/uploadctlservices
index 3a64b46e..8508733b 100755
--- a/files/usr/local/bin/uploadctlservices
+++ b/files/usr/local/bin/uploadctlservices
@@ -2,7 +2,7 @@
 
 # Alphabetical except where noted below
 # 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() {