c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netxlite: do not call netgo the CGO_ENABLED=0 resolver (#766)

Browse Source 
In https://github.com/ooni/probe/issues/2029#issuecomment-1140805266, we
explained why calling it "netgo" would be incorrect.

In other words, we can get the platform's `getaddrinfo` as long as
we're not cross compiling. We do cross compile `ooniprobe`, actually
it's not even possible to cross compile it.

For increased accuracy, we should stop cross compiling `miniooni`
as well, so it would also directly use `getaddrinfo`.

This diff fixes at the same time ooni/probe-cli and ooni/spec
and we'll open two pull requests in parallel.
This commit is contained in:
Simone Basso
2022-05-30 10:06:53 +02:00
committed by GitHub
parent f3912188e1
commit 595d0744db
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/netxlite/getaddrinfo_otherwise.go
+6 -3
View File
@@ -11,10 +11,13 @@ import (
// been used to implement the getaddrinfo resolver.
//
// This is the CGO_ENABLED=0 implementation of this function, which
// always returns the string "netgo", because in this scenario we
// are actually using the netgo implementation of net.Resolver.
// always returns the string "go", because in this scenario we are actually
// using whatever resolver is used under the hood by the stdlib.
//
// See https://github.com/ooni/probe/issues/2029#issuecomment-1140805266
// for an explanation of why calling this resolver "netgo" is wrong.
func getaddrinfoResolverNetwork() string {
return "netgo"
return "go"
}
// getaddrinfoLookupANY attempts to perform an ANY lookup using getaddrinfo.