Revision: 2785
          http://ipcop.svn.sourceforge.net/ipcop/?rev=2785&view=rev
Author:   dotzball
Date:     2009-05-04 20:15:30 +0000 (Mon, 04 May 2009)

Log Message:
-----------
Remove old portforwarding stuff.

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/ipcop-gui
    ipcop/trunk/config/rootfiles/common/misc-progs
    ipcop/trunk/lfs/ipcop
    ipcop/trunk/src/libs/header.pl
    ipcop/trunk/src/misc-progs/Makefile
    ipcop/trunk/src/rc.d/rc.updatered

Modified: ipcop/trunk/config/rootfiles/common/ipcop-gui
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipcop-gui       2009-05-04 20:12:25 UTC 
(rev 2784)
+++ ipcop/trunk/config/rootfiles/common/ipcop-gui       2009-05-04 20:15:30 UTC 
(rev 2785)
@@ -32,7 +32,6 @@
 home/httpd/cgi-bin/netstatus.cgi
 #home/httpd/cgi-bin/networks.cgi
 home/httpd/cgi-bin/ovpnmain.cgi
-home/httpd/cgi-bin/portfw.cgi
 home/httpd/cgi-bin/pppsetup.cgi
 home/httpd/cgi-bin/proxy.cgi
 home/httpd/cgi-bin/proxygraphs.cgi

Modified: ipcop/trunk/config/rootfiles/common/misc-progs
===================================================================
--- ipcop/trunk/config/rootfiles/common/misc-progs      2009-05-04 20:12:25 UTC 
(rev 2784)
+++ ipcop/trunk/config/rootfiles/common/misc-progs      2009-05-04 20:15:30 UTC 
(rev 2785)
@@ -80,7 +80,6 @@
 usr/local/bin/setdate
 usr/local/bin/setddns.pl
 usr/local/bin/setfwrules
-usr/local/bin/setportfw
 usr/local/bin/setreservedports.pl
 usr/local/bin/sysinfo
 usr/local/bin/trafficsum

Modified: ipcop/trunk/lfs/ipcop
===================================================================
--- ipcop/trunk/lfs/ipcop       2009-05-04 20:12:25 UTC (rev 2784)
+++ ipcop/trunk/lfs/ipcop       2009-05-04 20:15:30 UTC (rev 2785)
@@ -63,7 +63,7 @@
        for i in addon-lang alcatelusb auth backup ca certs cnx_pci crls ddns 
dhcp dmzholes \
                eagle-usb eciadsl ethernet firewall firmware isdn key logging 
main modem  \
                ovpn ovpn/ca ovpn/ccd ovpn/certs ovpn/crls ovpn/openssl patches 
\
-               portfw ppp private proxy red remote shaping time traffic vpn  
xtaccess ; do \
+               ppp private proxy red remote shaping time traffic vpn  xtaccess 
; do \
                        mkdir -p $(CONFIG_ROOT)/$$i; \
        done
 
@@ -76,7 +76,7 @@
                firewall/customservices firewall/policy firewall/serviceGroups 
firewall/settings firewall/wireless \
                isdn/settings main/hosts main/flashsettings main/scheduler 
patches/available patches/installed \
                ovpn/caconfig ovpn/ovpnconfig ovpn/settings \
-               portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 
ppp/settings-4 \
+               ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
                ppp/settings-5 ppp/settings proxy/settings remote/settings 
shaping/settings \
                shaping/config traffic/settings vpn/config vpn/settings 
vpn/ipsec.conf \
                vpn/ipsec.secrets vpn/caconfig; do \

Modified: ipcop/trunk/src/libs/header.pl
===================================================================
--- ipcop/trunk/src/libs/header.pl      2009-05-04 20:12:25 UTC (rev 2784)
+++ ipcop/trunk/src/libs/header.pl      2009-05-04 20:15:30 UTC (rev 2785)
@@ -31,7 +31,7 @@
 $Header::colourblue   = '#333399';
 $Header::colourfw     = '#000000';    # only connections.cgi
 $Header::colourvpn    = '#990099';    # only connections.cgi
-$Header::colouryellow = '#FFFF00';    # used when higlighting selections  
+$Header::colouryellow = '#FFFF00';    # used when higlighting selections
 $Header::colourerr    = '#FF0000';    # only header.pl, many scripts use 
colourred for warnings messages
 $Header::viewsize     = 150;
 $Header::boxframe     = '';           # retain frametype for closebox
@@ -214,13 +214,7 @@
         @{$menu{'5.firewall'}{'subMenu'}},
         [ $Lang::tr{'firewall settings'}, '/cgi-bin/fwrulesadm.cgi', "IPCop 
$Lang::tr{'firewall settings'}" ]
     );
-    push(
-        @{$menu{'5.firewall'}{'subMenu'}},
-        [ $Lang::tr{'ssport forwarding'}, '/cgi-bin/portfw.cgi', "IPCop 
$Lang::tr{'port forwarding configuration'}" ]
-    );
 
-#                      push(@{$menu{'5.firewall'}{'subMenu'}}, [ 
$Lang::tr{'external access'} , '/cgi-bin/xtaccess.cgi', "IPCop 
$Lang::tr{'external access configuration'}" ]);
-#                      push(@{$menu{'5.firewall'}{'subMenu'}}, [ 
$Lang::tr{'ssdmz pinholes'} , '/cgi-bin/dmzholes.cgi', "IPCop $Lang::tr{'dmz 
pinhole configuration'}" ]);
     if ($ethsettings{'BLUE_COUNT'} >= 1) {
         push(
             @{$menu{'5.firewall'}{'subMenu'}},

Modified: ipcop/trunk/src/misc-progs/Makefile
===================================================================
--- ipcop/trunk/src/misc-progs/Makefile 2009-05-04 20:12:25 UTC (rev 2784)
+++ ipcop/trunk/src/misc-progs/Makefile 2009-05-04 20:15:30 UTC (rev 2785)
@@ -6,7 +6,7 @@
 OBJLIBS=setuid.o ../installer/helper.o
 
 PROGS = iowrap
-SUID_PROGS = accountingctrl setfwrules setportfw  \
+SUID_PROGS = accountingctrl setfwrules   \
        restartdhcp restartsquid restartssh ipcopreboot \
        ipcopbkcfg ipcoprscfg installpackage installfcdsl ipsecctrl \
        setaliases ipcopbackup restartshaping restartntpd \

Modified: ipcop/trunk/src/rc.d/rc.updatered
===================================================================
--- ipcop/trunk/src/rc.d/rc.updatered   2009-05-04 20:12:25 UTC (rev 2784)
+++ ipcop/trunk/src/rc.d/rc.updatered   2009-05-04 20:15:30 UTC (rev 2785)
@@ -110,8 +110,6 @@
         if [ -e "/var/ipcop/red/active" ]; then
             # it is a renewal of IP
             /usr/local/bin/setfwrules --all
-            /usr/local/bin/setportfw
-#           /usr/local/bin/setxtaccess
             /usr/local/bin/setddns.pl -f
             #inform running (-t) squid copy of dns/ip changes.
             [ -e /var/ipcop/proxy/squid.conf ] && /usr/local/bin/restartsquid 
-t
@@ -136,8 +134,6 @@
     [ "$IFACE" != "" ] && /sbin/ifconfig $IFACE -multicast
     /etc/rc.d/rc.firewall reload
     /usr/local/bin/setfwrules --all
-    /usr/local/bin/setportfw
-#   /usr/local/bin/setxtaccess
     /usr/local/bin/setddns.pl -f
     #inform running (-t) squid copy of dns/ip changes.
     [ -e /var/ipcop/proxy/squid.conf ] && /usr/local/bin/restartsquid -t


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations 
Conference from O'Reilly Media. Velocity features a full day of 
expert-led, hands-on workshops and two days of sessions from industry 
leaders in dedicated Performance & Operations tracks. Use code vel09scf 
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to