From 458a84c1d2b2a39f43e6c687b69116cfb2be5e31 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Mon, 5 Jan 2015 10:03:10 -0500
Subject: [PATCH] remove obsolete RH $RTP_IP6 sysconfig option

---
 el/rtpengine.init      | 21 ++-------------------
 el/rtpengine.sysconfig |  3 +--
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/el/rtpengine.init b/el/rtpengine.init
index 927f458be..2a4c94d4d 100644
--- a/el/rtpengine.init
+++ b/el/rtpengine.init
@@ -36,7 +36,6 @@ RETVAL=0
 
 OPTS="--pidfile $pidfile"
 MODULE=0
-IP6=0
 
 build_opts() {
 	shopt -s nocasematch
@@ -64,15 +63,6 @@ build_opts() {
                 done
         fi
 
-        if [[ -n "$RTP_IP6" ]]
-        then
-                for IP6 in "${RTP_IP6[@]}"
-                do
-                        OPTS+=" --interface=$IP6"
-                done
-                IP6=1
-        fi
-
 	if [[ -n "$LISTEN_TCP" ]]
 	then
 		OPTS+=" --listen-tcp=$LISTEN_TCP"
@@ -154,14 +144,10 @@ start() {
 		iptables -N rtpengine
 		iptables -t filter -A INPUT -j rtpengine
 		iptables -I rtpengine -p udp -j RTPENGINE --id $TABLE
-		if [[ $IP6 == 1 ]]
-		then
-    			ip6tables -I rtpengine -p udp -j RTPENGINE --id $TABLE
-  		fi
+		ip6tables -I rtpengine -p udp -j RTPENGINE --id $TABLE
 
 		cat <<EOF > "$cachefile"
 CUR_TABLE=$TABLE
-CUR_IP6=$IP6
 EOF
 	fi
         echo -n $"Starting $prog: "
@@ -183,10 +169,7 @@ stop() {
 		echo "Unloading module for in-kernel packet forwarding"
 		echo "del $TABLE" > /proc/rtpengine/control
 		iptables -D rtpengine -p udp -j RTPENGINE --id $CUR_TABLE
-		if [[ $CUR_IP6 == 1 ]]
-		then
-    			ip6tables -D rtpengine -p udp -j RTPENGINE --id $CUR_TABLE
-  		fi
+		ip6tables -D rtpengine -p udp -j RTPENGINE --id $CUR_TABLE
 		iptables -t filter -D INPUT -j rtpengine
 		iptables -X rtpengine
 #		rmmod xt_RTPENGINE
diff --git a/el/rtpengine.sysconfig b/el/rtpengine.sysconfig
index f30b00d22..a70be46fe 100644
--- a/el/rtpengine.sysconfig
+++ b/el/rtpengine.sysconfig
@@ -8,8 +8,7 @@ TABLE=0			# (o) iptables table for in-kernel forwarding rules
 			#     comment out when "KERNEL=no"
 FALLBACK=yes		# (m) "yes" enables fallback to userspace forwarding
 			#     only, "no" disables
-RTP_IP[0]=127.0.0.1	# (m) Local IPv4 address for RTP. The format of the value is [NAME/]IP[!IP].
-#RTP_IP6[0]=::1		# (o) Local IPv6 address for RTP. The format of the value is [NAME/]IP[!IP].
+RTP_IP[0]=127.0.0.1	# (m) Local IPv4/6 address for RTP. The format of the value is [NAME/]IP[!IP].
 #
 # At least one of LISTEN_(TCP|UDP|NG) is required
 #LISTEN_TCP=127.0.0.1:2222	# IP address and port combination for TCP