Dry up creating new AURP peers

main.go

@@ -65,13 +65,13 @@ const routingTableTemplate = `
 		<td>{{$route.LastSeenAgo}}</td>
 		<td>
 			{{- with $route.AURPPeer -}}
-				[redacted]
+				{{.RemoteAddr}}
 			{{- end -}}
 			{{- with $route.EtherTalkPeer -}}
 				{{.Port.Device}} {{.PeerAddr.Network}}.{{.PeerAddr.Node}}
 			{{- end -}}
 			{{- with $route.EtherTalkDirect -}}
-				{{.Device}}
+				{{.Device}} {{.NetStart}}-{{.NetEnd}}
 			{{- end -}}
 		</td>
 	</tr>
@@ -96,8 +96,8 @@ const peerTableTemplate = `
 	<tbody>
 {{range $peer := . }}
 	<tr>
-		<td>[redacted]</td>
-		<td>[redacted]</td>
+		<td>{{$peer.ConfiguredAddr}}</td>
+		<td>{{$peer.RemoteAddr}}</td>
 		<td>{{$peer.ReceiverState}}</td>
 		<td>{{$peer.SenderState}}</td>
 		<td>{{$peer.LastHeardFromAgo}}</td>
@@ -152,9 +152,9 @@ func main() {
 	}
 	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)})
 	if err != nil {
@@ -256,12 +256,12 @@ func main() {
 
 	// ------------------------- Configured peer setup ------------------------
 	if cfg.PeerListURL != "" {
-		log.Print("Fetching peer list...")
+		log.Printf("Fetching peer list from %s...", cfg.PeerListURL)
 		existing := len(cfg.Peers)
 		func() {
 			resp, err := http.Get(cfg.PeerListURL)
 			if err != nil {
-				log.Fatalf("Couldn't fetch peer list!")
+				log.Fatalf("Couldn't fetch peer list: %v", err)
 			}
 			defer resp.Body.Close()
 
@@ -287,13 +287,13 @@ func main() {
 
 		raddr, err := net.ResolveUDPAddr("udp4", peerStr)
 		if err != nil {
-			log.Print("couldn't resolve UDP address, skipping peer")
+			log.Printf("couldn't resolve UDP address, skipping: %v", err)
 			continue
 		}
-		//log.Printf("resolved %q to %v", peerStr, raddr)
+		log.Printf("resolved %q to %v", peerStr, raddr)
 
 		if raddr.IP.Equal(localIP) {
-			//log.Print("peer == me, skipping")
+			log.Printf("%v == %v == me, skipping", peerStr, raddr)
 			continue
 		}
 
@@ -380,7 +380,7 @@ func main() {
 				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?
 			ra := udpAddrFromNet(raddr)
@@ -388,7 +388,7 @@ func main() {
 			pr := peers[ra]
 			if pr == nil {
 				if !cfg.OpenPeering {
-					log.Print("AURP: Got packet but it's not in my config and open peering is disabled; dropping the packet")
+					log.Printf("AURP: Got packet from %v but it's not in my config and open peering is disabled; dropping the packet", raddr)
 					peersMu.Unlock()
 					continue
 				}

router/peer_aurp.go

@@ -295,7 +295,7 @@ func (p *AURPPeer) send(pkt aurp.Packet) (int, error) {
 	if _, err := pkt.WriteTo(&b); err != nil {
 		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)
 }
 
@@ -442,10 +442,10 @@ func (p *AURPPeer) Handle(ctx context.Context) error {
 					// In case it's a DNS name, re-resolve it before reconnecting
 					raddr, err := net.ResolveUDPAddr("udp4", p.ConfiguredAddr)
 					if err != nil {
-						log.Print("couldn't resolve UDP address, skipping")
+						log.Printf("couldn't resolve UDP address, skipping: %v", err)
 						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.bumpLastReconnect()