From f270ccc21fcad8a850def8d2f455aece2fa8e545 Mon Sep 17 00:00:00 2001
From: Daniel <dhaavi@users.noreply.github.com>
Date: Fri, 20 Mar 2020 23:00:18 +0100
Subject: [PATCH] Move and fix geoip package

---
 {network => intel}/geoip/database.go      |  0
 {network => intel}/geoip/location.go      |  0
 {network => intel}/geoip/location_test.go |  0
 {network => intel}/geoip/lookup.go        |  1 +
 {network => intel}/geoip/lookup_test.go   | 24 ++++++++++++++---------
 {network => intel}/geoip/module.go        | 10 ++--------
 intel/geoip/module_test.go                | 11 +++++++++++
 7 files changed, 29 insertions(+), 17 deletions(-)
 rename {network => intel}/geoip/database.go (100%)
 rename {network => intel}/geoip/location.go (100%)
 rename {network => intel}/geoip/location_test.go (100%)
 rename {network => intel}/geoip/lookup.go (99%)
 rename {network => intel}/geoip/lookup_test.go (80%)
 rename {network => intel}/geoip/module.go (73%)
 create mode 100644 intel/geoip/module_test.go

diff --git a/network/geoip/database.go b/intel/geoip/database.go
similarity index 100%
rename from network/geoip/database.go
rename to intel/geoip/database.go
diff --git a/network/geoip/location.go b/intel/geoip/location.go
similarity index 100%
rename from network/geoip/location.go
rename to intel/geoip/location.go
diff --git a/network/geoip/location_test.go b/intel/geoip/location_test.go
similarity index 100%
rename from network/geoip/location_test.go
rename to intel/geoip/location_test.go
diff --git a/network/geoip/lookup.go b/intel/geoip/lookup.go
similarity index 99%
rename from network/geoip/lookup.go
rename to intel/geoip/lookup.go
index 7e66b1d0..a4cdd3cb 100644
--- a/network/geoip/lookup.go
+++ b/intel/geoip/lookup.go
@@ -41,5 +41,6 @@ func GetLocation(ip net.IP) (record *Location, err error) {
 	if err != nil {
 		return nil, err
 	}
+
 	return record, nil
 }
diff --git a/network/geoip/lookup_test.go b/intel/geoip/lookup_test.go
similarity index 80%
rename from network/geoip/lookup_test.go
rename to intel/geoip/lookup_test.go
index 956a0923..583fa1a7 100644
--- a/network/geoip/lookup_test.go
+++ b/intel/geoip/lookup_test.go
@@ -3,16 +3,9 @@ package geoip
 import (
 	"net"
 	"testing"
-
-	"github.com/safing/portmaster/updates"
 )
 
 func TestLocationLookup(t *testing.T) {
-	err := updates.InitForTesting()
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	ip1 := net.ParseIP("81.2.69.142")
 	loc1, err := GetLocation(ip1)
 	if err != nil {
@@ -39,7 +32,21 @@ func TestLocationLookup(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Logf("%v", loc1)
+	t.Logf("%v", loc4)
+
+	ip5 := net.ParseIP("194.232.1.1")
+	loc5, err := GetLocation(ip5)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("%v", loc5)
+
+	ip6 := net.ParseIP("151.101.1.164")
+	loc6, err := GetLocation(ip6)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("%v", loc6)
 
 	dist1 := loc1.EstimateNetworkProximity(loc2)
 	dist2 := loc2.EstimateNetworkProximity(loc3)
@@ -50,5 +57,4 @@ func TestLocationLookup(t *testing.T) {
 	t.Logf("proximity %s <> %s: %d", ip2, ip3, dist2)
 	t.Logf("proximity %s <> %s: %d", ip1, ip3, dist3)
 	t.Logf("proximity %s <> %s: %d", ip1, ip4, dist4)
-
 }
diff --git a/network/geoip/module.go b/intel/geoip/module.go
similarity index 73%
rename from network/geoip/module.go
rename to intel/geoip/module.go
index 4f1efa56..1161929b 100644
--- a/network/geoip/module.go
+++ b/intel/geoip/module.go
@@ -2,7 +2,6 @@ package geoip
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/safing/portbase/modules"
 )
@@ -12,15 +11,10 @@ var (
 )
 
 func init() {
-	module = modules.Register("geoip", nil, start, nil, "updates")
+	module = modules.Register("geoip", prep, nil, nil, "updates")
 }
 
-func start() error {
-	err := prepDatabaseForUse()
-	if err != nil {
-		return fmt.Errorf("goeip: failed to load databases: %s", err)
-	}
-
+func prep() error {
 	return module.RegisterEventHook(
 		"updates",
 		"resource update",
diff --git a/intel/geoip/module_test.go b/intel/geoip/module_test.go
new file mode 100644
index 00000000..1b32ad88
--- /dev/null
+++ b/intel/geoip/module_test.go
@@ -0,0 +1,11 @@
+package geoip
+
+import (
+	"testing"
+
+	"github.com/safing/portmaster/core/pmtesting"
+)
+
+func TestMain(m *testing.M) {
+	pmtesting.TestMain(m)
+}