[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ff7a39506abf741d8e57647453a6171a0cc563fd - IPFire-SCM

19 Feb 2011

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
       via  ff7a39506abf741d8e57647453a6171a0cc563fd (commit)
      from  fc9d164bfece5cecc99110f61c19b20be78dacbc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ff7a39506abf741d8e57647453a6171a0cc563fd
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Feb 19 15:07:54 2011 +0100
Add iptv/inet vlan settings to webif.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/core/47/filelists/files |    2 +
 html/cgi-bin/pppsetup.cgi                |   24 +++++++++++++++-
 src/initscripts/init.d/networking/red    |   45 ++++++++++++++---------------
 3 files changed, 47 insertions(+), 24 deletions(-)
Difference in files:

diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files
index adbbd29..d63f861 100644
--- a/config/rootfiles/core/47/filelists/files
+++ b/config/rootfiles/core/47/filelists/files
@@ -1,5 +1,7 @@
 etc/system-release
 etc/rc.d/init.d/sshd
+etc/rc.d/init.d/networking/red
+srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/remote.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index e2af0a0..443c201 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -200,6 +200,16 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
         delete $pppsettings{'ENCAP_RFC1483'};
         delete $pppsettings{'ENCAP_RFC2364'};
+        if ((!($pppsettings{'INET_VLAN'} =~ /^\d+$/)) ||
+		($pppsettings{'INET_VLAN'} eq '') ||
+		($pppsettings{'INET_VLAN'} > 4095) ) {
+			$errormessage = 'INET_VLAN - '.$Lang::tr{'invalid input'}; }
+
+        if ((!($pppsettings{'IPTV_VLAN'} =~ /^\d+$/)) ||
+		($pppsettings{'IPTV_VLAN'} eq '') ||
+		($pppsettings{'IPTV_VLAN'} > 4095) ) {
+			$errormessage = 'IPTV_VLAN - '.$Lang::tr{'invalid input'}; }
+
 ERROR:
         if ($errormessage) {
                 $pppsettings{'VALID'} = 'no'; }
@@ -413,6 +423,9 @@ $checked{'IPTV'}{'enable'} = '';
 $checked{'IPTV'}{'disable'} = '';
 $checked{'IPTV'}{$pppsettings{'IPTV'}} = "checked='checked'";
+if ($pppsettings{'INET_VLAN'} eq '') { $pppsettings{'INET_VLAN'}='7'; }
+if ($pppsettings{'IPTV_VLAN'} eq '') { $pppsettings{'IPTV_VLAN'}='8'; }
+
 &Header::openpage($Lang::tr{'ppp setup'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
@@ -747,7 +760,14 @@ print <<END
    	</tr>
    	<tr>
    	        <td colspan='3' width='100%'><input type='radio' name='IPTV' value='disable' $checked{'IPTV'}{'disable'}>$Lang::tr{'off'}</td>
-		 </tr>
+		</tr>
+		<tr>
+			<td>INET_VLAN</td>
+			<td><input size=5 type='number' name='INET_VLAN' value='$pppsettings{'INET_VLAN'}' /></td>
+			<td>IPTV_VLAN</td>
+			<td><input size=5 type='number' name='IPTV_VLAN' value='$pppsettings{'IPTV_VLAN'}' /></td>
+		</tr>
+
 END
 ;
    }
@@ -921,6 +941,8 @@ sub initprofile
         $pppsettings{'BACKUPPROFILE'} = $pppsettings{'PROFILE'};
         $pppsettings{'IPTVSERVERS'} = '192.168.2.51/32';
         $pppsettings{'IPTV'} = 'disable';
+        $pppsettings{'INET_VLAN'} = '7';
+        $pppsettings{'IPTV_VLAN'} = '8';
if ( -e '/usr/local/bin/igmpproxy'){
            $pppsettings{'IPTV'} = 'enable';
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index f29884b..0c41663 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -19,9 +19,8 @@
 . ${rc_functions}
#Define some defaults
-RED_VDSL_INET_VLAN=7
-RED_VDSL_IPTV_VLAN=8
-RED_VDSL_IPTV_DISABLE=0
+INET_VLAN=7
+IPTV_VLAN=8
eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
 if [ "$RRDLOG" == "" ]; then
@@ -252,48 +251,48 @@ case "${1}" in
    		fi
if [ "$TYPE" == "vdsl" ]; then
-				boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_INET_VLAN} ..."
+				boot_mesg "Createing VLAN Interface ${DEVICE}.${INET_VLAN} ..."
    			modprobe 8021q
-				vconfig add ${DEVICE} ${RED_VDSL_INET_VLAN}
+				vconfig add ${DEVICE} ${INET_VLAN}
    			if [ -n "$MAC1" ]; then
-					boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_INET_VLAN} to ${MAC1}"	
-					ip link set dev ${DEVICE}.${RED_VDSL_INET_VLAN} address ${MAC1}
+					boot_mesg "Setting mac address on ${DEVICE}.${INET_VLAN} to ${MAC1}"	
+					ip link set dev ${DEVICE}.${INET_VLAN} address ${MAC1}
    				evaluate_retval
    			fi
-				PPP_NIC=${DEVICE}.${RED_VDSL_INET_VLAN}
+				PPP_NIC=${DEVICE}.${INET_VLAN}
    			sleep 0.2
    			ip link set ${PPP_NIC} up
    			TYPE="pppoe"
    		fi
    		if [ "${IPTV}" == "enable" ]; then
-				PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid"
-				LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info"
+				PIDFILE="/var/run/dhcpcd-${DEVICE}.${IPTV_VLAN}.pid"
+				LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${IPTV_VLAN}.info"
    			# Test to see if there is a stale pid file
    			if [ -f "$PIDFILE" ]; then
    				ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
    				if [ $? != 0 ]; then
-						rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null
+						rm -f /var/run/dhcpcd-${DEVICE}.${IPTV_VLAN}.pid > /dev/null
    				fi
    			fi
if [ ! -f "$PIDFILE" ]; then
-					boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..."
+					boot_mesg "Createing VLAN Interface ${DEVICE}.${IPTV_VLAN} ..."
    				modprobe 8021q
-					vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN}
+					vconfig add ${DEVICE} ${IPTV_VLAN}
    				if [ -n "$MAC2" ]; then
-						boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}"	
-						ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2}
+						boot_mesg "Setting mac address on ${DEVICE}.${IPTV_VLAN} to ${MAC2}"	
+						ip link set dev ${DEVICE}.${IPTV_VLAN} address ${MAC2}
    					evaluate_retval
    				fi
-					boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..."
-					/sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
+					boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${IPTV_VLAN} interface..."
+					/sbin/dhcpcd ${DEVICE}.${IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
    				RET="$?"
if [ "$RET" = "0" ]; then
-						. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info
+						. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${IPTV_VLAN}.info
    					echo ""
    					echo_ok
-						boot_mesg "           DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:"
+						boot_mesg "           DHCP Assigned Settings for ${DEVICE}.${IPTV_VLAN}:"
    					boot_mesg_flush
    					boot_mesg "           IP Address:      $ip_address"
    					boot_mesg_flush
@@ -553,12 +552,12 @@ case "${1}" in
    	fi
if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then
-			link_status=`ip link show $DEVICE.${RED_VDSL_INET_VLAN} 2> /dev/null`
+			link_status=`ip link show $DEVICE.${INET_VLAN} 2> /dev/null`
    		if [ -n "${link_status}" ]; then
    			if echo "${link_status}" | grep -q UP; then
-					boot_mesg "Bringing down the ${DEVICE}.${RED_VDSL_INET_VLAN} interface..."
-					ip link set ${DEVICE}.${RED_VDSL_INET_VLAN} down
-					vconfig rem ${DEVICE}.${RED_VDSL_INET_VLAN}
+					boot_mesg "Bringing down the ${DEVICE}.${INET_VLAN} interface..."
+					ip link set ${DEVICE}.${INET_VLAN} down
+					vconfig rem ${DEVICE}.${INET_VLAN}
    				evaluate_retval
    			fi
    		else
hooks/post-receive
--
IPFire 2.x development tree

    