Revision: 7022
http://ipcop.svn.sourceforge.net/ipcop/?rev=7022&view=rev
Author: dotzball
Date: 2013-05-07 19:43:19 +0000 (Tue, 07 May 2013)
Log Message:
-----------
Always add 'Red' iface to default interfaces but set it as ACTIV=no in case
/var/ipcop/red/iface is empty.
This the case when an IPcop is fresh installed and was not connected on RED
yet. If the 'Red' entry is missing
it is not possible to enter external access before the RED interface was
connected for the first time.
Modified Paths:
--------------
ipcop/trunk/src/libs/DataAccess.pl
Modified: ipcop/trunk/src/libs/DataAccess.pl
===================================================================
--- ipcop/trunk/src/libs/DataAccess.pl 2013-05-04 07:49:01 UTC (rev 7021)
+++ ipcop/trunk/src/libs/DataAccess.pl 2013-05-07 19:43:19 UTC (rev 7022)
@@ -464,19 +464,16 @@
}
my $red_iface = &General::getredinterface();
- if ($red_iface ne '') {
-
- $ifaces->{'Red'}{'IFACE'} = $red_iface;
- $ifaces->{'Red'}{'ID'} = 'RED_1';
- $ifaces->{'Red'}{'COLOR'} = 'RED_COLOR';
- if (-e "/var/ipcop/red/active") {
- $ifaces->{'Red'}{'ACTIV'} = 'yes';
- }
- else {
- $ifaces->{'Red'}{'ACTIV'} = 'no';
- }
- $ifaceCounts->{'RED'}++;
+ $ifaces->{'Red'}{'IFACE'} = $red_iface;
+ $ifaces->{'Red'}{'ID'} = 'RED_1';
+ $ifaces->{'Red'}{'COLOR'} = 'RED_COLOR';
+ if (-e "/var/ipcop/red/active" && $red_iface ne '') {
+ $ifaces->{'Red'}{'ACTIV'} = 'yes';
}
+ else {
+ $ifaces->{'Red'}{'ACTIV'} = 'no';
+ }
+ $ifaceCounts->{'RED'}++;
####
## setup VPN interfaces
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
