Merge pull request #53 from fako1024/52-enforce-unsigned-uint64-for-s…

…tats-packet-counters [bugfix] Switch all packet stats / counters to uint64
fako1024 · Aug 4, 2023 · 6e647c8 · 6e647c8
2 parents a567eb3 + d6cd610
commit 6e647c8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/capture/afpacket/afpacket/afpacket.go b/capture/afpacket/afpacket/afpacket.go
@@ -234,8 +234,8 @@ func (s *Source) Stats() (capture.Stats, error) {
 		return capture.Stats{}, err
 	}
 	return capture.Stats{
-		PacketsReceived: int(ss.Packets),
-		PacketsDropped:  int(ss.Drops),
+		PacketsReceived: uint64(ss.Packets),
+		PacketsDropped:  uint64(ss.Drops),
 	}, nil
 }
 

diff --git a/capture/afpacket/afpacket/afpacket_test.go b/capture/afpacket/afpacket/afpacket_test.go
@@ -192,7 +192,7 @@ func TestPipe(t *testing.T) {
 		require.Nil(t, <-errChan)
 		stats, err := mockSrc.Stats()
 		require.Nil(t, err)
-		require.Equal(t, capture.Stats{PacketsReceived: int(n * n)}, stats)
+		require.Equal(t, capture.Stats{PacketsReceived: uint64(n * n)}, stats)
 		require.Nil(t, mockSrc.Close())
 	}()
 
@@ -219,7 +219,7 @@ func TestPipe(t *testing.T) {
 	require.Nil(t, <-errChan2)
 	stats, err := mockSrc2.Stats()
 	require.Nil(t, err)
-	require.Equal(t, capture.Stats{PacketsReceived: int(n * n)}, stats)
+	require.Equal(t, capture.Stats{PacketsReceived: uint64(n * n)}, stats)
 	require.Nil(t, mockSrc2.Close())
 }
 
@@ -342,7 +342,7 @@ func testCaptureMethods(t *testing.T, fn func(t *testing.T, src *MockSource, i,
 	// Evaluate packet statistics
 	stats, err := mockSrc.Stats()
 	require.Nil(t, err)
-	require.Equal(t, capture.Stats{PacketsReceived: int(n * n)}, stats)
+	require.Equal(t, capture.Stats{PacketsReceived: uint64(n * n)}, stats)
 
 	// Close the mock source
 	require.Nil(t, mockSrc.Close())

diff --git a/capture/afpacket/afring/afring.go b/capture/afpacket/afring/afring.go
@@ -274,9 +274,9 @@ func (s *Source) Stats() (capture.Stats, error) {
 		return capture.Stats{}, err
 	}
 	return capture.Stats{
-		PacketsReceived: int(ss.Packets),
-		PacketsDropped:  int(ss.Drops),
-		QueueFreezes:    int(ss.QueueFreezes),
+		PacketsReceived: uint64(ss.Packets),
+		PacketsDropped:  uint64(ss.Drops),
+		QueueFreezes:    uint64(ss.QueueFreezes),
 	}, nil
 }
 

diff --git a/capture/afpacket/afring/afring_test.go b/capture/afpacket/afring/afring_test.go
@@ -361,7 +361,7 @@ func TestPipe(t *testing.T) {
 		require.Nil(t, <-errChan)
 		stats, err := mockSrc.Stats()
 		require.Nil(t, err)
-		require.Equal(t, capture.Stats{PacketsReceived: int(n * n)}, stats)
+		require.Equal(t, capture.Stats{PacketsReceived: uint64(n * n)}, stats)
 		require.Nil(t, mockSrc.Close())
 	}()
 
@@ -390,7 +390,7 @@ func TestPipe(t *testing.T) {
 	require.Nil(t, <-errChan2)
 	stats, err := mockSrc2.Stats()
 	require.Nil(t, err)
-	require.Equal(t, capture.Stats{PacketsReceived: int(n * n)}, stats)
+	require.Equal(t, capture.Stats{PacketsReceived: uint64(n * n)}, stats)
 	require.Nil(t, mockSrc2.Close())
 }
 
@@ -561,7 +561,7 @@ func testCaptureMethods(t *testing.T, fn func(t *testing.T, _ *MockSource, _, _
 	// Evaluate packet statistics
 	stats, err := mockSrc.Stats()
 	require.Nil(t, err)
-	require.Equal(t, capture.Stats{PacketsReceived: int(n * n)}, stats)
+	require.Equal(t, capture.Stats{PacketsReceived: uint64(n * n)}, stats)
 
 	// Close the mock source
 	require.Nil(t, mockSrc.Close())

diff --git a/capture/capture.go b/capture/capture.go
@@ -26,9 +26,9 @@ var (
 
 // Stats denotes a packet capture stats structure providing basic counters
 type Stats struct {
-	PacketsReceived int
-	PacketsDropped  int
-	QueueFreezes    int
+	PacketsReceived uint64
+	PacketsDropped  uint64
+	QueueFreezes    uint64
 }
 
 // PacketType denotes the packet type (indicating traffic direction)

diff --git a/capture/pcap/pcap.go b/capture/pcap/pcap.go
@@ -25,7 +25,7 @@ type Source struct {
 
 	link *link.Link
 
-	nPackets      int
+	nPackets      uint64
 	swapEndianess bool
 
 	packetAddCallbackFn func(payload []byte, totalLen uint32, pktType, ipLayerOffset byte)