VLAN: Update tests

Author: BonnyAD9

.gitignore

@@ -99,9 +99,16 @@ ipfixprobe_stats
 ipfixprobe-*.tar.gz
 
 # Test Outputs
-tests/*.log
-tests/*.trs
+tests/*/*.log
+tests/*/*.trs
 tests/output/
+tests/functional/output
+# Unit test binaries
+tests/unit/byte_utils
+tests/unit/flowifc
+tests/unit/options
+tests/unit/unirec
+tests/unit/utils
 
 # Mac Finder metafile
 **/.DS_Store

pcaps/vlan.pcap

@@ -17,7 +17,8 @@ TESTS=basic.sh \
 	bstats.sh \
 	phists.sh \
 	wg.sh \
-	ssadetector.sh
+	ssadetector.sh \
+	vlan.sh
 
 if WITH_QUIC
 TESTS+=\
@@ -46,6 +47,7 @@ EXTRA_DIST=common.sh \
 	wg.sh \
 	quic.sh \
 	ssadetector.sh \
+	vlan.sh \
 	reference/basic \
 	reference/basicplus \
 	reference/pstats \
@@ -66,7 +68,8 @@ EXTRA_DIST=common.sh \
 	reference/phists \
 	reference/wg \
 	reference/quic \
-	reference/ssadetector
+	reference/ssadetector \
+	reference/vlan
 
 clean-local:
 	rm -rf output

tests/functional/Makefile.am

@@ -0,0 +1,4 @@
+192.168.170.20,192.168.170.8,56,284,0,2000-01-01T07:47:50.501268,2000-01-01T07:47:51.333401,00:c0:9f:32:41:8c,00:e0:18:b1:0c:ad,1,1,53,32795,123,0,17,0,0
+192.168.170.20,192.168.170.8,56,284,0,2000-01-01T07:47:52.501268,2000-01-01T07:47:53.333401,00:c0:9f:32:41:8c,00:e0:18:b1:0c:ad,1,1,53,32795,0,0,17,0,0
+192.168.170.20,192.168.170.8,56,284,0,2000-01-01T07:47:52.501268,2000-01-01T07:47:53.333401,00:c0:9f:32:41:8c,00:e0:18:b1:0c:ad,1,1,53,32795,150,0,17,0,0
+ipaddr DST_IP,ipaddr SRC_IP,uint64 BYTES,uint64 BYTES_REV,uint64 LINK_BIT_FIELD,time TIME_FIRST,time TIME_LAST,macaddr DST_MAC,macaddr SRC_MAC,uint32 PACKETS,uint32 PACKETS_REV,uint16 DST_PORT,uint16 SRC_PORT,uint16 VLAN_ID,uint8 DIR_BIT_FIELD,uint8 PROTOCOL,uint8 TCP_FLAGS,uint8 TCP_FLAGS_REV

tests/functional/reference/vlan

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+test -z "$srcdir" && export srcdir=.
+
+. $srcdir/common.sh
+
+run_plugin_test vlan "$pcap_dir/vlan.pcap"