c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: move tls handshaker to netxlite (#400)

Browse source 
Part of https://github.com/ooni/probe/issues/1505
This commit is contained in:
Simone Basso 2021-06-25 11:07:26 +02:00 • committed by GitHub
commit 6b7d270bda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 182 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/netxlite/resolver.go
View file

@ -15,25 +15,25 @@ type Resolver interface {
// ResolverSystem is the system resolver.
type ResolverSystem struct{}
var _ Resolver = ResolverSystem{}
var _ Resolver = &ResolverSystem{}
// LookupHost implements Resolver.LookupHost.
func (r ResolverSystem) LookupHost(ctx context.Context, hostname string) ([]string, error) {
func (r *ResolverSystem) LookupHost(ctx context.Context, hostname string) ([]string, error) {
return net.DefaultResolver.LookupHost(ctx, hostname)
}
// Network implements Resolver.Network.
func (r ResolverSystem) Network() string {
func (r *ResolverSystem) Network() string {
return "system"
}
// Address implements Resolver.Address.
func (r ResolverSystem) Address() string {
func (r *ResolverSystem) Address() string {
return ""
}
// DefaultResolver is the resolver we use by default.
var DefaultResolver = ResolverSystem{}
var DefaultResolver = &ResolverSystem{}
// ResolverLogger is a resolver that emits events
type ResolverLogger struct {
@ -41,10 +41,10 @@ type ResolverLogger struct {
Logger Logger
}
var _ Resolver = ResolverLogger{}
var _ Resolver = &ResolverLogger{}
// LookupHost returns the IP addresses of a host
func (r ResolverLogger) LookupHost(ctx context.Context, hostname string) ([]string, error) {
func (r *ResolverLogger) LookupHost(ctx context.Context, hostname string) ([]string, error) {
r.Logger.Debugf("resolve %s...", hostname)
start := time.Now()
addrs, err := r.Resolver.LookupHost(ctx, hostname)
@ -62,7 +62,7 @@ type resolverNetworker interface {
}
// Network implements Resolver.Network.
func (r ResolverLogger) Network() string {
func (r *ResolverLogger) Network() string {
if rn, ok := r.Resolver.(resolverNetworker); ok {
return rn.Network()
}
@ -74,7 +74,7 @@ type resolverAddresser interface {
}
// Address implements Resolver.Address.
func (r ResolverLogger) Address() string {
func (r *ResolverLogger) Address() string {
if ra, ok := r.Resolver.(resolverAddresser); ok {
return ra.Address()
}