d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
36 lines
796 B
Go
36 lines
796 B
Go
package geolocate
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net"
|
|
)
|
|
|
|
var (
|
|
// ErrNoIPAddressReturned indicates that no IP address was
|
|
// returned by a specific DNS resolver.
|
|
ErrNoIPAddressReturned = errors.New("geolocate: no IP address returned")
|
|
)
|
|
|
|
type dnsResolver interface {
|
|
LookupHost(ctx context.Context, host string) (addrs []string, err error)
|
|
}
|
|
|
|
type resolverLookupClient struct{}
|
|
|
|
func (rlc resolverLookupClient) do(ctx context.Context, r dnsResolver) (string, error) {
|
|
var ips []string
|
|
ips, err := r.LookupHost(ctx, "whoami.akamai.net")
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if len(ips) < 1 {
|
|
return "", ErrNoIPAddressReturned
|
|
}
|
|
return ips[0], nil
|
|
}
|
|
|
|
func (rlc resolverLookupClient) LookupResolverIP(ctx context.Context) (ip string, err error) {
|
|
return rlc.do(ctx, &net.Resolver{})
|
|
}
|