New protocols

6over4/ipv6_over_ipv4.pcap.json

@@ -1,42 +1,11 @@
 {
-	"pcap": {
-		"name": "ipv6_over_ipv4.pcap",
+	"abstract": {
 		"md5sum": "5b512b3321164a73446bdd54f7d20057",
-		"description": "IPv6 over ipv4 tunnel, http request and response",
+		"type": "normal",
+		"description": "最内层是HTTP协议, 基于IPv6 over IPv4隧道, TCP双向流, 包含SYN包",
 		"layers": ["HTTP", "TCP", "IPV6", "IPV4", "ETHERNET"],
-		"Statistics": {
-			"ETHERNETE": {
-				"packet": 10,
-				"bytes": 1240
-			},
-			"IPV4": {
-				"packet": 10,
-				"bytes": 1240
-			},
-			"IPV6": {
-				"packet": 10,
-				"bytes": 1240
-			},
-			"TCP": {
-				"C2S": {
-					"packet": 5,
-					"bytes": 97
-				},
-				"S2C": {
-					"packet": 4,
-					"bytes": 179
-				}
-			},
-			"HTTP": {
-				"REQUEST": {
-					"Host": "www.msftncsi.com",
-					"Url": "www.msftncsi.com/ncsi.txt"
-				},
-				"RESPONSE": {
-					"Content-Length": 14,
-					"Content-Type": "text/plain"
-				}
-			}
+		"benchmark": {
+			"TCP": "{\"Proto\":\"TCP\",\"Stream_id\":0,\"Tuple4\":\"2001:da8:200:900e:200:5efe:d24d:58a3.52556>2600:140e:6::1702:1058.80\",\"C2S_pkt\":1,\"C2S_byte\":97,\"C2S_lost_byte\":0,\"C2S_payload\":\"4abdfc5bc27fd17ff6aaa83dea959a36\",\"S2C_pkt\":1,\"S2C_byte\":179,\"S2C_lost_byte\":0,\"S2C_payload\":\"80d168f5799e6f3ec783ab47b3aae0b7\",\"Total_pkt\":2,\"Total_byte\":276}"
 		}
 	}
 }

gre/gre_dns.pcap.json

@@ -1,33 +1,11 @@
 {
-	"pcap": {
-		"name": "gre_dns.pcap.json",
+	"abstract": {
 		"md5sum": "9242d1b85676308cee9b56e6a5fea3f4",
-		"description": "DNS over two gre layer",
-		"layers": ["DNS", "UDP", "GRE", "IPV4", "ETHERNET"],
-		"Statistics": {
-			"ETHERNETE": {
-				"packet": 1,
-				"bytes": 138
-			},
-			"IPV4": {
-				"packet": 1,
-				"bytes": 124
-			},
-			"UDP": {
-				"C2S": {
-					"packet": 1,
-					"bytes": 52
-				},
-				"S2C": {
-					"packet": 0,
-					"bytes": 0
-				}
-			},
-			"DNS": {
-				"Query": {
-					"Name": "www.desheng28.com"
-				}
-			}
+		"type": "normal",
+		"description": "最内层是DNS协议, 中间嵌套两层GRE隧道",
+		"layers": ["DNS", "GRE", "IPV4", "ETHERNET"],
+		"benchmark": {
+			"UDP": "{\"Proto\":\"UDP\",\"Stream_id\":0,\"Tuple4\":\"122.112.114.73.20755>115.238.253.235.53\",\"C2S_pkt\":1,\"C2S_byte\":44,\"C2S_lost_byte\":0,\"C2S_payload\":\"24ac8ec87827fc913b1fd1a20646bd94\",\"S2C_pkt\":0,\"S2C_byte\":0,\"S2C_lost_byte\":0,\"S2C_payload\":\"NULL\",\"Total_pkt\":1,\"Total_byte\":44}"
 		}
 	}
 }