From 76f896af409873ecfc221e3795bdb3540c9c729b Mon Sep 17 00:00:00 2001 From: Patricio Whittingslow Date: Thu, 26 Feb 2026 17:06:47 -0300 Subject: [PATCH] use common internal logger among all implementations(debugheaplog build tag) --- arp/handler.go | 2 +- internet/stack-udpport.go | 4 ++-- tcp/listener.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arp/handler.go b/arp/handler.go index b0f7b85..648985a 100644 --- a/arp/handler.go +++ b/arp/handler.go @@ -255,7 +255,7 @@ func (h *Handler) Demux(ethFrame []byte, frameOffset int) error { q.hwaddr = append(q.hwaddr, hwaddr...) if q.dstHw != nil { if !internal.IsZeroed(q.dstHw...) { - slog.Error("race-condition:ARP-reused-buffer") + internal.LogAttrs(nil, slog.LevelError, "race-condition:ARP-reused-buffer") } copy(q.dstHw, hwaddr) // External write to user buffer. } diff --git a/internet/stack-udpport.go b/internet/stack-udpport.go index 761ca3e..e8a9bc4 100644 --- a/internet/stack-udpport.go +++ b/internet/stack-udpport.go @@ -56,7 +56,7 @@ func (sudp *StackUDPPort) Demux(carrierData []byte, frameOffset int) error { if checkNodeErr(&sudp.h, err) { sudp.h.destroy() } - slog.Error("stackudp:demux", slog.String("err", err.Error())) + internal.LogAttrs(nil, slog.LevelError, "stackudp:demux", slog.String("err", err.Error())) } return err } @@ -82,7 +82,7 @@ func (sudp *StackUDPPort) Encapsulate(carrierData []byte, offsetToIP, offsetToFr n, err := sudp.h.callbacks.Encapsulate(carrierData, offsetToIP, offsetToFrame+8) if n == 0 { if err != nil { - slog.Error("stackudp:encapsulate", slog.String("err", err.Error())) + internal.LogAttrs(nil, slog.LevelError, "stackudp:encapsulate", slog.String("err", err.Error())) } return 0, err } diff --git a/tcp/listener.go b/tcp/listener.go index 3e9117d..cfa822d 100644 --- a/tcp/listener.go +++ b/tcp/listener.go @@ -227,20 +227,20 @@ func (listener *Listener) Demux(carrierData []byte, tcpFrameOffset int) error { } conn, userData, iss := listener.poolGet() if conn == nil { - slog.Error("tcpListener:no-free-conn") + listener.logerr("tcpListener:no-free-conn") listener.rstQueue.Queue(srcaddr, src, listener.port, 0, tfrm.Seq()+1, FlagRST|FlagACK) return lneto.ErrPacketDrop } err = conn.OpenListen(dst, iss) if err != nil { listener.poolReturn(conn) - slog.Error("Listener:open", slog.String("err", err.Error())) + listener.logerr("Listener:open", slog.String("err", err.Error())) return err // This should not happend } err = conn.Demux(carrierData, tcpFrameOffset) if err != nil { listener.poolReturn(conn) - slog.Error("Listener:demux", slog.String("err", err.Error())) + listener.logerr("Listener:demux", slog.String("err", err.Error())) return lneto.ErrPacketDrop } listener.incoming = append(listener.incoming, handler{