Add geoip command line tool

ooni · Mar 23, 2018 · 4bbffa9 · 4bbffa9
1 parent 7fe1551
commit 4bbffa9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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 {