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

Better logs

Browse source
This commit is contained in:
Josh Deprez 2024-04-13 18:25:14 +10:00
parent 8b1861fb90
commit db2963b9bb
Signed by: josh
SSH key fingerprint: SHA256:zZji7w1Ilh2RuUpbQcqkLPrqmRwpiCSycbF2EfKm6Kw
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
aarp.go
View file

@ -133,7 +133,10 @@ func (a *AARPMachine) Run(ctx context.Context, incomingCh <-chan *ethertalk.Pack
switch aapkt.Opcode { switch aapkt.Opcode {
case aarp.RequestOp: case aarp.RequestOp:
log.Printf("AARP: Who has %v? Tell %v", aapkt.Dst.Proto, aapkt.Src.Proto) log.Printf("AARP: Who has %d.%d? Tell %d.%d",
aapkt.Dst.Proto.Network, aapkt.Dst.Proto.Node,
aapkt.Src.Proto.Network, aapkt.Src.Proto.Node,
)
// Glean that aapkt.Src.Proto -> aapkt.Src.Hardware // Glean that aapkt.Src.Proto -> aapkt.Src.Hardware
a.addressMappingTable.Learn(aapkt.Src.Proto, aapkt.Src.Hardware) a.addressMappingTable.Learn(aapkt.Src.Proto, aapkt.Src.Hardware)
log.Printf("AARP: Gleaned that %d.%d -> %v", aapkt.Src.Proto.Network, aapkt.Src.Proto.Node, aapkt.Src.Hardware) log.Printf("AARP: Gleaned that %d.%d -> %v", aapkt.Src.Proto.Network, aapkt.Src.Proto.Node, aapkt.Src.Hardware)
@ -154,7 +157,9 @@ func (a *AARPMachine) Run(ctx context.Context, incomingCh <-chan *ethertalk.Pack
} }
case aarp.ResponseOp: case aarp.ResponseOp:
log.Printf("AARP: %v is at %v", aapkt.Dst.Proto, aapkt.Dst.Hardware) log.Printf("AARP: %d.%d is at %v",
aapkt.Dst.Proto.Network, aapkt.Dst.Proto.Node, aapkt.Dst.Hardware,
)
a.addressMappingTable.Learn(aapkt.Dst.Proto, aapkt.Dst.Hardware) a.addressMappingTable.Learn(aapkt.Dst.Proto, aapkt.Dst.Hardware)
if aapkt.Dst.Proto != a.myAddr.Proto { if aapkt.Dst.Proto != a.myAddr.Proto {
@ -165,7 +170,9 @@ func (a *AARPMachine) Run(ctx context.Context, incomingCh <-chan *ethertalk.Pack
} }
case aarp.ProbeOp: case aarp.ProbeOp:
log.Printf("AARP: %v probing to see if %v is available", aapkt.Src.Hardware, aapkt.Src.Proto) log.Printf("AARP: %v probing to see if %d.%d is available",
aapkt.Src.Hardware, aapkt.Src.Proto.Network, aapkt.Src.Proto.Node,
)
// AMT should not be updated, because the address is tentative // AMT should not be updated, because the address is tentative
if aapkt.Dst.Proto != a.myAddr.Proto { if aapkt.Dst.Proto != a.myAddr.Proto {
@ -256,7 +263,7 @@ func (a *AARPMachine) heyThatsMe(targ aarp.AddrPair) error {
if err != nil { if err != nil {
return err return err
} }
log.Printf("AARP: sending packet %+v", respFrame) //log.Printf("AARP: sending packet %+v", respFrame)
// Instead of broadcasting the reply, send it to the target specifically? // Instead of broadcasting the reply, send it to the target specifically?
respFrame.Dst = targ.Hardware respFrame.Dst = targ.Hardware
respFrameRaw, err := ethertalk.Marshal(*respFrame) respFrameRaw, err := ethertalk.Marshal(*respFrame)