Merge branch 'stu-h/erspan-testing' of https://github.com/stu-h/zeek

* 'stu-h/erspan-testing' of https://github.com/stu-h/zeek:
  Added ERSPAN III testing

CHANGES

@@ -1,4 +1,8 @@
 
+2.6-98 | 2019-01-24 12:52:18 -0800
+
+  * Added ERSPAN III testing (Stu H)
+
 2.6-95 | 2019-01-23 09:49:35 -0800
 
   * GH-219: fix |x| operator int overflow / floating point type inconsistency

VERSION

@@ -1 +1 @@
-2.6-95
+2.6-98

testing/btest/Baseline/core.erspanIII/conn.log

@@ -0,0 +1,10 @@
+#separator \x09
+#set_separator	,
+#empty_field	(empty)
+#unset_field	-
+#path	conn
+#open	2019-01-24-13-51-56
+#fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	proto	service	duration	orig_bytes	resp_bytes	conn_state	local_orig	local_resp	missed_bytes	history	orig_pkts	orig_ip_bytes	resp_pkts	resp_ip_bytes	tunnel_parents
+#types	time	string	addr	port	addr	port	enum	string	interval	count	count	string	bool	bool	count	string	count	count	count	count	set[string]
+1547208014.232092	ClEkJM2Vm5giqnMf4h	192.168.15.47	8	1.1.1.1	0	icmp	-	0.004305	56	56	OTH	-	-	0	-	1	84	1	84	CHhAvVGS1DHFjwGM9
+#close	2019-01-24-13-51-56

testing/btest/Baseline/core.erspanIII/tunnel.log

@@ -0,0 +1,10 @@
+#separator \x09
+#set_separator	,
+#empty_field	(empty)
+#unset_field	-
+#path	tunnel
+#open	2019-01-24-13-51-56
+#fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	tunnel_type	action
+#types	time	string	addr	port	addr	port	enum	enum
+1547208014.232092	CHhAvVGS1DHFjwGM9	10.0.0.1	0	10.0.0.2	0	Tunnel::GRE	Tunnel::DISCOVER
+#close	2019-01-24-13-51-56

testing/btest/core/erspanIII.bro

@@ -0,0 +1,6 @@
+# @TEST-EXEC: bro -C -b -r $TRACES/erspanIII.pcap %INPUT
+# @TEST-EXEC: btest-diff tunnel.log
+# @TEST-EXEC: btest-diff conn.log
+
+@load base/frameworks/tunnels
+@load base/protocols/conn