Revision: 7065
http://sourceforge.net/p/ipcop/svn/7065
Author: dotzball
Date: 2013-06-08 20:21:14 +0000 (Sat, 08 Jun 2013)
Log Message:
-----------
Fix SF bug #805, undefined value in connections webui.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/connections.cgi
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Modified: ipcop/trunk/html/cgi-bin/connections.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/connections.cgi 2013-06-08 15:37:41 UTC (rev
7064)
+++ ipcop/trunk/html/cgi-bin/connections.cgi 2013-06-08 20:21:14 UTC (rev
7065)
@@ -180,36 +180,37 @@
$icount = $netsettings{"${interface}_COUNT"};
while ($icount > 0) {
- my $ip = new
NetAddr::IP($netsettings{"${interface}_${icount}_ADDRESS"},
$netsettings{"${interface}_${icount}_NETMASK"});
- my $lc_colour = "ipcop_iface_bg_".lc(${interface});
+ if(my $ip = new
NetAddr::IP($netsettings{"${interface}_${icount}_ADDRESS"},
$netsettings{"${interface}_${icount}_NETMASK"})) {
+ my $lc_colour = "ipcop_iface_bg_".lc(${interface});
- # Add Firewall Interface
- push(@network, $ip->addr());
- push(@colour, 'ipcop_iface_bg_fw');
- push(@ports, '0');
- push(@protocols, '');
+ # Add Firewall Interface
+ push(@network, $ip->addr());
+ push(@colour, 'ipcop_iface_bg_fw');
+ push(@ports, '0');
+ push(@protocols, '');
- # Add Broadcast address
- push(@network, $ip->broadcast()->addr());
- push(@colour, 'ipcop_iface_bg_fw');
- push(@ports, '0');
- push(@protocols, '');
+ # Add Broadcast address
+ push(@network, $ip->broadcast()->addr());
+ push(@colour, 'ipcop_iface_bg_fw');
+ push(@ports, '0');
+ push(@protocols, '');
- # Add Network
- push(@network, $ip->network());
- push(@colour, $lc_colour);
- push(@ports, '0');
- push(@protocols, '');
-
- # Add Routes
- @routes = `/sbin/ip route list | /bin/grep
'via.*$netsettings{"${interface}_${icount}_DEV"}'`;
- foreach my $route (@routes) {
- chomp($route);
- my @temp = split(/[\t ]+/, $route);
- push(@network, $temp[0]);
- push(@colour, 'ipcop_iface_bg_green');
+ # Add Network
+ push(@network, $ip->network());
+ push(@colour, $lc_colour);
push(@ports, '0');
push(@protocols, '');
+
+ # Add Routes
+ @routes = `/sbin/ip route list | /bin/grep
'via.*$netsettings{"${interface}_${icount}_DEV"}'`;
+ foreach my $route (@routes) {
+ chomp($route);
+ my @temp = split(/[\t ]+/, $route);
+ push(@network, $temp[0]);
+ push(@colour, 'ipcop_iface_bg_green');
+ push(@ports, '0');
+ push(@protocols, '');
+ }
}
$icount--;
}
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-06-08 15:37:41 UTC
(rev 7064)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-06-08 20:21:14 UTC
(rev 7065)
@@ -8,6 +8,7 @@
/etc/rc.d/rc.updatered
/etc/sysctl.conf
/home/httpd/cgi-bin/aliases.cgi
+/home/httpd/cgi-bin/connections.cgi
/home/httpd/cgi-bin/credits.cgi
/home/httpd/cgi-bin/ddns.cgi
/home/httpd/cgi-bin/dhcp.cgi
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2013-06-08 15:37:41 UTC (rev
7064)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-06-08 20:21:14 UTC (rev
7065)
@@ -7,6 +7,7 @@
cairo recompiled with -O3, isdn4k-utils with -Os
-fno-strict-aliasing<br />
Add xz-5.0.4<br />
Language updates.<br />
+ Fix SF bug #805, undefined value in connections webui.<br />
Upgrade acpid to 2.0.17, arping to 2.13, bash to 4.2.45, bind to
9.8.4-P2, CnxADSL to ..PIM-2.6-2.7
conntrack-tools to 1.2.2, coreutils to 8.21, dhcpcd to 5.6.8,
diffutils-3.3, dnsmasq to 2.66,
e2fsprogs to 1.42.7, ethtool to 3.6, expat to 2.1.0, freetype to
2.4.12, fontconfig to 2.9,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
