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

Forward Firewall:

Browse Source 
1) fixed outgoingfw converter: now checkbox for logging is converted corectly
2) edited p2p_block: now a checked prot is allowed
This commit is contained in:
Alexander Marx
2013-01-22 05:42:46 +01:00
committed by Michael Tremer
parent 3b81fad442
commit 8d1beadce3
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/forwardfw/convert-outgoingfw
View File

@@ -292,7 +292,7 @@ sub process_rules
$configline[4] =~ s/,/;/g; $configline[4] =~ s/,/;/g;
$remark = $configline[4]; $remark = $configline[4];
}else{$remark = '';} }else{$remark = '';}
if($configline[9] eq 'aktiv'){ $log='ON';}else{$log='';} if($configline[9] eq 'Active'){ $log='ON';}else{$log='';}
if($configline[10] eq 'on' && $configline[11] eq 'on' && $configline[12] eq 'on' && $configline[13] eq 'on' && $configline[14] eq 'on' && $configline[15] eq 'on' && $configline[16] eq 'on'){ if($configline[10] eq 'on' && $configline[11] eq 'on' && $configline[12] eq 'on' && $configline[13] eq 'on' && $configline[14] eq 'on' && $configline[15] eq 'on' && $configline[16] eq 'on'){
if($configline[17] eq '00:00' && $configline[18] eq '00:00'){ if($configline[17] eq '00:00' && $configline[18] eq '00:00'){
$time=''; $time='';

6
config/forwardfw/rules.pl
View File

@@ -246,12 +246,12 @@ sub p2pblock
my $CMD = "-m ipp2p"; my $CMD = "-m ipp2p";
foreach my $p2pentry (sort @p2ps) { foreach my $p2pentry (sort @p2ps) {
my @p2pline = split( /\;/, $p2pentry ); my @p2pline = split( /\;/, $p2pentry );
if ( $fwdfwsettings{'POLICY'} eq 'MODE2' ) { if ( $fwdfwsettings{'POLICY'} eq 'MODE1' ) {
$DO = "DROP"; $DO = "ACCEPT";
if ("$p2pline[2]" eq "on") { if ("$p2pline[2]" eq "on") {
$P2PSTRING = "$P2PSTRING --$p2pline[1]"; $P2PSTRING = "$P2PSTRING --$p2pline[1]";
} }
} else { }else {
$DO = "RETURN"; $DO = "RETURN";
if ("$p2pline[2]" eq "off") { if ("$p2pline[2]" eq "off") {
$P2PSTRING = "$P2PSTRING --$p2pline[1]"; $P2PSTRING = "$P2PSTRING --$p2pline[1]";

6
html/cgi-bin/forwardfw.cgi
View File

@@ -1916,7 +1916,7 @@ END
if($$hash{$key}[25] ne ''){push (@days,$Lang::tr{'fwdfw wd_sun'});} if($$hash{$key}[25] ne ''){push (@days,$Lang::tr{'fwdfw wd_sun'});}
my $weekdays=join(",",@days); my $weekdays=join(",",@days);
if (@days){ if (@days){
print"<tr bgcolor='#FFE4B5'><td colspan='7'>$Lang::tr{'fwdfw time'} "; print"<tr bgcolor='#FFE4B5'><td colspan='6'>$Lang::tr{'fwdfw time'} ";
print"$weekdays"; print"$weekdays";
print "&nbsp $Lang::tr{'fwdfw from'} $$hash{$key}[26] &nbsp $Lang::tr{'fwdfw till'} $$hash{$key}[27]</td><td colspan='8'></d></tr>"; print "&nbsp $Lang::tr{'fwdfw from'} $$hash{$key}[26] &nbsp $Lang::tr{'fwdfw till'} $$hash{$key}[27]</td><td colspan='8'></d></tr>";
} }
@@ -1951,8 +1951,8 @@ END
<td width='66%' align='center' colspan='2'>$p2pline[0]:</td><td width='33%' align='center'><input type='hidden' name='P2PROT' value='$p2pline[1]' /><input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' ><input type='hidden' name='ACTION' value='togglep2p'></td></tr></form> <td width='66%' align='center' colspan='2'>$p2pline[0]:</td><td width='33%' align='center'><input type='hidden' name='P2PROT' value='$p2pline[1]' /><input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' ><input type='hidden' name='ACTION' value='togglep2p'></td></tr></form>
END END
} }
print"<tr><td width='10%'><input type='image' img src='/images/on.gif'></td><td>$Lang::tr{'outgoing firewall p2p deny'}</td><td></td></tr>"; print"<tr><td width='10%'><input type='image' img src='/images/on.gif'></td><td>$Lang::tr{'outgoing firewall p2p allow'}</td><td></td></tr>";
print"<tr><td width='10%'><input type='image' img src='/images/off.gif'></td><td>$Lang::tr{'outgoing firewall p2p allow'}</td><td></td></tr></table>"; print"<tr><td width='10%'><input type='image' img src='/images/off.gif'></td><td>$Lang::tr{'outgoing firewall p2p deny'}</td><td></td></tr></table>";
&Header::closebox(); &Header::closebox();
} }
sub fillselect sub fillselect