use common internal logger among all implementations(debugheaplog build tag)

This commit is contained in:
Patricio Whittingslow
2026-02-26 17:06:47 -03:00
parent be949d960c
commit 76f896af40
3 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -255,7 +255,7 @@ func (h *Handler) Demux(ethFrame []byte, frameOffset int) error {
q.hwaddr = append(q.hwaddr, hwaddr...) q.hwaddr = append(q.hwaddr, hwaddr...)
if q.dstHw != nil { if q.dstHw != nil {
if !internal.IsZeroed(q.dstHw...) { 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. copy(q.dstHw, hwaddr) // External write to user buffer.
} }
+2 -2
View File
@@ -56,7 +56,7 @@ func (sudp *StackUDPPort) Demux(carrierData []byte, frameOffset int) error {
if checkNodeErr(&sudp.h, err) { if checkNodeErr(&sudp.h, err) {
sudp.h.destroy() 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 return err
} }
@@ -82,7 +82,7 @@ func (sudp *StackUDPPort) Encapsulate(carrierData []byte, offsetToIP, offsetToFr
n, err := sudp.h.callbacks.Encapsulate(carrierData, offsetToIP, offsetToFrame+8) n, err := sudp.h.callbacks.Encapsulate(carrierData, offsetToIP, offsetToFrame+8)
if n == 0 { if n == 0 {
if err != nil { 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 return 0, err
} }
+3 -3
View File
@@ -227,20 +227,20 @@ func (listener *Listener) Demux(carrierData []byte, tcpFrameOffset int) error {
} }
conn, userData, iss := listener.poolGet() conn, userData, iss := listener.poolGet()
if conn == nil { 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) listener.rstQueue.Queue(srcaddr, src, listener.port, 0, tfrm.Seq()+1, FlagRST|FlagACK)
return lneto.ErrPacketDrop return lneto.ErrPacketDrop
} }
err = conn.OpenListen(dst, iss) err = conn.OpenListen(dst, iss)
if err != nil { if err != nil {
listener.poolReturn(conn) 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 return err // This should not happend
} }
err = conn.Demux(carrierData, tcpFrameOffset) err = conn.Demux(carrierData, tcpFrameOffset)
if err != nil { if err != nil {
listener.poolReturn(conn) listener.poolReturn(conn)
slog.Error("Listener:demux", slog.String("err", err.Error())) listener.logerr("Listener:demux", slog.String("err", err.Error()))
return lneto.ErrPacketDrop return lneto.ErrPacketDrop
} }
listener.incoming = append(listener.incoming, handler{ listener.incoming = append(listener.incoming, handler{