fixed raw data struct so that encoding/json can prase into it

3 files changed, 22 insertions, 22 deletions

diff --git a/cleaner.go b/cleaner.go
index f7f697e..8d5985f 100644
--- a/cleaner.go
+++ b/cleaner.go
@@ -151,8 +151,8 @@ func clean(rDat []RawData, cfg *Config) (cDat []cleanedData, 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] = struct{}{}
-		ips[rd.IpDst] = struct{}{}
+		ips[rd.Ip_src] = struct{}{}
+		ips[rd.Ip_dst] = struct{}{}
 	}
 
 	var iplist []string
@@ -173,14 +173,14 @@ func clean(rDat []RawData, cfg *Config) (cDat []cleanedData, err error) {
 		}
 		cDat = append(cDat,
 			cleanedData{
-				ipbSrc:     pairs[rd.IpSrc],
-				ipbDst:     pairs[rd.IpDst],
-				asSrc:      rd.AsSrc,
-				asDst:      rd.AsDst,
-				portSrc:    rd.PortSrc,
-				portDst:    rd.PortDst,
-				occurences: 1,
-				volume:     rd.PktLenDist,
+				ipbSrc:     pairs[rd.Ip_src],
+				ipbDst:     pairs[rd.Ip_dst],
+				asSrc:      rd.As_src,
+				asDst:      rd.As_dst,
+				portSrc:    rd.Port_src,
+				portDst:    rd.Port_dst,
+				occurences: rd.Packets,
+				volume:     rd.Pkt_len_distrib,
 				time:       tim,
 			})
 	}
diff --git a/datastructs.go b/datastructs.go
index f8887ef..1c088e3 100644
--- a/datastructs.go
+++ b/datastructs.go
@@ -5,15 +5,15 @@ import (
 )
 
 type RawData struct {
-	IpSrc      string `json:ip_src`
-	IpDst      string `json:ip_dst`
-	AsSrc      int    `json:as_src`
-	AsDst      int    `json:as_dst`
-	PortSrc    int    `json:port_src`
-	PortDst    int    `json:port_dst`
-	Packets    int    `json:packets`
-	PktLenDist string `json:pkt_len_distrib`
-	time       time.Time
+	Ip_src          string `json:ip_src`
+	Ip_dst          string `json:ip_dst`
+	As_src          int    `json:as_src`
+	As_dst          int    `json:as_dst`
+	Port_src        int    `json:port_src`
+	Port_dst        int    `json:port_dst`
+	Packets         int    `json:packets`
+	Pkt_len_distrib string `json:pkt_len_distrib`
+	time            time.Time
 }
 
 type cleanedData struct {
diff --git a/sqlQueries.go b/sqlQueries.go
index e7eb06f..79b3847 100644
--- a/sqlQueries.go
+++ b/sqlQueries.go
@@ -67,7 +67,7 @@ func fetchRawData(db *sql.DB, cfg *Config, tim time.Time) (rDat []RawData, err e
 	for rows.Next() {
 		var r RawData
 		var tim []byte
-		err = rows.Scan(&r.IpSrc, &r.IpDst, &r.AsSrc, &r.AsDst, &r.PortSrc, &r.PortDst, &r.Packets, &r.PktLenDist, &tim)
+		err = rows.Scan(&r.Ip_src, &r.Ip_dst, &r.As_src, &r.As_dst, &r.Port_src, &r.Port_dst, &r.Packets, &r.Pkt_len_distrib, &tim)
 		if err != nil {
 			slogger.Println("Failed to scan result of query")
 			return
@@ -78,7 +78,7 @@ func fetchRawData(db *sql.DB, cfg *Config, tim time.Time) (rDat []RawData, err e
 			return
 		}
 
-		_, err = prepUp.Exec(time.Now(), r.IpSrc, r.IpDst, r.AsSrc, r.AsDst, r.PortSrc, r.PortDst, r.Packets, r.PktLenDist, r.time)
+		_, err = prepUp.Exec(time.Now(), r.Ip_src, r.Ip_dst, r.As_src, r.As_dst, r.Port_src, r.Port_dst, r.Packets, r.Pkt_len_distrib, tim)
 		if err != nil {
 			slogger.Println("Failed to query prepared update")
 			tx.Rollback()
@@ -121,7 +121,7 @@ func purgeRawData(tx *sql.Tx, cfg *Config, rDat []RawData) (err error) {
 	}
 
 	for _, r := range rDat {
-		_, err = prepStmt.Exec(r.IpSrc, r.IpDst, r.AsSrc, r.AsDst, r.PortSrc, r.PortDst, r.Packets, r.PktLenDist)
+		_, err = prepStmt.Exec(r.Ip_src, r.Ip_dst, r.As_src, r.As_dst, r.Port_src, r.Port_dst, r.Packets, r.Pkt_len_distrib)
 		if err != nil {
 			return
 		}