Commit dde20000 authored by Kirill Smelkov's avatar Kirill Smelkov

xnet: Tracer -> TraceReceiver

Rename the interface that specifies methods to be implemented by trace
receivers. Reason is that in the next patch we'll need to expose
"Tracer" as the tracing networker itself.
parent 60bad2d1
// Copyright (C) 2017-2020 Nexedi SA and Contributors. // Copyright (C) 2017-2021 Nexedi SA and Contributors.
// Kirill Smelkov <kirr@nexedi.com> // Kirill Smelkov <kirr@nexedi.com>
// //
// This program is free software: you can Use, Study, Modify and Redistribute // This program is free software: you can Use, Study, Modify and Redistribute
...@@ -41,12 +41,12 @@ import ( ...@@ -41,12 +41,12 @@ import (
// - for similar reasons. // - for similar reasons.
// //
// WARNING NetTrace functionality is currently very draft. // WARNING NetTrace functionality is currently very draft.
func NetTrace(inner Networker, tracer Tracer) Networker { func NetTrace(inner Networker, tracerx TraceReceiver) Networker {
return &netTrace{inner, tracer} return &netTrace{inner, tracerx}
} }
// Tracer is the interface that needs to be implemented by network trace receivers. // TraceReceiver is the interface that needs to be implemented by network trace receivers.
type Tracer interface { type TraceReceiver interface {
TraceNetDial(*TraceDial) TraceNetDial(*TraceDial)
TraceNetConnect(*TraceConnect) TraceNetConnect(*TraceConnect)
TraceNetListen(*TraceListen) TraceNetListen(*TraceListen)
...@@ -84,7 +84,7 @@ type TraceTx struct { ...@@ -84,7 +84,7 @@ type TraceTx struct {
// it is wrapped with traceConn. // it is wrapped with traceConn.
type netTrace struct { type netTrace struct {
inner Networker inner Networker
tracer Tracer rx TraceReceiver
} }
func (nt *netTrace) Network() string { func (nt *netTrace) Network() string {
...@@ -101,12 +101,12 @@ func (nt *netTrace) Close() error { ...@@ -101,12 +101,12 @@ func (nt *netTrace) Close() error {
} }
func (nt *netTrace) Dial(ctx context.Context, addr string) (net.Conn, error) { func (nt *netTrace) Dial(ctx context.Context, addr string) (net.Conn, error) {
nt.tracer.TraceNetDial(&TraceDial{Dialer: nt.inner.Name(), Addr: addr}) nt.rx.TraceNetDial(&TraceDial{Dialer: nt.inner.Name(), Addr: addr})
c, err := nt.inner.Dial(ctx, addr) c, err := nt.inner.Dial(ctx, addr)
if err != nil { if err != nil {
return nil, err return nil, err
} }
nt.tracer.TraceNetConnect(&TraceConnect{Src: c.LocalAddr(), Dst: c.RemoteAddr(), Dialed: addr}) nt.rx.TraceNetConnect(&TraceConnect{Src: c.LocalAddr(), Dst: c.RemoteAddr(), Dialed: addr})
return &traceConn{nt, c}, nil return &traceConn{nt, c}, nil
} }
...@@ -116,7 +116,7 @@ func (nt *netTrace) Listen(ctx context.Context, laddr string) (Listener, error) ...@@ -116,7 +116,7 @@ func (nt *netTrace) Listen(ctx context.Context, laddr string) (Listener, error)
if err != nil { if err != nil {
return nil, err return nil, err
} }
nt.tracer.TraceNetListen(&TraceListen{Laddr: l.Addr()}) nt.rx.TraceNetListen(&TraceListen{Laddr: l.Addr()})
return &netTraceListener{nt, l}, nil return &netTraceListener{nt, l}, nil
} }
...@@ -144,7 +144,7 @@ func (tc *traceConn) Write(b []byte) (int, error) { ...@@ -144,7 +144,7 @@ func (tc *traceConn) Write(b []byte) (int, error) {
// XXX +TraceNetTxPre ? // XXX +TraceNetTxPre ?
n, err := tc.Conn.Write(b) n, err := tc.Conn.Write(b)
if err == nil { if err == nil {
tc.nt.tracer.TraceNetTx(&TraceTx{Src: tc.LocalAddr(), Dst: tc.RemoteAddr(), Pkt: b}) tc.nt.rx.TraceNetTx(&TraceTx{Src: tc.LocalAddr(), Dst: tc.RemoteAddr(), Pkt: b})
} }
return n, err return n, err
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment