diff --git a/cmd/ooni/main.go b/cmd/ooni/main.go index 9925661..a7a7d20 100644 --- a/cmd/ooni/main.go +++ b/cmd/ooni/main.go @@ -4,6 +4,7 @@ import ( // commands "github.com/apex/log" + _ "github.com/openobservatory/gooni/internal/cli/geoip" _ "github.com/openobservatory/gooni/internal/cli/info" _ "github.com/openobservatory/gooni/internal/cli/list" _ "github.com/openobservatory/gooni/internal/cli/nettest" diff --git a/utils/geoip.go b/utils/geoip.go index 1b91f76..1bb7730 100644 --- a/utils/geoip.go +++ b/utils/geoip.go @@ -4,7 +4,6 @@ import ( "archive/tar" "compress/gzip" "encoding/json" - "fmt" "io" "io/ioutil" "math/rand" @@ -97,8 +96,7 @@ func DownloadGeoIPDatabaseFiles(dir string) error { // LookupLocation resolves an IP to a location according to the Maxmind DB func LookupLocation(dbPath string, ipStr string) (LocationInfo, error) { - loc := LocationInfo{} - fmt.Printf("Opening %s", filepath.Join(dbPath, "GeoLite2-ASN.mmdb")) + loc := LocationInfo{IP: ipStr} asnDB, err := geoip2.Open(filepath.Join(dbPath, "GeoLite2-ASN.mmdb")) if err != nil {