More control over iptables

closes #353

Change-Id: Ia16242296b3f88d514d4e52112a00471943c59bd

debian/ngcp-rtpengine-daemon.default

@@ -2,6 +2,7 @@ RUN_RTPENGINE=no
 CONFIG_FILE=/etc/rtpengine/rtpengine.conf
 # CONFIG_SECTION=rtpengine
 PIDFILE=/var/run/ngcp-rtpengine-daemon.pid
+MANAGE_IPTABLES=yes
 TABLE=0
 #SET_USER=root
 #SET_GROUP=root # GROUP only needs to be set if USER is not set or if the user isn't in the group

debian/ngcp-rtpengine-daemon.init

@@ -15,6 +15,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 NAME=ngcp-rtpengine-daemon
 DESC="RTP/media proxy"
 TABLE=0
+MANAGE_IPTABLES=yes
 
 DAEMON=$(which rtpengine)
 DEFAULTS=/etc/default/${NAME}
@@ -166,45 +167,27 @@ case "$1" in
 	      ;;
 	  esac
 	fi
-	set -e
 	log_daemon_msg "Starting $DESC: $NAME"
 	if [ "$TABLE" -ge 0 ] && [ "$VIRT" != "yes" ]; then
-		set +e
-		modprobe xt_RTPENGINE $MODPROBE_OPTIONS
-		if [ -e /proc/mediaproxy/control ]; then
-			echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null
-		fi
-		if [ -e /proc/rtpengine/control ]; then
-			echo "del $TABLE" > /proc/rtpengine/control 2>/dev/null
-		fi
-		iptables -D INPUT -j mediaproxy 2> /dev/null
-		iptables -F mediaproxy 2> /dev/null
-		iptables -X mediaproxy 2> /dev/null
-		ip6tables -D INPUT -j mediaproxy 2> /dev/null
-		ip6tables -F mediaproxy 2> /dev/null
-		ip6tables -X mediaproxy 2> /dev/null
-		rmmod xt_MEDIAPROXY 2>/dev/null
+		if [ "$MANAGE_IPTABLES" = "yes" ]; then
+			modprobe xt_RTPENGINE $MODPROBE_OPTIONS
 
-		if [ "$CREATE_IPTABLES_CHAIN" != "no" ]; then
 			iptables -N rtpengine 2> /dev/null
 			iptables -D INPUT -j rtpengine 2> /dev/null
 			iptables -I INPUT -j rtpengine
+			iptables -D rtpengine -p udp -j RTPENGINE --id "$TABLE" 2>/dev/null
+			iptables -I rtpengine -p udp -j RTPENGINE --id "$TABLE"
 			ip6tables -N rtpengine 2> /dev/null
 			ip6tables -D INPUT -j rtpengine 2> /dev/null
 			ip6tables -I INPUT -j rtpengine
-		fi
-		if iptables -C INPUT -j rtpengine 1> /dev/null 2> /dev/null && iptables -n --list rtpengine 1> /dev/null 2> /dev/null; then
-			iptables -D rtpengine -p udp -j RTPENGINE --id "$TABLE" 2>/dev/null
-			iptables -I rtpengine -p udp -j RTPENGINE --id "$TABLE"
 			ip6tables -D rtpengine -p udp -j RTPENGINE --id "$TABLE" 2>/dev/null
 			ip6tables -I rtpengine -p udp -j RTPENGINE --id "$TABLE"
-		else
-			echo ""
-			echo "Missing rtpengine iptables chain - not starting"
-			exit 0
 		fi
-		set -e
+		if [ -e /proc/rtpengine/control ]; then
+			echo "del $TABLE" > /proc/rtpengine/control 2>/dev/null
+		fi
 	fi
+	set -e
 	start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
 		--exec "$DAEMON" $START_OPTIONS -- $OPTIONS || log_progress_msg " already running"
 	log_end_msg $?
@@ -216,30 +199,19 @@ case "$1" in
 	if [ "$?" -ne 0 ]; then
 		return $?
 	fi
+	set +e
 	if [ "$TABLE" -ge 0 ] && [ "$VIRT" != "yes" ]; then
 		sleep 1
-		set +e
-		if [ -e /proc/mediaproxy/control ]; then
-			echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null
-		fi
 		if [ -e /proc/rtpengine/control ]; then
 			echo "del $TABLE" > /proc/rtpengine/control 2>/dev/null
 		fi
-		iptables -D INPUT -j mediaproxy 2> /dev/null
-		iptables -F mediaproxy 2> /dev/null
-		iptables -X mediaproxy 2> /dev/null
-		ip6tables -D INPUT -j mediaproxy 2> /dev/null
-		ip6tables -F mediaproxy 2> /dev/null
-		ip6tables -X mediaproxy 2> /dev/null
-
-		iptables -D INPUT -j mediaproxy 2> /dev/null
-		iptables -D rtpengine -p udp -j RTPENGINE --id "$TABLE" 2>/dev/null
-		ip6tables -D INPUT -j mediaproxy 2> /dev/null
-		ip6tables -D rtpengine -p udp -j RTPENGINE --id "$TABLE" 2>/dev/null
-		rmmod xt_MEDIAPROXY 2>/dev/null
-		rmmod xt_RTPENGINE 2>/dev/null
-		set -e
+		if [ "$MANAGE_IPTABLES" = "yes" ]; then
+			iptables -D rtpengine -p udp -j RTPENGINE --id "$TABLE" 2>/dev/null
+			ip6tables -D rtpengine -p udp -j RTPENGINE --id "$TABLE" 2>/dev/null
+			rmmod xt_RTPENGINE 2>/dev/null
+		fi
 	fi
+	set -e
 	rm -f $PIDFILE
 	log_end_msg $?
 	;;