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

Investigating ^C behaviour

Browse source
This commit is contained in:
Josh Deprez 2024-04-07 12:56:51 +10:00
parent 7cb0a31100
commit 8adfc73e7f
Signed by: josh
SSH key fingerprint: SHA256:zZji7w1Ilh2RuUpbQcqkLPrqmRwpiCSycbF2EfKm6Kw
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
main.go
View file

@ -95,6 +95,19 @@ func main() {
defer cancel() defer cancel()
ctx, _ := signal.NotifyContext(cctx, os.Interrupt) ctx, _ := signal.NotifyContext(cctx, os.Interrupt)
// Open PCAP session
iface, err := net.InterfaceByName(cfg.EtherTalk.Device)
if err != nil {
log.Fatalf("Couldn't find interface named %q: %v", cfg.EtherTalk.Device, err)
}
myHWAddr := ethernet.Addr(iface.HardwareAddr)
pcapHandle, err := atalk.StartPcap(cfg.EtherTalk.Device)
if err != nil {
log.Fatalf("Couldn't open network device for AppleTalk: %v", err)
}
defer pcapHandle.Close()
// Wait until all peer handlers have finished before closing the port // Wait until all peer handlers have finished before closing the port
var handlersWG sync.WaitGroup var handlersWG sync.WaitGroup
defer func() { defer func() {
@ -102,7 +115,7 @@ func main() {
handlersWG.Wait() handlersWG.Wait()
ln.Close() ln.Close()
}() }()
goHandler := func(p *peer) { goPeerHandler := func(p *peer) {
handlersWG.Add(1) handlersWG.Add(1)
go func() { go func() {
defer handlersWG.Done() defer handlersWG.Done()
@ -134,22 +147,10 @@ func main() {
} }
aurp.Inc(&nextConnID) aurp.Inc(&nextConnID)
peers[udpAddrFromNet(raddr)] = peer peers[udpAddrFromNet(raddr)] = peer
goHandler(peer) goPeerHandler(peer)
} }
// AppleTalk packet loops // AppleTalk packet loops
iface, err := net.InterfaceByName(cfg.EtherTalk.Device)
if err != nil {
log.Fatalf("Couldn't find interface named %q: %v", cfg.EtherTalk.Device, err)
}
myHWAddr := ethernet.Addr(iface.HardwareAddr)
pcapHandle, err := atalk.StartPcap(cfg.EtherTalk.Device)
if err != nil {
log.Fatalf("Couldn't open network device for AppleTalk: %v", err)
}
defer pcapHandle.Close()
aarpMachine := NewAARPMachine(cfg, pcapHandle, myHWAddr) aarpMachine := NewAARPMachine(cfg, pcapHandle, myHWAddr)
aarpCh := make(chan *ethertalk.Packet, 1024) aarpCh := make(chan *ethertalk.Packet, 1024)
go aarpMachine.Run(ctx, aarpCh) go aarpMachine.Run(ctx, aarpCh)
@ -256,7 +257,7 @@ func main() {
} }
aurp.Inc(&nextConnID) aurp.Inc(&nextConnID)
peers[ra] = pr peers[ra] = pr
goHandler(pr) goPeerHandler(pr)
} }
// Pass the packet to the goroutine in charge of this peer. // Pass the packet to the goroutine in charge of this peer.