Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 45 additions & 7 deletions pkg/plugin/ebpfwindows/parser_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,28 @@
}
}

// func (p *Parser) parsePktmonPkt(data []byte, pdn *PktmonDropNotify, decoded *pb.Flow) error {

// packetOffset := int(pdn.DataOffset())
// p.packet.Lock()
// defer p.packet.Unlock()
// var err error
// switch pdn.PktmonHeader.Metadata.PacketType {
// case 1:
// slog.Info("Reached Case 1 drop Events")
// err = p.packet.decLayerL2Dev.DecodeLayers(data[packetOffset:], p.packet.Layers[])
// case 3:
// slog.Info("Reached Case 3 drop Events")
// err = p.packet.decLayerL3Dev.IPv6.DecodeLayers(data[packetOffset:], &p.packet.Layers)
// default:
// slog.Info("Cant parse packet of this type %d", pdn.PktmonHeader.Metadata.PacketType)

// err = p.packet.decLayerL3Dev.IPv4.DecodeLayers(data[packetOffset:], &p.packet.Layers)
// p.packet.decLayerL3Dev
// }
// return err
// }

// Decode decodes the data from 'data' into 'decoded'
func (p *Parser) decode(data []byte, decoded *pb.Flow) error {
if len(data) == 0 {
Expand All @@ -158,6 +180,7 @@
var tn *TraceNotify
var eventSubType uint32
var authType pb.AuthType
var pdn *PktmonDropNotify

switch eventType {
case monitorAPI.MessageTypeDrop:
Expand Down Expand Up @@ -240,13 +263,28 @@
}

var err error
switch {
case !isL3Device:
err = p.packet.decLayerL2Dev.DecodeLayers(data[packetOffset:], &p.packet.Layers)
case isIPv6:
err = p.packet.decLayerL3Dev.IPv6.DecodeLayers(data[packetOffset:], &p.packet.Layers)
default:
err = p.packet.decLayerL3Dev.IPv4.DecodeLayers(data[packetOffset:], &p.packet.Layers)
if eventType == MessageTypePktmonDrop {
switch pdn.PktmonHeader.Metadata.PacketType {
case 1:
err = p.packet.decLayerL2Dev.DecodeLayers(data[packetOffset:], &p.packet.Layers)
case 3:
if (data[packetOffset] >> 4) == 0x4 {
err = p.packet.decLayerL3Dev.IPv6.DecodeLayers(data[packetOffset:], &p.packet.Layers)
} else {
return fmt.Errorf("decode layers failed for unsupported IP packet type starting with %d", data[packetOffset])

Check failure on line 274 in pkg/plugin/ebpfwindows/parser_windows.go

View workflow job for this annotation

GitHub Actions / Lint (windows, amd64)

do not define dynamic errors, use wrapped static errors instead: "fmt.Errorf(\"decode layers failed for unsupported IP packet type starting with %d\", data[packetOffset])" (err113)

Check failure on line 274 in pkg/plugin/ebpfwindows/parser_windows.go

View workflow job for this annotation

GitHub Actions / Lint (windows, arm64)

do not define dynamic errors, use wrapped static errors instead: "fmt.Errorf(\"decode layers failed for unsupported IP packet type starting with %d\", data[packetOffset])" (err113)
}
default:
return fmt.Errorf("decode layers failed for unsupported packet type %d", pdn.PktmonHeader.Metadata.PacketType)

Check failure on line 277 in pkg/plugin/ebpfwindows/parser_windows.go

View workflow job for this annotation

GitHub Actions / Lint (windows, amd64)

do not define dynamic errors, use wrapped static errors instead: "fmt.Errorf(\"decode layers failed for unsupported packet type %d\", pdn.PktmonHeader.Metadata.PacketType)" (err113)

Check failure on line 277 in pkg/plugin/ebpfwindows/parser_windows.go

View workflow job for this annotation

GitHub Actions / Lint (windows, arm64)

do not define dynamic errors, use wrapped static errors instead: "fmt.Errorf(\"decode layers failed for unsupported packet type %d\", pdn.PktmonHeader.Metadata.PacketType)" (err113)
}
} else {
switch {
case !isL3Device:
err = p.packet.decLayerL2Dev.DecodeLayers(data[packetOffset:], &p.packet.Layers)
case isIPv6:
err = p.packet.decLayerL3Dev.IPv6.DecodeLayers(data[packetOffset:], &p.packet.Layers)
default:
err = p.packet.decLayerL3Dev.IPv4.DecodeLayers(data[packetOffset:], &p.packet.Layers)
}
}

if err != nil {
Expand Down
1 change: 1 addition & 0 deletions test/e2e/tools/event-writer/bpf_event_writer.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ void create_pktmon_drop_event(pktmon_notify_t* pktmon_drp_elm)
pktmon_drp_elm->version_header.type = PKTMON_NOTIFY_DROP;
pktmon_drp_elm->version_header.version = 1;
pktmon_drp_elm->pktmon_header.metadata.drop_reason = 7;
pktmon_drp_elm->pktmon_header.metadata.packet_type = 1;
}

int
Expand Down
Loading