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

Multi-port refactor #1

Merged
josh merged 8 commits from multi-port-refactor into main 2024-05-04 17:06:20 +10:00
Conversation 0 Commits 8 Files changed 14 +5 -5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 60d1837ee8 - Show all commits

10
router/zip.go
View file

@ -159,20 +159,20 @@ func (port *EtherTalkPort) handleZIPQuery(ctx context.Context, ddpkt *ddp.ExtPac
func (port *EtherTalkPort) handleZIPGetNetInfo(ctx context.Context, ddpkt *ddp.ExtPacket, zipkt *zip.GetNetInfoPacket) error { func (port *EtherTalkPort) handleZIPGetNetInfo(ctx context.Context, ddpkt *ddp.ExtPacket, zipkt *zip.GetNetInfoPacket) error {
log.Printf("ZIP: Got GetNetInfo for zone %q", zipkt.ZoneName) log.Printf("ZIP: Got GetNetInfo for zone %q", zipkt.ZoneName)
// The request is valid if the zone name is available on this network. // The request is zoneValid if the zone name is available on this network.
valid := slices.Contains(port.AvailableZones, zipkt.ZoneName) zoneValid := slices.Contains(port.AvailableZones, zipkt.ZoneName)
// The multicast address we return depends on the validity of the zone // The multicast address we return depends on the validity of the zone
// name. // name.
var mcastAddr ethernet.Addr var mcastAddr ethernet.Addr
if valid { if zoneValid {
mcastAddr = atalk.MulticastAddr(zipkt.ZoneName) mcastAddr = atalk.MulticastAddr(zipkt.ZoneName)
} else { } else {
mcastAddr = atalk.MulticastAddr(port.DefaultZoneName) mcastAddr = atalk.MulticastAddr(port.DefaultZoneName)
} }
resp := &zip.GetNetInfoReplyPacket{ resp := &zip.GetNetInfoReplyPacket{
ZoneInvalid: valid, ZoneInvalid: !zoneValid,
UseBroadcast: false, UseBroadcast: false,
OnlyOneZone: len(port.AvailableZones) == 1, OnlyOneZone: len(port.AvailableZones) == 1,
NetStart: port.NetStart, NetStart: port.NetStart,
@ -182,7 +182,7 @@ func (port *EtherTalkPort) handleZIPGetNetInfo(ctx context.Context, ddpkt *ddp.E
} }
// The default zone name is only returned if the requested zone name is // The default zone name is only returned if the requested zone name is
// invalid. // invalid.
if !valid { if !zoneValid {
resp.DefaultZoneName = port.DefaultZoneName resp.DefaultZoneName = port.DefaultZoneName
} }
log.Printf("ZIP: Replying with GetNetInfo-Reply: %+v", resp) log.Printf("ZIP: Replying with GetNetInfo-Reply: %+v", resp)