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
54 lines
1.3 KiB
Go
54 lines
1.3 KiB
Go
package measurex
|
|
|
|
//
|
|
// DNSX (DNS eXtensions)
|
|
//
|
|
// We wrap dnsx.RoundTripper to store events into a WritableDB.
|
|
//
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
// WrapDNSXRoundTripper creates a new DNSXRoundTripper that
|
|
// saves events into the given WritableDB.
|
|
func (mx *Measurer) WrapDNSXRoundTripper(db WritableDB, rtx model.DNSTransport) model.DNSTransport {
|
|
return &dnsxRoundTripperDB{db: db, DNSTransport: rtx, begin: mx.Begin}
|
|
}
|
|
|
|
type dnsxRoundTripperDB struct {
|
|
model.DNSTransport
|
|
begin time.Time
|
|
db WritableDB
|
|
}
|
|
|
|
// DNSRoundTripEvent contains the result of a DNS round trip.
|
|
type DNSRoundTripEvent struct {
|
|
Network string
|
|
Address string
|
|
Query []byte
|
|
Started float64
|
|
Finished float64
|
|
Failure *string
|
|
Reply []byte
|
|
}
|
|
|
|
func (txp *dnsxRoundTripperDB) RoundTrip(ctx context.Context, query []byte) ([]byte, error) {
|
|
started := time.Since(txp.begin).Seconds()
|
|
reply, 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,
|
|
Started: started,
|
|
Finished: finished,
|
|
Failure: NewFailure(err),
|
|
Reply: reply,
|
|
})
|
|
return reply, err
|
|
}
|