Move AARPMachine constructor

aarp.go

@@ -21,6 +21,13 @@ const (
 	aarpRequestTimeout    = 10 * time.Second
 )
 
+type aarpState int
+
+const (
+	aarpStateProbing aarpState = iota
+	aarpStateAssigned
+)
+
 // AARPMachine maintains both an Address Mapping Table and handles AARP packets
 // (sending and receiving requests, responses, and probes). This process assumes
 // a particular network range rather than using the startup range, since this
@@ -37,12 +44,16 @@ type AARPMachine struct {
 	myAddr aarp.AddrPair
 }
 
-type aarpState int
+func NewAARPMachine(cfg *config, pcapHandle *pcap.Handle, myHWAddr ethernet.Addr) *AARPMachine {
-
+	return &AARPMachine{
-const (
+		AMT:        new(AMT),
-	aarpStateProbing aarpState = iota
+		cfg:        cfg,
-	aarpStateAssigned
+		pcapHandle: pcapHandle,
-)
+		myAddr: aarp.AddrPair{
+			Hardware: myHWAddr,
+		},
+	}
+}
 
 func (a *AARPMachine) Run(ctx context.Context, incomingCh <-chan *ethertalk.Packet) error {
 	ticker := time.NewTicker(200 * time.Millisecond) // 200ms is the AARP probe retransmit

main.go

@@ -31,7 +31,6 @@ import (
 
 	"gitea.drjosh.dev/josh/jrouter/atalk"
 	"gitea.drjosh.dev/josh/jrouter/aurp"
-	"github.com/sfiera/multitalk/pkg/aarp"
 	"github.com/sfiera/multitalk/pkg/ddp"
 	"github.com/sfiera/multitalk/pkg/ethernet"
 	"github.com/sfiera/multitalk/pkg/ethertalk"
@@ -151,14 +150,7 @@ func main() {
 	}
 	defer pcapHandle.Close()
 
-	aarpMachine := &AARPMachine{
+	aarpMachine := NewAARPMachine(cfg, pcapHandle, myHWAddr)
-		AMT:        new(AMT),
-		cfg:        cfg,
-		pcapHandle: pcapHandle,
-		myAddr: aarp.AddrPair{
-			Hardware: myHWAddr,
-		},
-	}
 	aarpCh := make(chan *ethertalk.Packet, 1024)
 	go aarpMachine.Run(ctx, aarpCh)