273b70bacc
## Checklist - [x] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md) - [x] reference issue for this pull request: https://github.com/ooni/probe/issues/1885 - [x] related ooni/spec pull request: N/A Location of the issue tracker: https://github.com/ooni/probe ## Description This PR contains a set of changes to move important interfaces and data types into the `./internal/model` package. The criteria for including an interface or data type in here is roughly that the type should be important and used by several packages. We are especially interested to move more interfaces here to increase modularity. An additional side effect is that, by reading this package, one should be able to understand more quickly how different parts of the codebase interact with each other. This is what I want to move in `internal/model`: - [x] most important interfaces from `internal/netxlite` - [x] everything that was previously part of `internal/engine/model` - [x] mocks from `internal/netxlite/mocks` should also be moved in here as a subpackage
72 lines
1.7 KiB
Go
72 lines
1.7 KiB
Go
package netxlite
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
// DNSOverUDP is a DNS-over-UDP DNSTransport.
|
|
type DNSOverUDP struct {
|
|
dialer model.Dialer
|
|
address string
|
|
}
|
|
|
|
// NewDNSOverUDP creates a DNSOverUDP instance.
|
|
//
|
|
// Arguments:
|
|
//
|
|
// - dialer is any type that implements the Dialer interface;
|
|
//
|
|
// - address is the endpoint address (e.g., 8.8.8.8:53).
|
|
func NewDNSOverUDP(dialer model.Dialer, address string) *DNSOverUDP {
|
|
return &DNSOverUDP{dialer: dialer, address: address}
|
|
}
|
|
|
|
// RoundTrip sends a query and receives a reply.
|
|
func (t *DNSOverUDP) RoundTrip(ctx context.Context, query []byte) ([]byte, error) {
|
|
conn, err := t.dialer.DialContext(ctx, "udp", t.address)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer conn.Close()
|
|
// Use five seconds timeout like Bionic does. See
|
|
// https://labs.ripe.net/Members/baptiste_jonglez_1/persistent-dns-connections-for-reliability-and-performance
|
|
if err = conn.SetDeadline(time.Now().Add(5 * time.Second)); err != nil {
|
|
return nil, err
|
|
}
|
|
if _, err = conn.Write(query); err != nil {
|
|
return nil, err
|
|
}
|
|
reply := make([]byte, 1<<17)
|
|
var n int
|
|
n, err = conn.Read(reply)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return reply[:n], nil
|
|
}
|
|
|
|
// RequiresPadding returns false for UDP according to RFC8467.
|
|
func (t *DNSOverUDP) RequiresPadding() bool {
|
|
return false
|
|
}
|
|
|
|
// Network returns the transport network, i.e., "udp".
|
|
func (t *DNSOverUDP) Network() string {
|
|
return "udp"
|
|
}
|
|
|
|
// Address returns the upstream server address.
|
|
func (t *DNSOverUDP) Address() string {
|
|
return t.address
|
|
}
|
|
|
|
// CloseIdleConnections closes idle connections, if any.
|
|
func (t *DNSOverUDP) CloseIdleConnections() {
|
|
// nothing to do
|
|
}
|
|
|
|
var _ model.DNSTransport = &DNSOverUDP{}
|