refactor: DNSTransport I/Os DNS messages (#760)
This diff refactors the DNSTransport model to receive in input a DNSQuery and return in output a DNSResponse. The design of DNSQuery and DNSResponse takes into account the use case of a transport using getaddrinfo, meaning that we don't need to serialize and deserialize messages when using getaddrinfo. The current codebase does not use a getaddrinfo transport, but I wrote one such a transport in the Websteps Winter 2021 prototype (https://github.com/bassosimone/websteps-illustrated/). The design conversation that lead to producing this diff is https://github.com/ooni/probe/issues/2099
This commit is contained in:
parent
7a0a156aec
commit
01a513a496
35 changed files with 1694 additions and 1039 deletions
|
|
@ -46,28 +46,41 @@ type SaverDNSTransport struct {
|
|||
}
|
||||
|
||||
// RoundTrip implements RoundTripper.RoundTrip
|
||||
func (txp SaverDNSTransport) RoundTrip(ctx context.Context, query []byte) ([]byte, error) {
|
||||
func (txp SaverDNSTransport) RoundTrip(
|
||||
ctx context.Context, query model.DNSQuery) (model.DNSResponse, error) {
|
||||
start := time.Now()
|
||||
txp.Saver.Write(trace.Event{
|
||||
Address: txp.Address(),
|
||||
DNSQuery: query,
|
||||
DNSQuery: txp.maybeQueryBytes(query),
|
||||
Name: "dns_round_trip_start",
|
||||
Proto: txp.Network(),
|
||||
Time: start,
|
||||
})
|
||||
reply, err := txp.DNSTransport.RoundTrip(ctx, query)
|
||||
response, err := txp.DNSTransport.RoundTrip(ctx, query)
|
||||
stop := time.Now()
|
||||
txp.Saver.Write(trace.Event{
|
||||
Address: txp.Address(),
|
||||
DNSQuery: query,
|
||||
DNSReply: reply,
|
||||
DNSQuery: txp.maybeQueryBytes(query),
|
||||
DNSReply: txp.maybeResponseBytes(response),
|
||||
Duration: stop.Sub(start),
|
||||
Err: err,
|
||||
Name: "dns_round_trip_done",
|
||||
Proto: txp.Network(),
|
||||
Time: stop,
|
||||
})
|
||||
return reply, err
|
||||
return response, err
|
||||
}
|
||||
|
||||
func (txp SaverDNSTransport) maybeQueryBytes(query model.DNSQuery) []byte {
|
||||
data, _ := query.Bytes()
|
||||
return data
|
||||
}
|
||||
|
||||
func (txp SaverDNSTransport) maybeResponseBytes(response model.DNSResponse) []byte {
|
||||
if response == nil {
|
||||
return nil
|
||||
}
|
||||
return response.Bytes()
|
||||
}
|
||||
|
||||
var _ model.Resolver = SaverResolver{}
|
||||
|
|
|
|||
Loading…
Reference in a new issue