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 #102 from alarig/master

Browse Source 
bin/asstatd.pl: parse_sflow: removing snmpin/snmpout >= 1073741823 test
This commit is contained in:
Manuel Kasper 2021-10-29 21:34:46 +02:00 committed by GitHub
commit 0b9ea81503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
bin/asstatd.pl
View File

@ -544,15 +544,15 @@ sub parse_netflow_v10_data_flowset {
sub parse_sflow { sub parse_sflow {
my $datagram = shift; my $datagram = shift;
my $ipaddr = shift; my $ipaddr = shift;
# decode the sFlow packet # decode the sFlow packet
my ($sFlowDatagramRef, $sFlowSamplesRef, $errorsRef) = Net::sFlow::decode($datagram); my ($sFlowDatagramRef, $sFlowSamplesRef, $errorsRef) = Net::sFlow::decode($datagram);
if ($sFlowDatagramRef->{'sFlowVersion'} != 5) { if ($sFlowDatagramRef->{'sFlowVersion'} != 5) {
print "Warning: non-v5 packet received - not supported\n"; print "Warning: non-v5 packet received - not supported\n";
return; return;
} }
# use agent IP if available (in case of proxy) # use agent IP if available (in case of proxy)
if ($sFlowDatagramRef->{'AgentIp'}) { if ($sFlowDatagramRef->{'AgentIp'}) {
$ipaddr = inet_aton($sFlowDatagramRef->{'AgentIp'}); $ipaddr = inet_aton($sFlowDatagramRef->{'AgentIp'});
@ -560,10 +560,10 @@ sub parse_sflow {
foreach my $sFlowSample (@{$sFlowSamplesRef}) { foreach my $sFlowSample (@{$sFlowSamplesRef}) {
my $ipversion = 4; my $ipversion = 4;
# only process standard structures # only process standard structures
next if ($sFlowSample->{'sampleTypeEnterprise'} != 0); next if ($sFlowSample->{'sampleTypeEnterprise'} != 0);
my $snmpin; my $snmpin;
my $snmpout; my $snmpout;
if ($sFlowSample->{'sampleTypeFormat'} == 1) { if ($sFlowSample->{'sampleTypeFormat'} == 1) {
@ -577,11 +577,10 @@ sub parse_sflow {
} else { } else {
next; next;
} }
if ($snmpin >= 1073741823 || $snmpout >= 1073741823) { if ($snmpin > 2147483647 || $snmpout > 2147483647) {
# invalid interface index - could be dropped packet or internal # invalid RFC 2863 ifIndex
# (routing protocol, management etc.) print "Invalid interface index $snmpin/$snmpout\n";
#print "Invalid interface index $snmpin/$snmpout\n";
next; next;
} }
@ -602,7 +601,7 @@ sub parse_sflow {
$ipversion = 6; $ipversion = 6;
} }
} }
my $srcas = 0; my $srcas = 0;
my $dstas = 0; my $dstas = 0;
@ -657,7 +656,7 @@ sub parse_sflow {
# Transit packets have "foreign" AS numbers for both source and # Transit packets have "foreign" AS numbers for both source and
# destination (handleflow() currently deals with those by counting # destination (handleflow() currently deals with those by counting
# them twice; once for input and once for output) # them twice; once for input and once for output)
# substitute 0 for own AS number # substitute 0 for own AS number
if ($myas{$srcas}) { if ($myas{$srcas}) {
$srcas = 0; $srcas = 0;
@ -678,32 +677,32 @@ sub parse_sflow {
handleflow($ipaddr, $noctets, $srcas, $dstas, $snmpin, $snmpout, $ipversion, 'sflow', $vlanin, $vlanout); handleflow($ipaddr, $noctets, $srcas, $dstas, $snmpin, $snmpout, $ipversion, 'sflow', $vlanin, $vlanout);
if ($peerasstats) { if ($peerasstats) {
# srcpeeras is the one who sent me data # srcpeeras is the one who sent me data
# dstpeeras is the first one to which you'll send the data # dstpeeras is the first one to which you'll send the data
# so, dstpeeras is the first entry in array # so, dstpeeras is the first entry in array
# if the array is now empty (poped before), then take $dstas # if the array is now empty (poped before), then take $dstas
my $srcpeeras = ($sFlowSample->{'GatewayAsSourcePeer'}) ? $sFlowSample->{'GatewayAsSourcePeer'} : 0; my $srcpeeras = ($sFlowSample->{'GatewayAsSourcePeer'}) ? $sFlowSample->{'GatewayAsSourcePeer'} : 0;
my $dstpeeras = 0; my $dstpeeras = 0;
if ($sFlowSample->{'GatewayDestAsPaths'}) { if ($sFlowSample->{'GatewayDestAsPaths'}) {
$dstpeeras = @{$sFlowSample->{'GatewayDestAsPaths'}->[0]->{'AsPath'}}[0]; $dstpeeras = @{$sFlowSample->{'GatewayDestAsPaths'}->[0]->{'AsPath'}}[0];
if (!$dstpeeras) { if (!$dstpeeras) {
$dstpeeras = 0; $dstpeeras = 0;
} }
} }
if($dstpeeras == 0 && $dstas != 0){ if($dstpeeras == 0 && $dstas != 0){
$dstpeeras = $dstas; $dstpeeras = $dstas;
} }
if ($myas{$srcpeeras}) { if ($myas{$srcpeeras}) {
$srcpeeras = 0; $srcpeeras = 0;
} }
if ($myas{$dstpeeras}) { if ($myas{$dstpeeras}) {
$dstpeeras = 0; $dstpeeras = 0;
} }
if ($srcpeeras != 0 || $dstpeeras != 0) { if ($srcpeeras != 0 || $dstpeeras != 0) {
handleflow($ipaddr, $noctets, $srcpeeras, $dstpeeras, $snmpin, $snmpout, $ipversion, 'sflow', $vlanin, $vlanout, 1); handleflow($ipaddr, $noctets, $srcpeeras, $dstpeeras, $snmpin, $snmpout, $ipversion, 'sflow', $vlanin, $vlanout, 1);
} }
} }
} }