webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 00:12:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-01-26 17:43:18 +01:00
parent 93dc8835c3 24614d7dfb
commit 0cb985d8fc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/45/update.sh
View File

@@ -54,7 +54,7 @@ echo Starting Proxy
/etc/init.d/squid start 2>/dev/null
echo Rewriting Outgoing FW Rules
/var/ipfire/outgoing/bin/outgoingfw.pl
if [ `grep "ENABLED=on" /var/ipfire/vpn/setting` ]; then
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
echo Starting vpn-watch
/usr/local/bin/vpn-watch &
fi

2
html/cgi-bin/logs.cgi/firewalllog.dat
View File

@@ -333,7 +333,7 @@ foreach $_ (@log)
my $comment = $3;
my $packet = $4;
$packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 $1 =~ /2./ ){ $iface="";}
$packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 =~ /2./ ){ $iface="";}
$packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1;
$packet =~ /DST=([\d\.]+)/; my $dstaddr=$1;
$packet =~ /MAC=([\w+\:]+)/; my $macaddr=$1;