From a59d7f7584ecc0f84b65c554d1a0c6513c82a489 Mon Sep 17 00:00:00 2001 From: Josh Deprez Date: Sun, 7 Apr 2024 13:08:15 +1000 Subject: [PATCH] Investigate ^C behaviour --- main.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main.go b/main.go index d68b5cd..be32341 100644 --- a/main.go +++ b/main.go @@ -31,6 +31,7 @@ import ( "gitea.drjosh.dev/josh/jrouter/atalk" "gitea.drjosh.dev/josh/jrouter/aurp" + "github.com/google/gopacket/pcap" "github.com/sfiera/multitalk/pkg/ddp" "github.com/sfiera/multitalk/pkg/ethernet" "github.com/sfiera/multitalk/pkg/ethertalk" @@ -157,7 +158,15 @@ func main() { go func() { for { + if ctx.Err() != nil { + return + } + rawPkt, _, err := pcapHandle.ReadPacketData() + if errors.Is(err, pcap.NextErrorTimeoutExpired) { + continue + } + if err != nil { log.Fatalf("Couldn't read AppleTalk / AARP packet data: %v", err) }