From 0063facbb84abaa4e33a1bf43df0b11f3022002f Mon Sep 17 00:00:00 2001 From: jack Date: Wed, 25 Jun 2014 16:17:06 +0200 Subject: [PATCH] add the forgotten 'type' in recursive handflow() --- bin/asstatd.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/asstatd.pl b/bin/asstatd.pl index 2adfc1f..26b308a 100755 --- a/bin/asstatd.pl +++ b/bin/asstatd.pl @@ -509,7 +509,7 @@ sub parse_sflow { #print "Invalid interface index $snmpin/$snmpout\n"; next; } - + my $noctets; if ($sFlowSample->{'IPv4Packetlength'}) { $noctets = $sFlowSample->{'IPv4Packetlength'}; @@ -563,7 +563,7 @@ sub parse_sflow { if ($sFlowSample->{'SwitchDestVlan'}) { $vlanout = $sFlowSample->{'SwitchDestVlan'}; } - + handleflow($ipaddr, $noctets, $srcas, $dstas, $snmpin, $snmpout, $ipversion, 'sflow', $vlanin, $vlanout); } } @@ -577,7 +577,7 @@ sub handleflow { } #print "$srcas => $dstas ($noctets octets, version $ipversion, snmpin $snmpin, snmpout $snmpout)\n"; - + # determine direction and interface alias name (if known) my $direction; my $ifalias; @@ -594,8 +594,8 @@ sub handleflow { $ifalias = $knownlinks{inet_ntoa($routerip) . '_' . $snmpin . '/' . $vlanin} if defined($vlanin); $ifalias //= $knownlinks{inet_ntoa($routerip) . '_' . $snmpin}; } else { - handleflow($routerip, $noctets, $srcas, 0, $snmpin, $snmpout, $ipversion, $vlanin, $vlanout); - handleflow($routerip, $noctets, 0, $dstas, $snmpin, $snmpout, $ipversion, $vlanin, $vlanout); + handleflow($routerip, $noctets, $srcas, 0, $snmpin, $snmpout, $ipversion, $type, $vlanin, $vlanout); + handleflow($routerip, $noctets, 0, $dstas, $snmpin, $snmpout, $ipversion, $type, $vlanin, $vlanout); return; } @@ -675,7 +675,7 @@ sub flush_cache { push(@templatearg, $dsname); push(@args, $value * $cursamplingrate); } - + RRDs::update($rrdfile, "--template", join(':', @templatearg), $cacheent->{updatets} . ":" . join(':', @args)); my $ERR = RRDs::error;