add third parameter domainID/srcID to key in template cache for IPFix/v9

Author: rachelScout

ipfix/decoder.go

@@ -201,12 +201,12 @@ func (d *Decoder) decodeSet(mem MemCache, msg *Message) error {
 				mem.insert(tr.TemplateID, d.raddr, tr, msg.Header.DomainID)
 			}
 		} else if setID >= 4 && setID <= 255 {
-        		    // Reserved set, do not read any records
-        			break
-        } else if setID == 0 {
-        			// Invalid set
-        			return fmt.Errorf("failed to decodeSet / invalid setID")
-        } else {
+			// Reserved set, do not read any records
+			break
+		} else if setID == 0 {
+			// Invalid set
+			return fmt.Errorf("failed to decodeSet / invalid setID")
+		} else {
 			// Data set
 			var data []DecodedField
 			if data, err = d.decodeData(tr); err == nil {

ipfix/memcache_test.go

@@ -86,25 +86,24 @@ func TestMemCache_keyWithDifferentDomainIDs(t *testing.T) {
 	tpl.TemplateID = 310
 	tpl.FieldCount = 19
 	mCache.insert(tpl.TemplateID, ip, tpl, 513)
-
-    tpl.FieldCount = 21
+	tpl.FieldCount = 21
 	mCache.insert(tpl.TemplateID, ip, tpl, 514)
 
 	v, ok := mCache.retrieve(tpl.TemplateID, ip, 513)
 
-    if !ok {
-    	t.Error("expected mCache retrieve status true, got", ok)
-    }
-    if v.FieldCount != 19 {
-    	t.Error("expected template id#:310 with Field count#:19, got", v.TemplateID, v.FieldCount)
-    }
+	if !ok {
+	    t.Error("expected mCache retrieve status true, got", ok)
+	}
+	if v.FieldCount != 19 {
+	    t.Error("expected template id#:310 with Field count#:19, got", v.TemplateID, v.FieldCount)
+	}
 
 	v, ok = mCache.retrieve(tpl.TemplateID, ip, 514)
 
-    if !ok {
-        t.Error("expected mCache retrieve status true, got", ok)
-    }
-    if v.FieldCount != 21 {
-        t.Error("expected template id#:310 with Field count#:21, got", v.TemplateID, v.FieldCount)
-    }
+	if !ok {
+	    t.Error("expected mCache retrieve status true, got", ok)
+	}
+	if v.FieldCount != 21 {
+	    t.Error("expected template id#:310 with Field count#:21, got", v.TemplateID, v.FieldCount)
+	}
 }