Bug #677 add IGMP Q-in-Q MPLS checksum IPv6 tests

appneta · Dec 26, 2021 · 4ba53da · 4ba53da
1 parent 2c76868
commit 4ba53da
Show file tree

Hide file tree

Showing 80 changed files with 85 additions and 10 deletions.
diff --git a/configure.ac b/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ([2.69])
 dnl Set version info here!
 AC_INIT([tcpreplay],[4.4.0-beta1],[https://github.com/appneta/tcpreplay/issues],[tcpreplay],[http://tcpreplay.sourceforge.net/])
 AC_CONFIG_SRCDIR([src/tcpreplay.c])
-AC_CONFIG_HEADERS([src/config.h])
+AM_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_AUX_DIR(config)
 AM_MAINTAINER_MODE([enable])
 AM_WITH_DMALLOC

diff --git a/src/tcpedit/plugins/ethernet.c b/src/tcpedit/plugins/ethernet.c
@@ -26,7 +26,7 @@
 /* 
  * Takes a ptr to an ethernet address and returns
  * 1 if it is unicast or 0 if it is multicast or
- * broadcast. As per RFC5342.
+ * broadcast. As per RFC7042.
  */
 int 
 is_unicast_ethernet(tcpeditdlt_t *ctx, const u_char *ether)

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -25,20 +25,22 @@ EXTRA_DIST = test.pcap test.auto_bridge test.auto_client test.auto_router \
 		test.rewrite_pnat test.rewrite_pad test.rewrite_trunc \
 		test.rewrite_mac test.rewrite_layer2 test.rewrite_config \
 		test.rewrite_skip test.rewrite_dltuser test.rewrite_dlthdlc \
-		test.rewrite_vlandel test.rewrite_efcs test.rewrite_1ttl \
+		test.rewrite_vlan802.1ad test.rewrite_vlandel test.rewrite_efcs test.rewrite_1ttl \
 		test.rewrite_2ttl test.rewrite_3ttl test.rewrite_enet_subsmac \
 		test.rewrite_mtutrunc test.rewrite_mac_seed test.rewrite_range_portmap \
-		test.rewrite_mac_seed_keep test.rewrite_l7fuzzing test.rewrite_sequence \
+		test.rewrite_mac_seed_keep test.rewrite_l7fuzzing test.rewrite_sequence test.rewrite_fixcsum \
+		test.rewrite_fixlen_pad test.rewrite_fixlen_trunc test.rewrite_fixlen_del \
 		test2.rewrite_seed test2.rewrite_portmap test2.rewrite_endpoint \
 		test2.rewrite_pnat test2.rewrite_pad test2.rewrite_trunc \
 		test2.rewrite_mac test2.rewrite_layer2 test2.rewrite_config \
 		test2.rewrite_skip test2.rewrite_dltuser test2.rewrite_dlthdlc \
-		test2.rewrite_vlandel test2.rewrite_efcs test2.rewrite_1ttl \
+		test2.rewrite_vlan802.1ad test2.rewrite_vlandel test2.rewrite_efcs test2.rewrite_1ttl \
 		test2.rewrite_mtutrunc test2.rewrite_enet_subsmac \
 		test2.rewrite_2ttl test2.rewrite_3ttl test.rewrite_tos test2.rewrite_tos \
 		test2.rewrite_enet_subsmac test2.rewrite_mac_seed \
 		test2.rewrite_range_portmap test2.rewrite_mac_seed_keep \
-		test2.rewrite_l7fuzzing test2.rewrite_sequence
+		test2.rewrite_l7fuzzing test2.rewrite_sequence test2.rewrite_fixcsum \
+		test2.rewrite_fixlen_pad test2.rewrite_fixlen_trunc test2.rewrite_fixlen_del
 
 test: all
 all: clearlog check tcpprep tcpreplay tcprewrite
@@ -106,13 +108,17 @@ standard_bigendian:
 		 --dlt=user --user-dlink=00,50,da,5d,46,55,0,7,eb,30,a4,c3,08,0
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_config --enet-vlan=add --enet-vlan-tag=45 \
 		--enet-vlan-cfi=1 --enet-vlan-pri=5
-	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_skip -b -s 55 \
+	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_skip \
+	    --skipbroadcast --skipl2broadcast --skip-soft-errors --seed 55 \
 		--enet-dmac=00:12:13:14:15:16,00:22:33:44:55:66 \
 		--enet-smac=00:22:33:44:55:66,00:12:13:14:15:16  -c $(srcdir)/test.auto_router
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_dltuser --dlt=user \
 		--user-dlink=0x0f,0x00,0x08,0x00 --user-dlt=104
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_dlthdlc --dlt=hdlc \
 		--hdlc-control=0 --hdlc-address=0x0F
+	$(TCPREWRITE) -i $(srcdir)/test.rewrite_config -o test.rewrite_vlan802.1ad \
+		--enet-vlan=add --enet-vlan-tag=42 --enet-vlan-cfi=1 \
+		--enet-vlan-pri=2 --enet-vlan-proto=802.1ad
 	$(TCPREWRITE) -i $(srcdir)/test.rewrite_config -o test.rewrite_vlandel \
 		--enet-vlan=del
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_efcs --efcs
@@ -122,6 +128,10 @@ standard_bigendian:
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_mtutrunc --mtu-trunc --mtu=300
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_l7fuzzing \
 		--fuzz-seed=42 --fuzz-factor=2
+	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_fixcsum --fixcsum
+	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_fixlen_pad --fixlen=pad
+	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_fixlen_trunc --fixlen=trunc
+	$(TCPREWRITE) -i $(TEST_PCAP) -o test.rewrite_fixlen_del --fixlen=del
 
 standard_littleendian:
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test2.rewrite_seed -s 55
@@ -155,6 +165,9 @@ standard_littleendian:
 		--user-dlink=0x0f,0x00,0x08,0x00 --user-dlt=104
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test2.rewrite_dlthdlc --dlt=hdlc \
 		--hdlc-control=0 --hdlc-address=0x0F
+	$(TCPREWRITE) -i $(srcdir)/test.rewrite_config -o test2.rewrite_vlan802.1ad \
+		--enet-vlan=add --enet-vlan-tag=42 --enet-vlan-cfi=1 \
+		--enet-vlan-pri=2 --enet-vlan-proto=802.1ad
 	$(TCPREWRITE) -i $(srcdir)/test.rewrite_config -o test2.rewrite_vlandel \
 		--enet-vlan=del
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test2.rewrite_efcs --efcs
@@ -164,6 +177,10 @@ standard_littleendian:
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test2.rewrite_mtutrunc --mtu-trunc --mtu=300
 	$(TCPREWRITE) -i $(TEST_PCAP) -o test2.rewrite_l7fuzzing \
 		--fuzz-seed=42 --fuzz-factor=2
+	$(TCPREWRITE) -i $(TEST_PCAP) -o test2.rewrite_fixcsum --fixcsum
+	$(TCPREWRITE) -i $(TEST_PCAP) -o test2.rewrite_fixlen_pad --fixlen=pad
+	$(TCPREWRITE) -i $(TEST_PCAP) -o test2.rewrite_fixlen_trunc --fixlen=trunc
+	$(TCPREWRITE) -i $(TEST_PCAP) -o test2.rewrite_fixlen_del --fixlen=del
 
 tcpprep: auto_router auto_bridge auto_client auto_server auto_first cidr regex \
 	port mac comment print_info print_comment prep_config \
@@ -173,9 +190,10 @@ tcpprep: auto_router auto_bridge auto_client auto_server auto_first cidr regex \
 tcprewrite: rewrite_portmap rewrite_range_portmap rewrite_endpoint \
 	rewrite_pnat rewrite_trunc rewrite_pad rewrite_seed rewrite_mac \
 	rewrite_layer2 rewrite_config rewrite_skip rewrite_dltuser rewrite_dlthdlc \
-	rewrite_vlandel rewrite_efcs rewrite_1ttl rewrite_2ttl rewrite_3ttl \
+	rewrite_vlan802.1ad rewrite_vlandel rewrite_efcs rewrite_1ttl rewrite_2ttl rewrite_3ttl \
 	rewrite_tos rewrite_mtutrunc rewrite_enet_subsmac rewrite_mac_seed \
-	rewrite_mac_seed_keep rewrite_l7fuzzing rewrite_sequence
+	rewrite_mac_seed_keep rewrite_l7fuzzing rewrite_sequence rewrite_fixcsum \
+	rewrite_fixlen_pad rewrite_fixlen_trunc rewrite_fixlen_del
 
 tcpreplay: replay_basic replay_cache replay_pps replay_rate replay_top \
 	replay_config replay_multi replay_pps_multi replay_precache \
@@ -543,6 +561,19 @@ else
 endif
 	if [ $? ] ; then $(PRINTF) "\t\t%s\n" "FAILED"; else $(PRINTF) "\t\t%s\n" "OK"; fi
 
+rewrite_vlan802.1ad:
+	$(PRINTF) "%s" "[tcprewrite] 802.1ad Q-in-Q add test: "
+	$(PRINTF) "%s\n" "*** [tcprewrite] 802.1ad Q-in-Q add test: " >> test.log
+	$(TCPREWRITE) $(ENABLE_DEBUG) -i $(srcdir)/test.rewrite_config -o test.$@1 \
+		--enet-vlan=add --enet-vlan-tag=42 --enet-vlan-cfi=1 \
+		--enet-vlan-pri=2 --enet-vlan-proto=802.1ad  >> test.log 2>&1
+if WORDS_BIGENDIAN
+	diff $(srcdir)/test.$@ test.$@1 >> test.log 2>&1
+else
+	diff $(srcdir)/test2.$@ test.$@1 >> test.log 2>&1
+endif
+	if [ $? ] ; then $(PRINTF) "\t\t\t%s\n" "FAILED"; else $(PRINTF) "\t\t%s\n" "OK"; fi
+
 rewrite_vlandel:
 	$(PRINTF) "%s" "[tcprewrite] VLAN Delete test: "
 	$(PRINTF) "%s\n" "*** [tcprewrite] VLAN Delete test: " >> test.log
@@ -632,6 +663,50 @@ else
 endif
 	if [ $? ] ; then $(PRINTF) "\t\t\t%s\n" "FAILED"; else $(PRINTF) "\t\t\t%s\n" "OK"; fi
 
+rewrite_fixcsum:
+	$(PRINTF) "%s" "[tcprewrite] Fix checksum test: "
+	$(PRINTF) "%s\n" "*** [tcprewrite] Fix checksum test: " >> test.log
+	$(TCPREWRITE) $(ENABLE_DEBUG) -i $(TEST_PCAP) -o test.$@1 --fixcsum >> test.log 2>&1
+if WORDS_BIGENDIAN
+	diff $(srcdir)/test.$@ test.$@1 >> test.log 2>&1
+else
+	diff $(srcdir)/test2.$@ test.$@1 >> test.log 2>&1
+endif
+	if [ $? ] ; then $(PRINTF) "\t\t\t%s\n" "FAILED"; else $(PRINTF) "\t\t%s\n" "OK"; fi
+
+rewrite_fixlen_pad:
+	$(PRINTF) "%s" "[tcprewrite] Fix length and pad test: "
+	$(PRINTF) "%s\n" "*** [tcprewrite] Fix length and pad test: " >> test.log
+	$(TCPREWRITE) $(ENABLE_DEBUG) -i $(TEST_PCAP) -o test.$@1 --fixlen=pad >> test.log 2>&1
+if WORDS_BIGENDIAN
+	diff $(srcdir)/test.$@ test.$@1 >> test.log 2>&1
+else
+	diff $(srcdir)/test2.$@ test.$@1 >> test.log 2>&1
+endif
+	if [ $? ] ; then $(PRINTF) "\t\t\t%s\n" "FAILED"; else $(PRINTF) "\t\t%s\n" "OK"; fi
+
+rewrite_fixlen_trunc:
+	$(PRINTF) "%s" "[tcprewrite] Fix length and truncate test: "
+	$(PRINTF) "%s\n" "*** [tcprewrite] Fix length and truncate test: " >> test.log
+	$(TCPREWRITE) $(ENABLE_DEBUG) -i $(TEST_PCAP) -o test.$@1 --fixlen=trunc >> test.log 2>&1
+if WORDS_BIGENDIAN
+	diff $(srcdir)/test.$@ test.$@1 >> test.log 2>&1
+else
+	diff $(srcdir)/test2.$@ test.$@1 >> test.log 2>&1
+endif
+	if [ $? ] ; then $(PRINTF) "\t\t\t%s\n" "FAILED"; else $(PRINTF) "\t%s\n" "OK"; fi
+
+rewrite_fixlen_del:
+	$(PRINTF) "%s" "[tcprewrite] Fix length and delete test: "
+	$(PRINTF) "%s\n" "*** [tcprewrite] Fix length and delete test: " >> test.log
+	$(TCPREWRITE) $(ENABLE_DEBUG) -i $(TEST_PCAP) -o test.$@1 --fixlen=del >> test.log 2>&1
+if WORDS_BIGENDIAN
+	diff $(srcdir)/test.$@ test.$@1 >> test.log 2>&1
+else
+	diff $(srcdir)/test2.$@ test.$@1 >> test.log 2>&1
+endif
+	if [ $? ] ; then $(PRINTF) "\t\t\t%s\n" "FAILED"; else $(PRINTF) "\t%s\n" "OK"; fi
+
 replay_pps:
 	$(PRINTF) "%s" "[tcpreplay] Packets/sec test: "
 	$(PRINTF) "%s\n" "*** [tcpreplay] Packets/sec test: " >> test.log
@@ -696,6 +771,6 @@ clean:
 	rm -f *1 test.log core* *~ primary.data secondary.data
 
 distclean: clean
-	rm -f Makefile config
+	rm -f Makefile Makefile.in config
 
 maintainer-clean: distclean
diff --git a/test/test.auto_bridge b/test/test.auto_bridge
diff --git a/test/test.auto_client b/test/test.auto_client
diff --git a/test/test.auto_first b/test/test.auto_first
diff --git a/test/test.auto_router b/test/test.auto_router
diff --git a/test/test.auto_server b/test/test.auto_server
diff --git a/test/test.cidr b/test/test.cidr
diff --git a/test/test.cidr_reverse b/test/test.cidr_reverse
diff --git a/test/test.comment b/test/test.comment
diff --git a/test/test.exclude_packets b/test/test.exclude_packets
diff --git a/test/test.include_dest b/test/test.include_dest
diff --git a/test/test.include_packets b/test/test.include_packets
diff --git a/test/test.include_source b/test/test.include_source
diff --git a/test/test.mac b/test/test.mac
diff --git a/test/test.mac_reverse b/test/test.mac_reverse
diff --git a/test/test.pcap b/test/test.pcap
diff --git a/test/test.port b/test/test.port
diff --git a/test/test.prep_config b/test/test.prep_config
diff --git a/test/test.regex b/test/test.regex
diff --git a/test/test.regex_reverse b/test/test.regex_reverse
diff --git a/test/test.rewrite_1ttl b/test/test.rewrite_1ttl
diff --git a/test/test.rewrite_2ttl b/test/test.rewrite_2ttl
diff --git a/test/test.rewrite_3ttl b/test/test.rewrite_3ttl
diff --git a/test/test.rewrite_config b/test/test.rewrite_config
diff --git a/test/test.rewrite_dlthdlc b/test/test.rewrite_dlthdlc
diff --git a/test/test.rewrite_dltuser b/test/test.rewrite_dltuser
diff --git a/test/test.rewrite_efcs b/test/test.rewrite_efcs
diff --git a/test/test.rewrite_endpoint b/test/test.rewrite_endpoint
diff --git a/test/test.rewrite_enet_subsmac b/test/test.rewrite_enet_subsmac
diff --git a/test/test.rewrite_fixcsum b/test/test.rewrite_fixcsum
diff --git a/test/test.rewrite_fixlen_del b/test/test.rewrite_fixlen_del
diff --git a/test/test.rewrite_fixlen_pad b/test/test.rewrite_fixlen_pad
diff --git a/test/test.rewrite_fixlen_trunc b/test/test.rewrite_fixlen_trunc
diff --git a/test/test.rewrite_l7fuzzing b/test/test.rewrite_l7fuzzing
diff --git a/test/test.rewrite_layer2 b/test/test.rewrite_layer2
diff --git a/test/test.rewrite_mac b/test/test.rewrite_mac
diff --git a/test/test.rewrite_mac_seed b/test/test.rewrite_mac_seed
diff --git a/test/test.rewrite_mac_seed_keep b/test/test.rewrite_mac_seed_keep
diff --git a/test/test.rewrite_mtutrunc b/test/test.rewrite_mtutrunc
diff --git a/test/test.rewrite_pad b/test/test.rewrite_pad
diff --git a/test/test.rewrite_pnat b/test/test.rewrite_pnat
diff --git a/test/test.rewrite_portmap b/test/test.rewrite_portmap
diff --git a/test/test.rewrite_range_portmap b/test/test.rewrite_range_portmap
diff --git a/test/test.rewrite_seed b/test/test.rewrite_seed
diff --git a/test/test.rewrite_sequence b/test/test.rewrite_sequence
diff --git a/test/test.rewrite_skip b/test/test.rewrite_skip
diff --git a/test/test.rewrite_tos b/test/test.rewrite_tos
diff --git a/test/test.rewrite_trunc b/test/test.rewrite_trunc
diff --git a/test/test.rewrite_vlan802.1ad b/test/test.rewrite_vlan802.1ad
diff --git a/test/test.rewrite_vlandel b/test/test.rewrite_vlandel
diff --git a/test/test2.rewrite_1ttl b/test/test2.rewrite_1ttl
diff --git a/test/test2.rewrite_2ttl b/test/test2.rewrite_2ttl
diff --git a/test/test2.rewrite_3ttl b/test/test2.rewrite_3ttl
diff --git a/test/test2.rewrite_config b/test/test2.rewrite_config
diff --git a/test/test2.rewrite_dlthdlc b/test/test2.rewrite_dlthdlc
diff --git a/test/test2.rewrite_dltuser b/test/test2.rewrite_dltuser
diff --git a/test/test2.rewrite_efcs b/test/test2.rewrite_efcs
diff --git a/test/test2.rewrite_endpoint b/test/test2.rewrite_endpoint
diff --git a/test/test2.rewrite_enet_subsmac b/test/test2.rewrite_enet_subsmac
diff --git a/test/test2.rewrite_fixcsum b/test/test2.rewrite_fixcsum
diff --git a/test/test2.rewrite_fixlen_del b/test/test2.rewrite_fixlen_del
diff --git a/test/test2.rewrite_fixlen_pad b/test/test2.rewrite_fixlen_pad
diff --git a/test/test2.rewrite_fixlen_trunc b/test/test2.rewrite_fixlen_trunc
diff --git a/test/test2.rewrite_l7fuzzing b/test/test2.rewrite_l7fuzzing
diff --git a/test/test2.rewrite_layer2 b/test/test2.rewrite_layer2
diff --git a/test/test2.rewrite_mac b/test/test2.rewrite_mac
diff --git a/test/test2.rewrite_mac_seed b/test/test2.rewrite_mac_seed
diff --git a/test/test2.rewrite_mac_seed_keep b/test/test2.rewrite_mac_seed_keep
diff --git a/test/test2.rewrite_mtutrunc b/test/test2.rewrite_mtutrunc
diff --git a/test/test2.rewrite_pad b/test/test2.rewrite_pad
diff --git a/test/test2.rewrite_pnat b/test/test2.rewrite_pnat
diff --git a/test/test2.rewrite_portmap b/test/test2.rewrite_portmap
diff --git a/test/test2.rewrite_range_portmap b/test/test2.rewrite_range_portmap
diff --git a/test/test2.rewrite_seed b/test/test2.rewrite_seed
diff --git a/test/test2.rewrite_sequence b/test/test2.rewrite_sequence
diff --git a/test/test2.rewrite_skip b/test/test2.rewrite_skip
diff --git a/test/test2.rewrite_tos b/test/test2.rewrite_tos
diff --git a/test/test2.rewrite_trunc b/test/test2.rewrite_trunc