From f023ab49e74c33dc1add8ece586f73ab7309270d Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 2 Oct 2013 09:54:56 -0400
Subject: [PATCH] update init script to handle ipv6 tables properly

---
 debian/ngcp-mediaproxy-ng-daemon.init | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/ngcp-mediaproxy-ng-daemon.init b/debian/ngcp-mediaproxy-ng-daemon.init
index ec944c80b..213f62ccb 100755
--- a/debian/ngcp-mediaproxy-ng-daemon.init
+++ b/debian/ngcp-mediaproxy-ng-daemon.init
@@ -73,12 +73,15 @@ case "$1" in
         set +e
 	modprobe xt_MEDIAPROXY
 	echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null
-	iptables -N mediaproxy
-	iptables -t filter -A INPUT -j mediaproxy
-	iptables -D mediaproxy -j MEDIAPROXY --id $TABLE 2>/dev/null
+	iptables -N mediaproxy 2> /dev/null
+	iptables -D INPUT -j mediaproxy 2> /dev/null
+	iptables -I INPUT -j mediaproxy
 	iptables -D mediaproxy -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
-	ip6tables -D mediaproxy -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
 	iptables -I mediaproxy -p udp -j MEDIAPROXY --id $TABLE
+	ip6tables -N mediaproxy 2> /dev/null
+	ip6tables -D INPUT -j mediaproxy 2> /dev/null
+	ip6tables -I INPUT -j mediaproxy
+	ip6tables -D mediaproxy -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
 	ip6tables -I mediaproxy -p udp -j MEDIAPROXY --id $TABLE
 	set -e
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
@@ -94,10 +97,9 @@ case "$1" in
 	fi
 	set +e
 	echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null
-	iptables -N mediaproxy
-	iptables -t filter -A INPUT -j mediaproxy
-	iptables -D mediaproxy -j MEDIAPROXY --id $TABLE 2>/dev/null
+	iptables -D INPUT -j mediaproxy 2> /dev/null
 	iptables -D mediaproxy -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
+	ip6tables -D INPUT -j mediaproxy 2> /dev/null
 	ip6tables -D mediaproxy -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
 	rmmod ipt_MEDIAPROXY 2>/dev/null
 	rmmod xt_MEDIAPROXY 2>/dev/null
@@ -119,15 +121,18 @@ case "$1" in
 	if [ -e /proc/mediaproxy/control ]; then
 		echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null
 	fi
-	iptables -N mediaproxy
-	iptables -t filter -A INPUT -j mediaproxy
-	iptables -D mediaproxy -j MEDIAPROXY --id $TABLE 2>/dev/null
+	iptables -D INPUT -j mediaproxy 2> /dev/null
 	iptables -D mediaproxy -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
+	ip6tables -D INPUT -j mediaproxy 2> /dev/null
 	ip6tables -D mediaproxy -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
 	rmmod ipt_MEDIAPROXY 2>/dev/null
 	rmmod xt_MEDIAPROXY 2>/dev/null
 	modprobe xt_MEDIAPROXY
+	iptables -N mediaproxy 2> /dev/null
+	iptables -I INPUT -j mediaproxy
 	iptables -I mediaproxy -p udp -j MEDIAPROXY --id $TABLE
+	ip6tables -N mediaproxy 2> /dev/null
+	ip6tables -I INPUT -j mediaproxy
 	ip6tables -I mediaproxy -p udp -j MEDIAPROXY --id $TABLE
 	set -e
 	start-stop-daemon --start --quiet --pidfile \