remove obsolete RH $RTP_IP6 sysconfig option

pull/60/head
Richard Fuchs 11 years ago
parent cf9d3aeeee
commit 458a84c1d2

@ -36,7 +36,6 @@ RETVAL=0
OPTS="--pidfile $pidfile" OPTS="--pidfile $pidfile"
MODULE=0 MODULE=0
IP6=0
build_opts() { build_opts() {
shopt -s nocasematch shopt -s nocasematch
@ -64,15 +63,6 @@ build_opts() {
done done
fi fi
if [[ -n "$RTP_IP6" ]]
then
for IP6 in "${RTP_IP6[@]}"
do
OPTS+=" --interface=$IP6"
done
IP6=1
fi
if [[ -n "$LISTEN_TCP" ]] if [[ -n "$LISTEN_TCP" ]]
then then
OPTS+=" --listen-tcp=$LISTEN_TCP" OPTS+=" --listen-tcp=$LISTEN_TCP"
@ -154,14 +144,10 @@ start() {
iptables -N rtpengine iptables -N rtpengine
iptables -t filter -A INPUT -j rtpengine iptables -t filter -A INPUT -j rtpengine
iptables -I rtpengine -p udp -j RTPENGINE --id $TABLE iptables -I rtpengine -p udp -j RTPENGINE --id $TABLE
if [[ $IP6 == 1 ]] ip6tables -I rtpengine -p udp -j RTPENGINE --id $TABLE
then
ip6tables -I rtpengine -p udp -j RTPENGINE --id $TABLE
fi
cat <<EOF > "$cachefile" cat <<EOF > "$cachefile"
CUR_TABLE=$TABLE CUR_TABLE=$TABLE
CUR_IP6=$IP6
EOF EOF
fi fi
echo -n $"Starting $prog: " echo -n $"Starting $prog: "
@ -183,10 +169,7 @@ stop() {
echo "Unloading module for in-kernel packet forwarding" echo "Unloading module for in-kernel packet forwarding"
echo "del $TABLE" > /proc/rtpengine/control echo "del $TABLE" > /proc/rtpengine/control
iptables -D rtpengine -p udp -j RTPENGINE --id $CUR_TABLE iptables -D rtpengine -p udp -j RTPENGINE --id $CUR_TABLE
if [[ $CUR_IP6 == 1 ]] ip6tables -D rtpengine -p udp -j RTPENGINE --id $CUR_TABLE
then
ip6tables -D rtpengine -p udp -j RTPENGINE --id $CUR_TABLE
fi
iptables -t filter -D INPUT -j rtpengine iptables -t filter -D INPUT -j rtpengine
iptables -X rtpengine iptables -X rtpengine
# rmmod xt_RTPENGINE # rmmod xt_RTPENGINE

@ -8,8 +8,7 @@ TABLE=0 # (o) iptables table for in-kernel forwarding rules
# comment out when "KERNEL=no" # comment out when "KERNEL=no"
FALLBACK=yes # (m) "yes" enables fallback to userspace forwarding FALLBACK=yes # (m) "yes" enables fallback to userspace forwarding
# only, "no" disables # 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_IP[0]=127.0.0.1 # (m) Local IPv4/6 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].
# #
# At least one of LISTEN_(TCP|UDP|NG) is required # At least one of LISTEN_(TCP|UDP|NG) is required
#LISTEN_TCP=127.0.0.1:2222 # IP address and port combination for TCP #LISTEN_TCP=127.0.0.1:2222 # IP address and port combination for TCP

Loading…
Cancel
Save