malhuda/AS-Stats
1
0
Fork 0
mirror of https://github.com/manuelkasper/AS-Stats.git synced 2025-02-20 11:44:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #32 from clobrother/master

Browse Source 
Few patchs to merge our codebase
This commit is contained in:
Manuel Kasper 2014-06-16 15:41:40 +02:00
commit 28db9b73df
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/asstatd.pl Normal file → Executable file
View File

@ -11,6 +11,7 @@ use IO::Select;
use IO::Socket;
use RRDs;
use Getopt::Std;
use Scalar::Util qw(looks_like_number);
my %knownlinks;
my %link_samplingrates;
@ -87,6 +88,7 @@ sub REAPER {
sub TERM {
print "SIGTERM received\n";
flush_cache(1);
exit 0;
}
@ -515,9 +517,10 @@ sub parse_sflow {
$ipversion = 6;
} else {
$noctets = $sFlowSample->{'HeaderFrameLength'} - 14;
# make one more attempt at figuring out the IP version
if ((defined($sFlowSample->{'GatewayIpVersionNextHopRouter'}) &&
if ((defined($sFlowSample->{'GatewayIpVersionNextHopRouter'}) &&
looks_like_number($sFlowSample->{'GatewayIpVersionNextHopRouter'}) &&
$sFlowSample->{'GatewayIpVersionNextHopRouter'} == 2) ||
(defined($sFlowSample->{'HeaderType'}) && $sFlowSample->{'HeaderType'} eq '86dd')) {
$ipversion = 6;
@ -625,7 +628,8 @@ sub handleflow {
}
sub flush_cache {
if ($childrunning || ((time - $ascache_lastflush) < $ascache_flush_interval)) {
my $force = shift;
if (!defined($force) && ($childrunning || ((time - $ascache_lastflush) < $ascache_flush_interval))) {
# can't/don't want to flush cache right now
return;
}
@ -639,17 +643,21 @@ sub flush_cache {
} elsif ($pid != 0) {
# in parent
$ascache_lastflush = time;
for (keys %$ascache) {
if ($_ % 10 == $ascache_flush_number % 10) {
delete $ascache->{$_};
if(!defined($force)){
for (keys %$ascache) {
if ($_ % 10 == $ascache_flush_number % 10) {
delete $ascache->{$_};
}
}
}else{
$ascache = ();
}
$ascache_flush_number++;
return;
}
while (my ($as, $cacheent) = each(%$ascache)) {
if ($as % 10 == $ascache_flush_number % 10) {
if (defined($force) || $as % 10 == $ascache_flush_number % 10) {
#print "$$: flushing data for AS $as ($cacheent->{updatets})\n";
my $rrdfile = getrrdfile($as, $cacheent->{updatets});

2
www/config.inc
View File

@ -22,6 +22,8 @@ $asset_cache_life = "604800"; # 604800 seconds = 7 days
$compat_rrdtool12 = false; # compatibility with RRDtool 1.2 (show95th will not work if this is set)
$decolore = true; #decolore the "negative" part of graphs (only usefull if $outispositive is true)
/* Custom links to be shown for each AS. You can use %as% as a
placeholder for the ASN. */
$customlinks = array(

2
www/gengraph.php
View File

@ -107,7 +107,7 @@ if ($compat_rrdtool12) {
/* generate graph area/stack for inbound */
$i = 0;
foreach ($knownlinks as $link) {
if ($outispositive)
if ($outispositive && $decolore)
$col = $link['color'] . "BB";
else
$col = $link['color'];