mapping: allow lists to be mapped (#149)

Author: lspgn

cmd/goflow2/mapping.yaml

@@ -6,6 +6,10 @@ ipfix:
       destination: CustomInteger2
       # penprovided: false
       # pen: 0
+    - field: 137
+      destination: CustomList_1
+      penprovided: true
+      pen: 2636
 netflowv9:
   mapping:
     - field: 7

format/common/text.go

@@ -220,6 +220,17 @@ func FormatMessageReflectCustom(msg interface{}, ext, quotes, sep, sign string,
 				switch fieldValue.Kind() {
 				case reflect.String:
 					fstr[i] = fmt.Sprintf("%s%s%s%s%q", quotes, s, quotes, sign, fieldValue.Interface())
+				case reflect.Slice:
+					c := fieldValue.Len()
+					v := "["
+					for i := 0; i < c; i++ {
+						v += fmt.Sprintf("%v", fieldValue.Index(i).Interface())
+						if i < c-1 {
+							v += ","
+						}
+					}
+					v += "]"
+					fstr[i] = fmt.Sprintf("%s%s%s%s%s", quotes, s, quotes, sign, v)
 				default:
 					fstr[i] = fmt.Sprintf("%s%s%s%s%v", quotes, s, quotes, sign, fieldValue.Interface())
 				}

pb/flow.pb.go

@@ -126,4 +126,6 @@ message FlowMessage {
   bytes custom_bytes_4 = 1014;
   bytes custom_bytes_5 = 1015;
 
+  repeated uint32 custom_list_1 = 1021;
+
 }

pb/flow.proto

@@ -41,6 +41,14 @@ func GetBytes(d []byte, offset int, length int) []byte {
 	return chunk
 }
 
+func IsUInt(k reflect.Kind) bool {
+	return k == reflect.Uint8 || k == reflect.Uint16 || k == reflect.Uint32 || k == reflect.Uint64
+}
+
+func IsInt(k reflect.Kind) bool {
+	return k == reflect.Int8 || k == reflect.Int16 || k == reflect.Int32 || k == reflect.Int64
+}
+
 func MapCustomNetFlow(flowMessage *flowmessage.FlowMessage, df netflow.DataField, mapper *NetFlowMapper) {
 	if mapper == nil {
 		return
@@ -62,11 +70,27 @@ func MapCustom(flowMessage *flowmessage.FlowMessage, v []byte, destination strin
 		typeDest := fieldValue.Type()
 		fieldValueAddr := fieldValue.Addr()
 
-		if typeDest.Kind() == reflect.Slice && typeDest.Elem().Kind() == reflect.Uint8 {
-			fieldValue.SetBytes(v)
-		} else if fieldValueAddr.IsValid() && (typeDest.Kind() == reflect.Uint8 || typeDest.Kind() == reflect.Uint16 || typeDest.Kind() == reflect.Uint32 || typeDest.Kind() == reflect.Uint64) {
+		if typeDest.Kind() == reflect.Slice {
+
+			if typeDest.Elem().Kind() == reflect.Uint8 {
+				fieldValue.SetBytes(v)
+			} else {
+				item := reflect.New(typeDest.Elem())
+
+				if IsUInt(typeDest.Elem().Kind()) {
+					DecodeUNumber(v, item.Interface())
+				} else if IsUInt(typeDest.Elem().Kind()) {
+					DecodeUNumber(v, item.Interface())
+				}
+
+				itemi := reflect.Indirect(item)
+				tmpFieldValue := reflect.Append(fieldValue, itemi)
+				fieldValue.Set(tmpFieldValue)
+			}
+
+		} else if fieldValueAddr.IsValid() && IsUInt(typeDest.Kind()) {
 			DecodeUNumber(v, fieldValueAddr.Interface())
-		} else if fieldValueAddr.IsValid() && (typeDest.Kind() == reflect.Int8 || typeDest.Kind() == reflect.Int16 || typeDest.Kind() == reflect.Int32 || typeDest.Kind() == reflect.Int64) {
+		} else if fieldValueAddr.IsValid() && IsInt(typeDest.Kind()) {
 			DecodeNumber(v, fieldValueAddr.Interface())
 		}
 	}

producer/reflect.go

@@ -71,20 +71,20 @@ type Formatter interface {
 type DefaultLogTransport struct {
 }
 
-func (s *DefaultLogTransport) Publish(msgs []*flowmessage.FlowMessage) {
-	for _, msg := range msgs {
-		fmt.Printf("%v\n", FlowMessageToString(msg))
+	func (s *DefaultLogTransport) Publish(msgs []*flowmessage.FlowMessage) {
+		for _, msg := range msgs {
+			fmt.Printf("%v\n", FlowMessageToString(msg))
+		}
 	}
-}
 
 type DefaultJSONTransport struct {
 }
 
-func (s *DefaultJSONTransport) Publish(msgs []*flowmessage.FlowMessage) {
-	for _, msg := range msgs {
-		fmt.Printf("%v\n", FlowMessageToJSON(msg))
+	func (s *DefaultJSONTransport) Publish(msgs []*flowmessage.FlowMessage) {
+		for _, msg := range msgs {
+			fmt.Printf("%v\n", FlowMessageToJSON(msg))
+		}
 	}
-}
 */
 type DefaultErrorCallback struct {
 	Logger Logger