Merge pull request #714 from mercimat/pcap_support_in_fast_generator

aregm · web-flow · commit d72773194e39 · 2020-08-20T12:22:55.000-05:00
Pcap support in fast generator
diff --git a/examples/nffPktgen/generator/generator.go b/examples/nffPktgen/generator/generator.go
@@ -7,6 +7,7 @@ package generator
 import (
 	"fmt"
 	"math/rand"
+	"os"
 	"unsafe"
 
 	"github.com/intel-go/nff-go/packet"
@@ -229,6 +230,77 @@ func generateICMPIPv4(pkt *packet.Packet, config *PacketConfig, rnd *rand.Rand)
 	pktICMP.Cksum = packet.SwapBytesUint16(packet.CalculateIPv4ICMPChecksum(pktIP, pktICMP, pkt.Data))
 }
 
+func generatePcap(pkt *packet.Packet, config *PacketConfig, _ *rand.Rand) {
+	if pkt == nil {
+		panic("Failed to create new packet")
+	}
+	pcapConfig := &config.Pcap
+	if pcapConfig.FileReader == nil {
+		f, err := os.Open(pcapConfig.Path)
+		if err != nil {
+			panic(fmt.Sprintf("Failed to open pcap file %s", pcapConfig.Path))
+		}
+		pcapConfig.FileReader = f
+		var glHdr packet.PcapGlobHdr
+		if err := packet.ReadPcapGlobalHdr(f, &glHdr); err != nil {
+			f.Close()
+			panic(fmt.Sprintf("Failed to read pcap file header, returned %v", err))
+		}
+	}
+	isEOF, err := pkt.ReadPcapOnePacket(pcapConfig.FileReader)
+	if err != nil {
+		panic("Failed to read one packet from pcap")
+	}
+	if isEOF {
+		if _, err := pcapConfig.FileReader.Seek(packet.PcapGlobHdrSize, 0); err != nil {
+			panic("Failed to parse pcap file header")
+		}
+		if _, err := pkt.ReadPcapOnePacket(pcapConfig.FileReader); err != nil {
+			panic("Failed to read one packet from pcap")
+		}
+	}
+}
+
+func generatePcapInMemory(pkt *packet.Packet, config *PacketConfig, _ *rand.Rand) {
+	if pkt == nil {
+		panic("Failed to create new packet")
+	}
+	pcapConfig := &config.Pcap
+	if !pcapConfig.ReachedEOF {
+		if pcapConfig.FileReader == nil {
+			f, err := os.Open(pcapConfig.Path)
+			if err != nil {
+				panic(fmt.Sprintf("Failed to open pcap file %s", pcapConfig.Path))
+			}
+			pcapConfig.FileReader = f
+			var glHdr packet.PcapGlobHdr
+			if err := packet.ReadPcapGlobalHdr(f, &glHdr); err != nil {
+				f.Close()
+				panic(fmt.Sprintf("Failed to read pcap file header, returned %v", err))
+			}
+		}
+		isEOF, err := pkt.ReadPcapOnePacket(pcapConfig.FileReader)
+		if err != nil {
+			panic("Failed to read one packet from pcap")
+		}
+		if isEOF {
+			pcapConfig.FileReader.Close()
+			pcapConfig.ReachedEOF = true
+		} else {
+			data := pkt.GetRawPacketBytes()
+			pcapConfig.Packets = append(pcapConfig.Packets, data)
+		}
+	}
+	if pcapConfig.ReachedEOF {
+		bytes := pcapConfig.Packets[pcapConfig.NextPacket]
+		pcapConfig.NextPacket = (pcapConfig.NextPacket + 1) % len(pcapConfig.Packets)
+		ok := packet.GeneratePacketFromByte(pkt, bytes)
+		if !ok {
+			panic("Failed to generate packet from byte")
+		}
+	}
+}
+
 func FillTCPHdr(pkt *packet.Packet, l4 *TCPConfig, rnd *rand.Rand) {
 	emptyPacketTCP := (*packet.TCPHdr)(pkt.L4)
 	emptyPacketTCP.SrcPort = packet.SwapBytesUint16(uint16(l4.SPort.Current))
diff --git a/examples/nffPktgen/generator/parseConfig.go b/examples/nffPktgen/generator/parseConfig.go
@@ -18,6 +18,7 @@ import (
 )
 
 var mixPattern = regexp.MustCompile(`^mix[0-9]*$`)
+var pcapPattern = regexp.MustCompile(`^.*\.pcap$`)
 
 type AddrRange struct {
 	Min     uint64
@@ -57,12 +58,14 @@ const (
 	RANDDATA
 	RAWDATA
 	NONE
+	PCAP
 )
 
 // PacketConfig configures packet
 type PacketConfig struct {
 	DType DataType
 	Ether EtherConfig
+	Pcap  PcapConfig
 }
 
 // MixConfig contains PacketConfigs with quantity.
@@ -75,6 +78,16 @@ func (mc *MixConfig) String() string {
 	return fmt.Sprintf("config: %v; quantity: %v\n", mc.Config, mc.Quantity)
 }
 
+// PcapCOnfig configures pcap file
+type PcapConfig struct {
+	Path       string
+	FileReader *os.File
+	InMemory   bool
+	ReachedEOF bool
+	Packets    [][]byte
+	NextPacket int
+}
+
 // EtherConfig configures ether header.
 type EtherConfig struct {
 	DAddr AddrRange
@@ -201,6 +214,14 @@ func ParseConfig(in map[string]interface{}) (config GeneratorConfig, err error)
 			}
 			pktConfig := PacketConfig{Ether: ethHdr, DType: ETHERHDR}
 			return append(config, MixConfig{Config: pktConfig, Quantity: 1}), nil
+		case key == "pcap":
+			pcapConfig := v.(map[string]interface{})
+			pcap, err := parsePcap(pcapConfig)
+			if err != nil {
+				return nil, fmt.Errorf("parsePcap returned: %v", err)
+			}
+			pktConfig := PacketConfig{Pcap: pcap, DType: PCAP}
+			return append(config, MixConfig{Config: pktConfig, Quantity: 1}), nil
 		case mixPattern.MatchString(key):
 			return ParseGeneratorConfig(in)
 		default:
@@ -230,6 +251,13 @@ func ParseGeneratorConfig(in map[string]interface{}) (config GeneratorConfig, er
 						return nil, fmt.Errorf("parseEtherHdr returned: %v", err)
 					}
 					pktConfig = PacketConfig{Ether: ethHdr, DType: ETHERHDR}
+				case "pcap":
+					pcapConfig := vv.(map[string]interface{})
+					pcap, err := parsePcap(pcapConfig)
+					if err != nil {
+						return nil, fmt.Errorf("parsePcap returned: %v", err)
+					}
+					pktConfig = PacketConfig{Pcap: pcap, DType: PCAP}
 				case "quantity", "q":
 					q = uint32(vv.(float64))
 				default:
@@ -845,3 +873,27 @@ func parsePortRange(in map[string]interface{}) (AddrRange, error) {
 	}
 	return portRng, nil
 }
+
+func parsePcap(in map[string]interface{}) (PcapConfig, error) {
+	pcap := PcapConfig{}
+	for k, v := range in {
+		switch strings.ToLower(k) {
+		case "path":
+			path, ok := v.(string)
+			if !ok {
+				return PcapConfig{}, fmt.Errorf("parsePcapConfig for path returned: not a string")
+			}
+			if !pcapPattern.MatchString(path) {
+				return PcapConfig{}, fmt.Errorf("parsePcapConfig for path returned: invalid pcap file")
+			}
+			pcap.Path = path
+		case "inmemory":
+			inmemory, ok := v.(bool)
+			if !ok {
+				return PcapConfig{}, fmt.Errorf("parsePcapConfig for inmemory returned: not a bool")
+			}
+			pcap.InMemory = inmemory
+		}
+	}
+	return pcap, nil
+}
diff --git a/examples/nffPktgen/generator/utility.go b/examples/nffPktgen/generator/utility.go
@@ -84,6 +84,12 @@ func getGenerator(configuration PacketConfig) (func(*packet.Packet, *PacketConfi
 		default:
 			return nil, fmt.Errorf("unknown packet l3 configuration")
 		}
+	case PCAP:
+		pcap := configuration.Pcap
+		if pcap.InMemory {
+			return generatePcapInMemory, nil
+		}
+		return generatePcap, nil
 	default:
 		return nil, fmt.Errorf("unknown packet l2 configuration")
 	}
diff --git a/examples/nffPktgen/testing/mix.json b/examples/nffPktgen/testing/mix.json
@@ -103,5 +103,19 @@
                         }
                     },
             "quantity": 6
+        },
+        "mix4": {
+            "pcap": {
+                "path": "./test.pcap",
+                "inmemory": false
+            },
+            "quantity": 1
+        },
+        "mix5": {
+            "pcap": {
+                "path": "./test.pcap",
+                "inmemory": true
+            },
+            "quantity": 1
         }
 }
diff --git a/examples/nffPktgen/testing/pcap.json b/examples/nffPktgen/testing/pcap.json
@@ -0,0 +1,6 @@
+{
+    "pcap": {
+        "path": "./test.pcap",
+        "inmemory": false
+    }
+}
diff --git a/examples/nffPktgen/testing/run.sh b/examples/nffPktgen/testing/run.sh
@@ -16,3 +16,4 @@
 ./sendGetBack -number 100 -outConfig "'arpVlan.pcap':'arpVlan.json'"
 ./sendGetBack -number 100 -outConfig "'config.pcap': 'config.json'"
 ./sendGetBack -number 100 -outConfig "'mix.pcap': 'mix.json'"
+./sendGetBack -number 100 -outConfig "'pcap.pcap': 'pcap.json'"
diff --git a/examples/nffPktgen/testing/test.pcap b/examples/nffPktgen/testing/test.pcap

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,12 @@ func getGenerator(configuration PacketConfig) (func(packet.Packet, PacketConfi`
`84`	`84`	`default:`
`85`	`85`	`return nil, fmt.Errorf("unknown packet l3 configuration")`
`86`	`86`	`}`
	`87`	`+ case PCAP:`
	`88`	`+ pcap := configuration.Pcap`
	`89`	`+ if pcap.InMemory {`
	`90`	`+ return generatePcapInMemory, nil`
	`91`	`+ }`
	`92`	`+ return generatePcap, nil`
`87`	`93`	`default:`
`88`	`94`	`return nil, fmt.Errorf("unknown packet l2 configuration")`
`89`	`95`	`}`