michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OSX fixes

Browse Source
This commit is contained in:
Jamie Cameron
2008-02-28 19:23:36 +00:00
parent cd4565aba0
commit ed708d7fd2
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bandwidth/CHANGELOG
View File

@@ -8,3 +8,5 @@ Firewall rules are now correctly created even when using Shorewall, by adding th
The module now also supports the IPFilter firewall, although counts may not be accurate on fast network interfaces, as IPFilter appears to not log all packets.
---- Changes since 1.390 ----
Bandwidth monitoring can now be setup on an interface that isn't currently active, including patterns like ppp+.
---- Changes since 1.400 ----
Fixed several bugs that prevented bandwidth monitoring from working properly on FreeBSD and OSX.

17
bandwidth/bandwidth-lib.pl
View File

@@ -93,10 +93,11 @@ sub find_sysconf
{
local ($conf) = @_;
local $c;
local @ll = &get_loglevel();
foreach $c (@$conf) {
next if (!$c->{'active'});
next if ($c->{'file'} ne $bandwidth_log);
next if ($c->{'sel'}->[0] ne &get_loglevel());
next if ($c->{'sel'}->[0] ne $ll[0]);
return $c;
}
return undef;
@@ -386,7 +387,7 @@ else {
# get_firewall_loglevel()
sub get_firewall_loglevel
{
return "kern.=debug";
return ( "kern.=debug" );
}
############### functions for ipfw #################
@@ -477,10 +478,10 @@ else {
sub process_ipfw_line
{
local ($line, $hours, $time_now) = @_;
if ($line =~ /^(\S+)\s+(\d+)\s+(\d+):(\d+):(\d+).*ipfw:\s+\S+\s+Accept\s+(\S+)\s+(\S+)\s+(\S+)\s+(in|out)\s+via\s+(\S+)/) {
if ($line =~ /^(\S+)\s+(\d+)\s+(\d+):(\d+):(\d+).*ipfw:\s+\S+\s+(Accept|Count)\s+(\S+)\s+(\S+)\s+(\S+)\s+(in|out)\s+via\s+(\S+)/) {
# Found a valid line
local ($mon, $day, $hr, $min, $sec) = ($1, $2, $3, $4, $5);
local ($proto, $src, $dest, $dir, $iface) = ($6, $7, $8, $9, $10);
local ($proto, $src, $dest, $dir, $iface) = ($7, $8, $9, $10, $11);
local ($srchost, $srcport) = split(/:/, $src);
local ($desthost, $destport) = split(/:/, $dest);
$proto =~ s/:.*//;
@@ -510,7 +511,7 @@ if ($line =~ /^(\S+)\s+(\d+)\s+(\d+):(\d+):(\d+).*ipfw:\s+\S+\s+Accept\s+(\S+)\s
$port = '_'.$srcport.'_'.$destport;
}
}
local $host = $dir eq "in" ? $dest : $src;
local $host = $dir eq "in" ? $desthost : $srchost;
local $key = $host.'_'.$proto.$port;
local ($in, $out) = split(/ /, $hour->{$key});
if ($dir eq "in") {
@@ -532,7 +533,7 @@ else {
# get_ipfw_loglevel()
sub get_ipfw_loglevel
{
return "security.*";
return ( "security.*", "kern.debug" );
}
############### functions for Shorewall #################
@@ -626,7 +627,7 @@ return undef;
# get_shorewall_loglevel()
sub get_shorewall_loglevel
{
return "kern.=debug";
return ( "kern.=debug" );
}
sub process_shorewall_line
@@ -776,7 +777,7 @@ else {
# get_ipfilter_loglevel()
sub get_ipfilter_loglevel
{
return "local7.debug";
return ( "local7.debug" );
}
1;

3
bandwidth/setup.cgi
View File

@@ -51,7 +51,8 @@ else {
}
if (!$filter) {
# Create filter for facility and level
($fac, $lvl) = split(/\./, &get_loglevel());
local @ll = &get_loglevel();
($fac, $lvl) = split(/\./, $ll[0]);
$lvl =~ s/^=//;
$filter = { 'name' => 'filter',
'type' => 1,