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

Remove IP addresses from logs and status page

Browse source
This commit is contained in:
Josh Deprez 2024-05-08 15:33:42 +10:00
parent 3a2cbdcde8
commit 67daa8a4ae
No known key found for this signature in database
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
main.go
View file

@ -65,13 +65,13 @@ const routingTableTemplate = `
<td>{{$route.LastSeenAgo}}</td> <td>{{$route.LastSeenAgo}}</td>
<td> <td>
{{- with $route.AURPPeer -}} {{- with $route.AURPPeer -}}
{{.RemoteAddr}} [redacted]
{{- end -}} {{- end -}}
{{- with $route.EtherTalkPeer -}} {{- with $route.EtherTalkPeer -}}
{{.Port.Device}} {{.PeerAddr.Network}}.{{.PeerAddr.Node}} {{.Port.Device}} {{.PeerAddr.Network}}.{{.PeerAddr.Node}}
{{- end -}} {{- end -}}
{{- with $route.EtherTalkDirect -}} {{- with $route.EtherTalkDirect -}}
{{.Device}} {{.NetStart}}-{{.NetEnd}} {{.Device}}
{{- end -}} {{- end -}}
</td> </td>
</tr> </tr>
@ -91,8 +91,8 @@ const peerTableTemplate = `
<tbody> <tbody>
{{range $peer := . }} {{range $peer := . }}
<tr> <tr>
<td>{{$peer.ConfiguredAddr}}</td> <td>[redacted]</td>
<td>{{$peer.RemoteAddr}}</td> <td>[redacted]</td>
<td>{{$peer.ReceiverState}}</td> <td>{{$peer.ReceiverState}}</td>
<td>{{$peer.SenderState}}</td> <td>{{$peer.SenderState}}</td>
</tr> </tr>
@ -142,9 +142,9 @@ func main() {
} }
localDI := aurp.IPDomainIdentifier(localIP) localDI := aurp.IPDomainIdentifier(localIP)
log.Printf("Using %v as local domain identifier", localIP) // log.Printf("Using %v as local domain identifier", localIP)
log.Printf("EtherTalk configuration: %+v", cfg.EtherTalk) // log.Printf("EtherTalk configuration: %+v", cfg.EtherTalk)
ln, err := net.ListenUDP("udp4", &net.UDPAddr{Port: int(cfg.ListenPort)}) ln, err := net.ListenUDP("udp4", &net.UDPAddr{Port: int(cfg.ListenPort)})
if err != nil { if err != nil {
@ -277,13 +277,13 @@ func main() {
raddr, err := net.ResolveUDPAddr("udp4", peerStr) raddr, err := net.ResolveUDPAddr("udp4", peerStr)
if err != nil { if err != nil {
log.Printf("couldn't resolve UDP address, skipping: %v", err) log.Print("couldn't resolve UDP address, skipping peer")
continue continue
} }
log.Printf("resolved %q to %v", peerStr, raddr) //log.Printf("resolved %q to %v", peerStr, raddr)
if raddr.IP.Equal(localIP) { if raddr.IP.Equal(localIP) {
log.Printf("%v == %v == me, skipping", peerStr, raddr) log.Print("peer == me, skipping")
continue continue
} }
@ -381,7 +381,7 @@ func main() {
return return
} }
log.Printf("AURP: Got %T from %v (%v)", pkt, raddr, dh.SourceDI) // log.Printf("AURP: Got %T from %v (%v)", pkt, raddr, dh.SourceDI)
// Existing peer? // Existing peer?
ra := udpAddrFromNet(raddr) ra := udpAddrFromNet(raddr)
@ -389,7 +389,7 @@ func main() {
pr := peers[ra] pr := peers[ra]
if pr == nil { if pr == nil {
if !cfg.OpenPeering { if !cfg.OpenPeering {
log.Printf("AURP: Got packet from %v but it's not in my config and open peering is disabled; dropping the packet", raddr) log.Print("AURP: Got packet but it's not in my config and open peering is disabled; dropping the packet")
peersMu.Unlock() peersMu.Unlock()
continue continue
} }

8
router/peer_aurp.go
View file

@ -165,7 +165,7 @@ func (p *AURPPeer) Send(pkt aurp.Packet) (int, error) {
if _, err := pkt.WriteTo(&b); err != nil { if _, err := pkt.WriteTo(&b); err != nil {
return 0, err return 0, err
} }
log.Printf("AURP Peer: Sending %T (len %d) to %v", pkt, b.Len(), p.RemoteAddr) // log.Printf("AURP Peer: Sending %T (len %d) to %v", pkt, b.Len(), p.RemoteAddr)
return p.UDPConn.WriteToUDP(b.Bytes(), p.RemoteAddr) return p.UDPConn.WriteToUDP(b.Bytes(), p.RemoteAddr)
} }
@ -284,7 +284,7 @@ func (p *AURPPeer) Handle(ctx context.Context) error {
// send a null RI-Upd to check if the sender is also unconnected // send a null RI-Upd to check if the sender is also unconnected
if p.sstate == SenderConnected && time.Since(lastSend) > sendRetryTimer { if p.sstate == SenderConnected && time.Since(lastSend) > sendRetryTimer {
if sendRetries >= sendRetryLimit { if sendRetries >= sendRetryLimit {
log.Printf("AURP Peer: Send retry limit reached while probing sender connect, closing connection") log.Print("AURP Peer: Send retry limit reached while probing sender connect, closing connection")
} }
sendRetries++ sendRetries++
lastSend = time.Now() lastSend = time.Now()
@ -309,10 +309,10 @@ func (p *AURPPeer) Handle(ctx context.Context) error {
// In case it's a DNS name, re-resolve it before reconnecting // In case it's a DNS name, re-resolve it before reconnecting
raddr, err := net.ResolveUDPAddr("udp4", p.ConfiguredAddr) raddr, err := net.ResolveUDPAddr("udp4", p.ConfiguredAddr)
if err != nil { if err != nil {
log.Printf("couldn't resolve UDP address, skipping: %v", err) log.Print("couldn't resolve UDP address, skipping")
break break
} }
log.Printf("AURP Peer: resolved %q to %v", p.ConfiguredAddr, raddr) // log.Printf("AURP Peer: resolved %q to %v", p.ConfiguredAddr, raddr)
p.RemoteAddr = raddr p.RemoteAddr = raddr
lastReconnect = time.Now() lastReconnect = time.Now()