compile issues

4 files changed, 9 insertions, 10 deletions

diff --git a/cleaner.go b/cleaner.go
index 1e713b2..03914e4 100644
--- a/cleaner.go
+++ b/cleaner.go
@@ -64,8 +64,8 @@ func cleanData(conf Config, db_user, db_pass, db_conn, db_name string) (err erro
 	}
 
 	//save cleaned data
-	for _, cd := range cDat {
-		err = insertCleanData(tx, cd)
+	for ix := range cDat {
+		err = insertCleanData(tx, &cDat[ix])
 		if err != nil {
 			tx.Rollback()
 			log.Println("Failed to save cleaned data")
@@ -124,8 +124,8 @@ func clean(rDat []RawData, conf Config) (cDat []CleanData, err error) {
 	// collect all ips so we can query for their ip blocks
 	ips := make(map[string]struct{})
 	for _, rd := range rDat {
-		ips[rd.ipSrc] = nil
-		ips[rd.ipDst] = nil
+		ips[rd.ipSrc] = struct{}{}
+		ips[rd.ipDst] = struct{}{}
 	}
 
 	var iplist []string
@@ -146,8 +146,8 @@ func clean(rDat []RawData, conf Config) (cDat []CleanData, err error) {
 		}
 		cDat = append(cDat,
 			CleanData{
-				ipbSrc:     ips[rd.ipSrc].ipBlock,
-				ipbDst:     ips[rd.ipDst].ipBlock,
+				ipbSrc:     pairs[rd.ipSrc],
+				ipbDst:     pairs[rd.ipDst],
 				asSrc:      rd.asSrc,
 				asDst:      rd.asDst,
 				portSrc:    rd.portSrc,
diff --git a/datastructs.go b/datastructs.go
index b970cec..f937d35 100644
--- a/datastructs.go
+++ b/datastructs.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"time"
 )
 
@@ -33,7 +32,7 @@ func (cd *CleanData) equals(other *CleanData) bool {
 	return cd.ipbSrc == other.ipbSrc &&
 		cd.ipbDst == other.ipbDst &&
 		cd.asSrc == other.asSrc &&
-		cd.asDst == othr.asDst &&
+		cd.asDst == other.asDst &&
 		cd.portSrc == other.portSrc &&
 		cd.portDst == other.portDst &&
 		cd.volume == other.volume &&
diff --git a/sqlQueries.go b/sqlQueries.go
index 34f802a..7683427 100644
--- a/sqlQueries.go
+++ b/sqlQueries.go
@@ -54,7 +54,7 @@ func fetchRawData(db *sql.DB, tim time.Time, limit int) (rDat []RawData, err err
 	for rows.Next() {
 		var r RawData
 		var tim []byte
-		err = rows.Scan(&rd.ipSrc, &rd.ipDst, &rd.asSrc, &rd.asDst, &rd.portSrc, &rd.portDst, &rd.packets, &rd.pktLenDist, &tim)
+		err = rows.Scan(&r.ipSrc, &r.ipDst, &r.asSrc, &r.asDst, &r.portSrc, &r.portDst, &r.packets, &r.pktLenDist, &tim)
 		if err != nil {
 			log.Println("Failed to scan result of query")
 			return
diff --git a/whois.go b/whois.go
index c6838e1..f49dcbc 100644
--- a/whois.go
+++ b/whois.go
@@ -48,7 +48,7 @@ func findASAndIPBlock(domains ...string) (pairs map[string]string, err error) {
 	}
 
 	lines := strings.Split(res, "\n")
-	pairs = make(map[string]string, 0, len(lines)-2)
+	pairs = make(map[string]string, len(lines)-2)
 	for ix, line := range lines[1 : len(lines)-1] {
 		content := strings.Split(line, "|")
 		ipb := strings.TrimSpace(content[2])