updated the processing to the new spec

1 files changed, 18 insertions, 18 deletions

diff --git a/datastructs.go b/datastructs.go
index a4ac45c..b970cec 100644
--- a/datastructs.go
+++ b/datastructs.go
@@ -8,34 +8,34 @@ import (
 type RawData struct {
 	ipSrc      string
 	ipDst      string
+	asSrc      int
+	asDst      int
+	portSrc    int
+	portDst    int
+	packets    int
+	pktLenDist string
 	time       time.Time
-	port       int
-	packetSize int
-}
-
-func (rd *RawData) getVolSize(conf Config) (string, error) {
-	for _, volume := range conf.Volumes {
-		if volume.Lower <= rd.packetSize &&
-			(rd.packetSize < volume.Upper || volume.Upper == 0) {
-			return volume.Size, nil
-		}
-	}
-	return "N/A", errors.New("Could not find a fitting size volume")
 }
 
 type CleanData struct {
 	ipbSrc     string
 	ipbDst     string
-	time       time.Time
-	port       int
-	volume     string
+	asSrc      int
+	asDst      int
+	portSrc    int
+	portDst    int
 	occurances int
+	volume     string
+	time       time.Time
 }
 
 func (cd *CleanData) equals(other *CleanData) bool {
 	return cd.ipbSrc == other.ipbSrc &&
 		cd.ipbDst == other.ipbDst &&
-		cd.time == other.time &&
-		cd.port == other.port &&
-		cd.volume == other.volume
+		cd.asSrc == other.asSrc &&
+		cd.asDst == othr.asDst &&
+		cd.portSrc == other.portSrc &&
+		cd.portDst == other.portDst &&
+		cd.volume == other.volume &&
+		cd.time == other.time
 }