Merge pull request #49 from LakshK98/fix-packet-parsing

fix lint err

Author: lakshk98

pkg/plugin/ebpfwindows/datapath_drop_windows.go

@@ -21,7 +21,6 @@ const (
 	// dropNotifyV1Len is the amount of packet data provided in a v0/v1 drop notification.
 	dropNotifyV1Len       = 36
 	dropPktmonNotifyV1Len = 57
-	maxCapLength          = 128
 )
 
 var dropNotifyLengthFromVersion = map[uint16]uint{

pkg/plugin/ebpfwindows/parser_windows.go

@@ -27,6 +27,7 @@ import (
 
 const MaxInt = int(^uint(0) >> 1)
 const MessageTypePktmonDrop = 100
+const maxCapLength uint16 = 128
 
 // Parser is a parser for L3/L4 payloads
 type Parser struct {
@@ -206,7 +207,7 @@ func (p *Parser) decode(data []byte, decoded *pb.Flow) error {
 		dn.Type = monitorAPI.MessageTypeDrop
 		dn.Version = pdn.VersionHeader.Version
 		dn.OrigLen = pdn.PktmonHeader.PacketDescriptor.PacketOriginalLength
-		dn.CapLen = uint16(min(maxCapLength, dn.OrigLen))
+		dn.CapLen = uint16(min(uint32(maxCapLength), uint32(dn.OrigLen)))
 
 		eventSubType = pdn.PktmonHeader.Metadata.DropReason
 		if offset > uint(MaxInt) {

test/e2e/tools/event-writer/event_writer.h

@@ -166,27 +166,6 @@ struct drop_notify {
 	uint8_t        data[128];
 };
 
-
-// struct pktmon_notify {
-// 	uint8_t		type;
-//     uint16_t    version;
-//     uint8_t		subtype;
-// 	uint16_t		source;
-// 	uint32_t		hash;
-//     uint32_t		len_orig;
-// 	uint16_t		len_cap;
-// 	uint32_t		src_label;
-// 	uint32_t		dst_label;
-// 	uint32_t		dst_id; /* 0 for egress */
-// 	uint16_t		line;
-// 	uint8_t		file;
-// 	int8_t		ext_error;
-// 	uint32_t		ifindex;
-// 	uint8_t        data[128];
-// };
-
-// _Static_assert(sizeof(struct pktmon_notify) == 168, "pktmon_notify struct size must be 168 bytes");
-
 struct metrics_key {
 	uint8_t     reason;	/* 0: forwarded, >0 dropped */
 	uint8_t     dir:2,	/* 1: ingress 2: egress */
@@ -210,19 +189,6 @@ struct metrics_value {
 	uint64_t	bytes;
 };
 
-
-
-enum _PKTMON_DIRECTION_TAG
-{
-    PktMonDirTag_Unspecified = 0,
-    PktMonDirTag_In,
-    PktMonDirTag_Out,
-    PktMonDirTag_Rx,
-    PktMonDirTag_Tx,
-    PktMonDirTag_Ingress,
-    PktMonDirTag_Egress
-} PKTMON_DIRECTION_TAG;
-
 typedef struct _netevent_data_header
 {
     uint8_t type;