Complete first alpha version

intel/ipinfo.go

@@ -59,10 +59,10 @@ func GetIPInfo(ip string) (*IPInfo, error) {
 
 // AddDomain adds a domain to the list and reports back if it was added, or was already present.
 func (ipi *IPInfo) AddDomain(domain string) (added bool) {
+	ipi.Lock()
+	defer ipi.Unlock()
 	if !utils.StringInSlice(ipi.Domains, domain) {
-		newDomains := make([]string, 1, len(ipi.Domains)+1)
-		newDomains[0] = domain
-		ipi.Domains = append(newDomains, ipi.Domains...)
+		ipi.Domains = append([]string{domain}, ipi.Domains...)
 		return true
 	}
 	return false
@@ -70,11 +70,22 @@ func (ipi *IPInfo) AddDomain(domain string) (added bool) {
 
 // Save saves the IPInfo record to the database.
 func (ipi *IPInfo) Save() error {
-	ipi.SetKey(makeIPInfoKey(ipi.IP))
-	return ipInfoDatabase.PutNew(ipi)
+	ipi.Lock()
+	if !ipi.KeyIsSet() {
+		ipi.SetKey(makeIPInfoKey(ipi.IP))
+	}
+	ipi.Unlock()
+	return ipInfoDatabase.Put(ipi)
 }
 
 // FmtDomains returns a string consisting of the domains that have seen to use this IP, joined by " or "
 func (ipi *IPInfo) FmtDomains() string {
 	return strings.Join(ipi.Domains, " or ")
 }
+
+// FmtDomains returns a string consisting of the domains that have seen to use this IP, joined by " or "
+func (ipi *IPInfo) String() string {
+	ipi.Lock()
+	defer ipi.Unlock()
+	return fmt.Sprintf("<IPInfo[%s] %s: %s", ipi.Key(), ipi.IP, ipi.FmtDomains())
+}

intel/ipinfo_test.go

@@ -0,0 +1,25 @@
+package intel
+
+import "testing"
+
+func testDomains(t *testing.T, ipi *IPInfo, expectedDomains string) {
+	if ipi.FmtDomains() != expectedDomains {
+		t.Errorf("unexpected domains '%s', expected '%s'", ipi.FmtDomains(), expectedDomains)
+	}
+}
+
+func TestIPInfo(t *testing.T) {
+	ipi := &IPInfo{
+		IP:      "1.2.3.4",
+		Domains: []string{"example.com.", "sub.example.com."},
+	}
+
+	testDomains(t, ipi, "example.com. or sub.example.com.")
+	ipi.AddDomain("added.example.com.")
+	testDomains(t, ipi, "added.example.com. or example.com. or sub.example.com.")
+	ipi.AddDomain("sub.example.com.")
+	testDomains(t, ipi, "added.example.com. or example.com. or sub.example.com.")
+	ipi.AddDomain("added.example.com.")
+	testDomains(t, ipi, "added.example.com. or example.com. or sub.example.com.")
+
+}

intel/resolver.go

@@ -152,7 +152,7 @@ configuredServersLoop:
 				ServerType:    parts[0],
 				ServerAddress: parts[1],
 				ServerIP:      ip,
-				ServerIPScope: netutils.ClassifyAddress(ip),
+				ServerIPScope: netutils.ClassifyIP(ip),
 				ServerPort:    port,
 				LastFail:      &lastFail,
 				Source:        "config",
@@ -207,7 +207,7 @@ assignedServersLoop:
 				ServerType:           "dns",
 				ServerAddress:        urlFormatAddress(nameserver.IP, 53),
 				ServerIP:             nameserver.IP,
-				ServerIPScope:        netutils.ClassifyAddress(nameserver.IP),
+				ServerIPScope:        netutils.ClassifyIP(nameserver.IP),
 				ServerPort:           53,
 				LastFail:             &lastFail,
 				Source:               "dhcp",

intel/rrcache.go

@@ -216,9 +216,9 @@ entryLoop:
 		classification = -1
 		switch v := rr.(type) {
 		case *dns.A:
-			classification = netutils.ClassifyAddress(v.A)
+			classification = netutils.ClassifyIP(v.A)
 		case *dns.AAAA:
-			classification = netutils.ClassifyAddress(v.AAAA)
+			classification = netutils.ClassifyIP(v.AAAA)
 		}
 
 		if classification >= 0 {