From 3d7987337f881e38e8537233959c78054147e737 Mon Sep 17 00:00:00 2001
From: Justin Wind <justin.wind+git@gmail.com>
Date: Sun, 1 Oct 2017 15:11:42 -0700
Subject: [PATCH] separate services.sh

---
 router.sh   |  6 +-----
 services.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100755 services.sh

diff --git a/router.sh b/router.sh
index b45d988..7b2c5ad 100755
--- a/router.sh
+++ b/router.sh
@@ -201,11 +201,7 @@ $IPTABLES -t nat -A POSTROUTING -o ${EXT_IF} -j SNAT --to ${EXT}
 # accept internal network traffic
 $IPTABLES -A INPUT -i ${INT_IF} -j ACCEPT
 
-# accept list of external ports
-$IPTABLES -A INPUT -i ${EXT_IF} -p tcp -m set --match-set allowed_tcp dst -j ACCEPT
-$IPTABLES -A INPUT -i ${EXT_IF} -p udp -m set --match-set allowed_udp dst -j ACCEPT
-$IP6TABLES -A INPUT -i ${EXT6_IF} -p tcp -m set --match-set allowed_tcp dst -j ACCEPT
-$IP6TABLES -A INPUT -i ${EXT6_IF} -p udp -m set --match-set allowed_udp dst -j ACCEPT
+./services ${EXT_IF} ${EXT6_IF}
 
 # load rules
 # inserts, so stack order matters
diff --git a/services.sh b/services.sh
new file mode 100755
index 0000000..32d7576
--- /dev/null
+++ b/services.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -e
+
+. ./common.sh
+
+IFOPT=""
+IF6OPT=""
+if [[ $# -eq 1 ]]
+then
+	IFOPT="-i $1"
+	IF6OPT="-i $1"
+fi
+if [[ $# -eq 2 ]]
+then
+	IFOPT="-i $1"
+	IF6OPT="-i $2"
+fi
+
+for p in udp tcp
+do
+	create_set allowed_${p} bitmap:port range 0-65535
+	if ! $IPTABLES -C INPUT ${IFOPT} -p ${p} -m set --match-set allowed_${p} dst -j ACCEPT
+	then
+		$IPTABLES -A INPUT ${IFOPT} -p ${p} -m set --match-set allowed_${p} dst -j ACCEPT
+	fi
+	if ! $IP6TABLES -C INPUT ${IF6OPT} -p ${p} -m set --match-set allowed_${p} dst -j ACCEPT
+	then
+		$IP6TABLES -A INPUT ${IF6OPT} -p ${p} -m set --match-set allowed_${p} dst -j ACCEPT
+	fi
+done
+
+for sfx in '' ".$(hostname -s)"
+do
+	if [ -e "services${sfx}" ]
+	then
+		for l in $(decommentcat "services${sfx}")
+		do
+			allow_services "${l}"
+		done
+	fi
+done
-- 
2.45.2