566c6b246a
This diff addresses another point of https://github.com/ooni/probe/issues/1956: > - [ ] observe that we're still using a bunch of private interfaces for common interfaces such as the `Dialer`, so we can get rid of these private interfaces and always use the ones in `model`, which allows us to remove a bunch of legacy wrappers Additional cleanups may still be possible. The more I cleanup, the more I see there's extra legacy code we can dispose of (which seems good?).
82 lines
1.7 KiB
Go
82 lines
1.7 KiB
Go
package quicdialer
|
|
|
|
import (
|
|
"net"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/trace"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
)
|
|
|
|
// QUICListenerSaver is a QUICListener that also implements saving events.
|
|
type QUICListenerSaver struct {
|
|
// QUICListener is the underlying QUICListener.
|
|
model.QUICListener
|
|
|
|
// Saver is the underlying Saver.
|
|
Saver *trace.Saver
|
|
}
|
|
|
|
// Listen implements QUICListener.Listen.
|
|
func (qls *QUICListenerSaver) Listen(addr *net.UDPAddr) (model.UDPLikeConn, error) {
|
|
pconn, err := qls.QUICListener.Listen(addr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &saverUDPConn{
|
|
UDPLikeConn: pconn,
|
|
saver: qls.Saver,
|
|
}, nil
|
|
}
|
|
|
|
type saverUDPConn struct {
|
|
model.UDPLikeConn
|
|
saver *trace.Saver
|
|
}
|
|
|
|
var _ model.UDPLikeConn = &saverUDPConn{}
|
|
|
|
func (c *saverUDPConn) WriteTo(p []byte, addr net.Addr) (int, error) {
|
|
start := time.Now()
|
|
count, err := c.UDPLikeConn.WriteTo(p, addr)
|
|
stop := time.Now()
|
|
c.saver.Write(trace.Event{
|
|
Address: addr.String(),
|
|
Data: p[:count],
|
|
Duration: stop.Sub(start),
|
|
Err: err,
|
|
NumBytes: count,
|
|
Name: netxlite.WriteToOperation,
|
|
Time: stop,
|
|
})
|
|
return count, err
|
|
}
|
|
|
|
func (c *saverUDPConn) ReadFrom(b []byte) (int, net.Addr, error) {
|
|
start := time.Now()
|
|
n, addr, err := c.UDPLikeConn.ReadFrom(b)
|
|
stop := time.Now()
|
|
var data []byte
|
|
if n > 0 {
|
|
data = b[:n]
|
|
}
|
|
c.saver.Write(trace.Event{
|
|
Address: c.safeAddrString(addr),
|
|
Data: data,
|
|
Duration: stop.Sub(start),
|
|
Err: err,
|
|
NumBytes: n,
|
|
Name: netxlite.ReadFromOperation,
|
|
Time: stop,
|
|
})
|
|
return n, addr, err
|
|
}
|
|
|
|
func (c *saverUDPConn) safeAddrString(addr net.Addr) (out string) {
|
|
if addr != nil {
|
|
out = addr.String()
|
|
}
|
|
return
|
|
}
|