icmp: err logs

Author: ignoramous

intra/core/ping.go

@@ -123,7 +123,7 @@ func Echo(pc net.PacketConn, pkt []byte, dst net.Addr, v4 bool) (reply []byte, f
 	}
 
 	n, err = pc.WriteTo(pkt, dst)
-	log.D("core: icmp: egress: write(=> %v) ping; done %d/%d; err? %v",
+	logev(err)("core: icmp: egress: write(=> %v) ping; done %d/%d; err? %v",
 		dst, n, len(pkt), err)
 	if err != nil {
 		// TODO: unreachable reply?
@@ -134,7 +134,7 @@ func Echo(pc net.PacketConn, pkt []byte, dst net.Addr, v4 bool) (reply []byte, f
 	n, from, err = pc.ReadFrom(pkt)
 	reply = pkt[:n] // trunc
 
-	log.D("core: icmp: ingress: read(<= %v / %v) ping done; done %d; err? %v",
+	logev(err)("core: icmp: ingress: read(<= %v / %v) ping done; done %d; err? %v",
 		dst, from, n, err)
 	// TODO: on err, unreachable reply?
 	return

intra/icmp.go

@@ -125,7 +125,7 @@ func (h *icmpHandler) Ping(msg []byte, source, target netip.AddrPort) (echoed bo
 	rx = len(reply)
 	rtt = time.Since(rttstart)
 	// todo: ignore non-ICMP replies in b: github.com/prometheus-community/pro-bing/blob/0bacb2d5e7/ping.go#L630
-	log.D("t.icmp: ingress: read(%v <= %v / %v) ping done (send: %d, recv: %d, rtt: %s); err? %v",
+	logev(err)("t.icmp: ingress: read(%v <= %v / %v) ping done (send: %d, recv: %d, rtt: %s); err? %v",
 		source, from, dst, tx, rx, core.FmtPeriod(rtt), err)
 
 	return true // echoed; even if err != nil

intra/netstack/icmpecho.go

@@ -193,8 +193,9 @@ func (r *icmpResponder) inject(proto tcpip.NetworkProtocolNumber, packet []byte)
 	var list stack.PacketBufferList
 	list.PushBack(pkt)
 
+	sz := pkt.Size()
 	n, err := r.ep.WritePackets(list)
-	logeif(e(err))("icmp: responder: inject to tun (sz: %d); err? %v", n, err)
+	logeif(e(err))("icmp: responder: inject to tun (n: %d; sz: %d); err? %v", n, sz, err)
 }
 
 func buildICMPv4Reply(p *wire.Parsed, req []byte) ([]byte, error) {