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:
@@ -36,18 +36,31 @@ type DNSRoundTripEvent struct {
|
||||
Reply []byte
|
||||
}
|
||||
|
||||
func (txp *dnsxRoundTripperDB) RoundTrip(ctx context.Context, query []byte) ([]byte, error) {
|
||||
func (txp *dnsxRoundTripperDB) RoundTrip(
|
||||
ctx context.Context, query model.DNSQuery) (model.DNSResponse, error) {
|
||||
started := time.Since(txp.begin).Seconds()
|
||||
reply, err := txp.DNSTransport.RoundTrip(ctx, query)
|
||||
response, err := txp.DNSTransport.RoundTrip(ctx, query)
|
||||
finished := time.Since(txp.begin).Seconds()
|
||||
txp.db.InsertIntoDNSRoundTrip(&DNSRoundTripEvent{
|
||||
Network: txp.DNSTransport.Network(),
|
||||
Address: txp.DNSTransport.Address(),
|
||||
Query: query,
|
||||
Query: txp.maybeQueryBytes(query),
|
||||
Started: started,
|
||||
Finished: finished,
|
||||
Failure: NewFailure(err),
|
||||
Reply: reply,
|
||||
Reply: txp.maybeResponseBytes(response),
|
||||
})
|
||||
return reply, err
|
||||
return response, err
|
||||
}
|
||||
|
||||
func (txp *dnsxRoundTripperDB) maybeQueryBytes(query model.DNSQuery) []byte {
|
||||
data, _ := query.Bytes()
|
||||
return data
|
||||
}
|
||||
|
||||
func (txp *dnsxRoundTripperDB) maybeResponseBytes(response model.DNSResponse) []byte {
|
||||
if response == nil {
|
||||
return nil
|
||||
}
|
||||
return response.Bytes()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user