josh/jrouter
josh/jrouter
1
0
Fork 0
Code Issues 10 Pull requests Releases Activity

Fix ^C not closing packet loop

Browse source
This commit is contained in:
Josh Deprez 2024-03-30 14:30:58 +11:00
parent 64f491fcba
commit e3a6aecd51
Signed by: josh
SSH key fingerprint: SHA256:zZji7w1Ilh2RuUpbQcqkLPrqmRwpiCSycbF2EfKm6Kw
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
main.go
View file

@ -59,11 +59,15 @@ func main() {
if err != nil { if err != nil {
log.Fatalf("Couldn't listen on udp4:387: %v", err) log.Fatalf("Couldn't listen on udp4:387: %v", err)
} }
defer ln.Close()
log.Printf("Listening on %v", ln.LocalAddr()) log.Printf("Listening on %v", ln.LocalAddr())
log.Println("Press ^C or send SIGINT to stop the router gracefully") log.Println("Press ^C or send SIGINT to stop the router gracefully")
ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt) ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
go func() {
// net.UDPConn is not context-aware? Hmmm.
<-ctx.Done()
ln.Close()
}()
for _, peerStr := range cfg.Peers { for _, peerStr := range cfg.Peers {
if !hasPortRE.MatchString(peerStr) { if !hasPortRE.MatchString(peerStr) {
@ -113,7 +117,7 @@ func main() {
if readErr != nil { if readErr != nil {
log.Printf("Failed to read packet: %v", readErr) log.Printf("Failed to read packet: %v", readErr)
continue return
} }
// Existing peer? // Existing peer?
@ -137,7 +141,13 @@ func main() {
} }
// Pass the packet to the goroutine in charge of this peer. // Pass the packet to the goroutine in charge of this peer.
pr.recv <- pkt select {
case pr.recv <- pkt:
// That's it for us.
case <-ctx.Done():
return
}
} }
} }