From 3d9200a2973fe85350a45ad003bdf7063d3469b3 Mon Sep 17 00:00:00 2001 From: fako1024 Date: Sun, 9 Apr 2023 10:24:33 +0200 Subject: [PATCH] Fix packet direction logic and bump slimcap dependency --- go.mod | 2 +- go.sum | 2 ++ pkg/capture/GPPacket.go | 4 ++-- pkg/capture/capture_mock_test.go | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e47d96e4..af2f2cb3 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/els0r/goProbe require ( github.com/els0r/status v1.0.0 - github.com/fako1024/slimcap v0.0.0-20230312144344-ffc7db30268a + github.com/fako1024/slimcap v0.0.0-20230321123248-08a876d268b3 github.com/go-chi/chi/v5 v5.0.7 github.com/json-iterator/go v1.1.12 github.com/jsternberg/zap-logfmt v1.3.0 diff --git a/go.sum b/go.sum index 147e363f..844ecc92 100644 --- a/go.sum +++ b/go.sum @@ -7,6 +7,8 @@ github.com/els0r/status v1.0.0 h1:j2G+Iq4nZK8yNXfJqkRwBEHzHl/SReUBMg0z6SV6vqU= github.com/els0r/status v1.0.0/go.mod h1:O/aG4Ny1gNwOU82pIRTT1GQ1+upMDX+FA6QKwwgfSY4= github.com/fako1024/slimcap v0.0.0-20230312144344-ffc7db30268a h1:0bYpopxNOnp/lwGDke4ASBbFKoPGSEUcVdM8Hy9Q9pE= github.com/fako1024/slimcap v0.0.0-20230312144344-ffc7db30268a/go.mod h1:VlwHE/gr+4hUMKDHTFULSmi4rEQ6UcjGJkpGre//cOE= +github.com/fako1024/slimcap v0.0.0-20230321123248-08a876d268b3 h1:NQSD6OqOp9D5XUeUF7w+/KM3oSmMA4h2cmBjzn2cqDo= +github.com/fako1024/slimcap v0.0.0-20230321123248-08a876d268b3/go.mod h1:BuEYAF14Gp3ioid/4nI0eJ+XpeTMqVdNCyhuktXiWfo= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= diff --git a/pkg/capture/GPPacket.go b/pkg/capture/GPPacket.go index 734d8978..52819630 100644 --- a/pkg/capture/GPPacket.go +++ b/pkg/capture/GPPacket.go @@ -63,8 +63,8 @@ func (p *GPPacket) Populate(pkt capture.Packet) error { // Extract the IP layer of the packet srcPacket := pkt.IPLayer() - // read the direction from which the packet entered the interface - p.dirInbound = pkt.Type() == 0 + // Ascertain the direction from which the packet entered the interface + p.dirInbound = pkt.IsInbound() p.numBytes = pkt.TotalLen() var protocol byte diff --git a/pkg/capture/capture_mock_test.go b/pkg/capture/capture_mock_test.go index 7e433634..5f4d2e4a 100644 --- a/pkg/capture/capture_mock_test.go +++ b/pkg/capture/capture_mock_test.go @@ -26,6 +26,9 @@ func newMockCaptureSource(maxPkts int) *mockCapture { func (c *mockCapture) NewPacket() capture.Packet { panic("not implemented") // TODO: Implement } +func (c *mockCapture) NextIPPacket(pBuf capture.IPLayer) (capture.IPLayer, capture.PacketType, uint32, error) { + panic("not implemented") // TODO: Implement +} // NextPacket receives the next packet from the wire and returns it. The operation is blocking. In // case a non-nil "buffer" Packet is provided it will be populated with the data (and returned). The