Fixed guardian gateway detection - this fixes bug #0000665

diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl
index 5c421868b9bebb25faab1044541dfee9f206462a..b5c3f9c16ae78c3499b5c2f062396f6ffd784177 100644 (file)
--- a/config/guardian/guardian.pl
+++ b/config/guardian/guardian.pl
@@ -34,12 +34,13 @@ if ($hostipaddr !~ /\d+\.\d+\.\d+\.\d+/) {
 
 $networkaddr = $hostipaddr;
 $networkaddr =~ s/\d+$/0/;
-$gatewayaddr = $hostipaddr;
-$gatewayaddr =~ s/\d+$/$hostgatewaybyte/;
+$gatewayaddr = `cat /var/ipfire/red/remote-ipaddress 2>/dev/null`;
 $broadcastaddr = $hostipaddr;
 $broadcastaddr =~ s/\d+$/255/;
 &build_ignore_hash;
 
+print "My gatewayaddess is: $gatewayaddr\n";
+
 # This is the target hash. If a packet was destened to any of these, then the
 # sender of that packet will get denied, unless it is on the ignore list..
 

diff --git a/lfs/guardian b/lfs/guardian
index f3118f63beb46265568cd3d9c7f81431a1a21d0f..e08a469de8cb5320f5fccf778d86b50bfcddf411 100644 (file)
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -30,7 +30,7 @@ THISAPP    = guardian-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = guardian
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""