From 6bfc10614760d3917fc3e2f2467d572acdf7dd75 Mon Sep 17 00:00:00 2001 From: lspgn Date: Sat, 10 Aug 2024 19:52:27 -0700 Subject: [PATCH] add iana names, allows lowercase --- producer/proto/config.go | 3 ++- producer/proto/producer_packet.go | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/producer/proto/config.go b/producer/proto/config.go index 21f4545c..8d6239aa 100644 --- a/producer/proto/config.go +++ b/producer/proto/config.go @@ -2,6 +2,7 @@ package protoproducer import ( "fmt" + "strings" "github.com/netsampler/goflow2/v2/decoders/netflow" ) @@ -178,7 +179,7 @@ func (m *SFlowMapper) Map(layer string) MapLayerIterator { if m == nil { return nil } - return &sflowMapperIterator{data: m.data[layer], n: 0} + return &sflowMapperIterator{data: m.data[strings.ToLower(layer)], n: 0} } type EndianType string diff --git a/producer/proto/producer_packet.go b/producer/proto/producer_packet.go index 2beda215..1e4fe223 100644 --- a/producer/proto/producer_packet.go +++ b/producer/proto/producer_packet.go @@ -58,14 +58,14 @@ var ( } parserIPv6HeaderRouting = ParserInfo{ nil, //ParseIPv6HeaderRouting2, - []string{"ipv6eh_routing", "ipv6eh"}, + []string{"ipv6eh_routing", "ipv6-route", "ipv6eh"}, 35, 7, false, } parserIPv6HeaderFragment = ParserInfo{ nil, //ParseIPv6HeaderFragment2, - []string{"ipv6eh_fragment", "ipv6eh"}, + []string{"ipv6eh_fragment", "ipv6-frag", "ipv6eh"}, 35, 6, true, @@ -93,7 +93,7 @@ var ( } parserICMPv6 = ParserInfo{ nil, //ParseICMPv62, - []string{"icmpv6"}, + []string{"icmpv6", "ipv6-icmp"}, 70, 11, false,