Add VLAN and agent address

inex · Apr 27, 2023 · 5101386 · 5101386
1 parent ab4e437
commit 5101386
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tools/runtime/sflow/goflow2-detect-ixp-bgp-sessions b/tools/runtime/sflow/goflow2-detect-ixp-bgp-sessions
@@ -115,7 +115,8 @@ while (<SFLOWTOOL>) {
 	# 	$srcip, $dstip, $protocol, $tos, $ttl,
 	# 	$srcport, $dstport, $tcpflags, $pktsize, $payloadsize, $samplerate) = @sample;
 
-  # SrcAddr,DstAddr,Etype,Proto,SrcPort,DstPort,TCPFlags
+  # SrcAddr,DstAddr,Etype,Proto,SrcPort,DstPort,TCPFlags,SamplerAddress,VlanId
+	# see https://github.com/netsampler/goflow2/blob/main/docs/protocols.md for more fields
 	my $ethertype = $sample->{ Etype }
 	my $srcip = $sample->{ SrcAddr }
 	my $dstip = $sample->{ DstAddr }
@@ -130,7 +131,7 @@ while (<SFLOWTOOL>) {
 		next;
 	}
 
-  my $protocol = $sample->{ Proto }
+	my $protocol = $sample->{ Proto }
 	my $srcport = $sample->{ SrcPort }
 	my $dstport = $sample->{ DstPort }
 
@@ -147,6 +148,8 @@ while (<SFLOWTOOL>) {
 			}
 
 			# we're also only interested in ip addresses that have a database match
+			my $agent = $sample->{ SamplerAddress }
+			my $vlan = $sample->{ VlanId }
 			if ($ipmappings->{$ipprotocol}->{$srcip} && $ipmappings->{$ipprotocol}->{$dstip}) {
 				print STDERR " database updated" if ($debug);
 				if (!$sth->execute($ipmappings->{$ipprotocol}->{$srcip}, $ipmappings->{$ipprotocol}->{$dstip}, $ipprotocol, $vlan, $agent)) {