updates to test cases, "length" added.

diff --git a/tests/.cvsignore b/tests/.cvsignore
index 4adefb78245188ee1789efe5b995bcd154b15b42..f097c8a945c716d35fb61e0751b2a54201e807fd 100644 (file)
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -1,3 +1,5 @@
+*.new
+*.pcap
 02-sunrise-sunset-esp.pcap
 08-sunrise-sunset-aes.pcap
 08-sunrise-sunset-esp.pcap

diff --git a/tests/bgp_vpn_attrset.out b/tests/bgp_vpn_attrset.out
index c826e7662c89a7c61b560d904bc60ddbf2f300cb..ac91a0f8b0073d1b02a314a9be6e7fb87b68145a 100644 (file)
--- a/tests/bgp_vpn_attrset.out
+++ b/tests/bgp_vpn_attrset.out
@@ -1,4 +1,4 @@
-IP (tos 0xc0, ttl  62, id 58628, offset 0, flags [none], proto 6, length: 173) 12.4.4.4.2051 > 12.1.1.1.179: P [tcp sum ok] 3293077573:3293077694(121) ack 3348108582 win 16384 <nop,nop,timestamp 383131 890299>: BGP, length: 121
+IP (tos 0xc0, ttl  62, id 58628, offset 0, flags [none], proto: TCP (6), length: 173) 12.4.4.4.2051 > 12.1.1.1.179: P, cksum 0xcf18 (correct), 3293077573:3293077694(121) ack 3348108582 win 16384 <nop,nop,timestamp 383131 890299>: BGP, length: 121
        Update Message (2), length: 121
          Origin (1), length: 1, Flags [T]: IGP
          AS Path (2), length: 0, Flags [T]: empty

diff --git a/tests/eapon1.out b/tests/eapon1.out
index 7f6eb19747f405cd480fe6eec57831fd5c3c60be..ea957673c9bebcddb9131675db8a2990b2d9bc9c 100644 (file)
--- a/tests/eapon1.out
+++ b/tests/eapon1.out
@@ -1,114 +1,114 @@
-10:17:28.958610 IP 192.168.1.249.netbios-dgm > 192.168.1.255.netbios-dgm: NBT UDP PACKET(138)
-10:17:28.958708 IP 192.168.1.249.netbios-dgm > 192.168.1.255.netbios-dgm: NBT UDP PACKET(138)
-10:17:28.959360 IP 192.168.1.249.netbios-dgm > 192.168.1.255.netbios-dgm: NBT UDP PACKET(138)
-10:17:28.961018 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:17:29.710899 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:17:30.461235 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:17:30.798408 IP 192.168.1.249.netbios-dgm > 192.168.1.255.netbios-dgm: NBT UDP PACKET(138)
-10:17:33.464213 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:17:34.214302 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:17:34.964688 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:17:35.473290 arp who-has 192.168.1.1 tell 192.168.1.249
-10:17:35.481559 arp reply 192.168.1.1 is-at 00:0d:88:4f:25:91
-10:17:35.481577 IP 192.168.1.249.bootpc > 192.168.1.1.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
-10:17:35.622870 EAP code=1 id=0 length=5 
-10:17:35.666378 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
-10:17:35.851486 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
-10:17:36.156548 EAP code=1 id=1 length=0 
-10:17:36.158698 EAP code=1 id=0 length=5 
-10:17:37.766046 EAP code=1 id=0 length=45 
-10:17:37.790625 EAP code=1 id=0 length=20 
-10:17:37.830669 EAP code=1 id=0 length=76 
-10:17:37.848577 EAP code=1 id=0 length=80 
-10:17:38.661939 EAP code=1 id=0 length=28 
-10:17:38.685352 EAP code=1 id=0 length=4 
-10:17:38.686358 EAP code=1 id=3 length=57 
-10:17:38.687182 EAP code=1 id=3 length=44 
-10:17:39.852392 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
-10:17:46.852719 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
-10:18:02.852731 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
-10:18:08.689384 EAP code=1 id=1 length=0 
-10:18:08.696826 EAP code=1 id=0 length=5 
-10:18:08.713116 EAP code=1 id=0 length=45 
-10:18:08.787664 EAP code=1 id=0 length=20 
-10:18:10.344628 EAP code=1 id=0 length=76 
-10:18:10.473292 EAP code=1 id=0 length=80 
-10:18:11.152435 EAP code=1 id=0 length=28 
-10:18:11.251425 EAP code=1 id=0 length=4 
-10:18:11.252509 EAP code=1 id=3 length=57 
-10:18:11.253336 EAP code=1 id=3 length=44 
-10:18:35.856823 arp who-has 169.254.67.194 tell 169.254.67.194
-10:18:35.885105 arp who-has 169.254.67.194 tell 169.254.67.194
-10:18:36.885304 arp who-has 169.254.67.194 tell 169.254.67.194
-10:18:37.907817 IP 169.254.67.194.4299 > 239.255.255.250.1900: UDP, length 133
-10:18:37.910524 IP 169.254.67.194 > IGMP.MCAST.NET: igmp v3 report, 1 group record(s)
-10:18:37.964030 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:38.691974 IP 169.254.67.194 > IGMP.MCAST.NET: igmp v3 report, 1 group record(s)
-10:18:38.714004 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:39.464435 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:39.898479 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
-10:18:40.214836 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:40.909196 IP 169.254.67.194.4299 > 239.255.255.250.1900: UDP, length 133
-10:18:40.965632 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:41.254259 EAP code=1 id=1 length=0 
-10:18:41.256353 EAP code=1 id=0 length=5 
-10:18:41.275901 EAP code=1 id=0 length=45 
-10:18:41.388857 EAP code=1 id=0 length=20 
-10:18:41.715620 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:42.466013 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:42.963175 EAP code=1 id=0 length=76 
-10:18:42.987906 EAP code=1 id=0 length=80 
-10:18:43.216408 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:43.675053 EAP code=1 id=0 length=28 
-10:18:43.695554 EAP code=1 id=0 length=4 
-10:18:43.696547 EAP code=1 id=3 length=57 
-10:18:43.697368 EAP code=1 id=3 length=44 
-10:18:43.899684 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
-10:18:43.909719 IP 169.254.67.194.4299 > 239.255.255.250.1900: UDP, length 133
-10:18:43.967353 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:43.967896 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:44.717196 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:44.718161 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:45.467593 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:45.468557 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:46.217980 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:46.218950 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:46.969929 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:18:46.970205 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:18:48.470207 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:18:49.970986 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:18:51.471768 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:18:52.900388 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
-10:18:52.972547 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:18:53.972751 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:18:54.972939 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:18:55.973129 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:18:56.973475 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:57.723686 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:58.474079 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:59.224473 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:18:59.974983 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:19:00.725263 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:19:01.475654 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:19:02.226046 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
-10:19:02.976511 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:19:02.976737 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:19:02.977520 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:19:02.979092 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:19:03.728840 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:19:04.479238 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:19:07.482218 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:19:08.232205 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:19:08.982597 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
-10:19:09.900631 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
-10:19:13.696821 EAP code=1 id=1 length=0 
-10:19:13.704581 EAP code=1 id=0 length=5 
-10:19:13.718221 EAP code=1 id=0 length=45 
-10:19:13.734974 EAP code=1 id=0 length=20 
-10:19:14.801245 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
-10:19:15.293800 EAP code=1 id=0 length=76 
-10:19:15.312531 EAP code=1 id=0 length=80 
-10:19:15.997763 EAP code=1 id=0 length=28 
-10:19:16.022323 EAP code=1 id=0 length=4 
-10:19:16.023335 EAP code=1 id=3 length=57 
-10:19:16.024149 EAP code=1 id=3 length=44 
+11:17:28.958610 IP 192.168.1.249.netbios-dgm > 192.168.1.255.netbios-dgm: NBT UDP PACKET(138)
+11:17:28.958708 IP 192.168.1.249.netbios-dgm > 192.168.1.255.netbios-dgm: NBT UDP PACKET(138)
+11:17:28.959360 IP 192.168.1.249.netbios-dgm > 192.168.1.255.netbios-dgm: NBT UDP PACKET(138)
+11:17:28.961018 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:17:29.710899 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:17:30.461235 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:17:30.798408 IP 192.168.1.249.netbios-dgm > 192.168.1.255.netbios-dgm: NBT UDP PACKET(138)
+11:17:33.464213 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:17:34.214302 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:17:34.964688 IP 192.168.1.249.netbios-ns > 192.168.1.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:17:35.473290 arp who-has 192.168.1.1 tell 192.168.1.249
+11:17:35.481559 arp reply 192.168.1.1 is-at 00:0d:88:4f:25:91
+11:17:35.481577 IP 192.168.1.249.bootpc > 192.168.1.1.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
+11:17:35.622870 EAP code=1 id=0 length=5 
+11:17:35.666378 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
+11:17:35.851486 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
+11:17:36.156548 EAP code=1 id=1 length=0 
+11:17:36.158698 EAP code=1 id=0 length=5 
+11:17:37.766046 EAP code=1 id=0 length=45 
+11:17:37.790625 EAP code=1 id=0 length=20 
+11:17:37.830669 EAP code=1 id=0 length=76 
+11:17:37.848577 EAP code=1 id=0 length=80 
+11:17:38.661939 EAP code=1 id=0 length=28 
+11:17:38.685352 EAP code=1 id=0 length=4 
+11:17:38.686358 EAP code=1 id=3 length=57 
+11:17:38.687182 EAP code=1 id=3 length=44 
+11:17:39.852392 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
+11:17:46.852719 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
+11:18:02.852731 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
+11:18:08.689384 EAP code=1 id=1 length=0 
+11:18:08.696826 EAP code=1 id=0 length=5 
+11:18:08.713116 EAP code=1 id=0 length=45 
+11:18:08.787664 EAP code=1 id=0 length=20 
+11:18:10.344628 EAP code=1 id=0 length=76 
+11:18:10.473292 EAP code=1 id=0 length=80 
+11:18:11.152435 EAP code=1 id=0 length=28 
+11:18:11.251425 EAP code=1 id=0 length=4 
+11:18:11.252509 EAP code=1 id=3 length=57 
+11:18:11.253336 EAP code=1 id=3 length=44 
+11:18:35.856823 arp who-has 169.254.67.194 tell 169.254.67.194
+11:18:35.885105 arp who-has 169.254.67.194 tell 169.254.67.194
+11:18:36.885304 arp who-has 169.254.67.194 tell 169.254.67.194
+11:18:37.907817 IP 169.254.67.194.4299 > 239.255.255.250.1900: UDP, length 133
+11:18:37.910524 IP 169.254.67.194 > IGMP.MCAST.NET: igmp v3 report, 1 group record(s)
+11:18:37.964030 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:38.691974 IP 169.254.67.194 > IGMP.MCAST.NET: igmp v3 report, 1 group record(s)
+11:18:38.714004 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:39.464435 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:39.898479 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
+11:18:40.214836 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:40.909196 IP 169.254.67.194.4299 > 239.255.255.250.1900: UDP, length 133
+11:18:40.965632 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:41.254259 EAP code=1 id=1 length=0 
+11:18:41.256353 EAP code=1 id=0 length=5 
+11:18:41.275901 EAP code=1 id=0 length=45 
+11:18:41.388857 EAP code=1 id=0 length=20 
+11:18:41.715620 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:42.466013 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:42.963175 EAP code=1 id=0 length=76 
+11:18:42.987906 EAP code=1 id=0 length=80 
+11:18:43.216408 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:43.675053 EAP code=1 id=0 length=28 
+11:18:43.695554 EAP code=1 id=0 length=4 
+11:18:43.696547 EAP code=1 id=3 length=57 
+11:18:43.697368 EAP code=1 id=3 length=44 
+11:18:43.899684 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
+11:18:43.909719 IP 169.254.67.194.4299 > 239.255.255.250.1900: UDP, length 133
+11:18:43.967353 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:43.967896 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:44.717196 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:44.718161 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:45.467593 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:45.468557 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:46.217980 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:46.218950 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:46.969929 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:18:46.970205 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:18:48.470207 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:18:49.970986 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:18:51.471768 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:18:52.900388 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
+11:18:52.972547 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:18:53.972751 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:18:54.972939 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:18:55.973129 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:18:56.973475 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:57.723686 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:58.474079 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:59.224473 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:18:59.974983 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:19:00.725263 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:19:01.475654 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:19:02.226046 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): REGISTRATION; REQUEST; BROADCAST
+11:19:02.976511 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:19:02.976737 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:19:02.977520 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:19:02.979092 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:19:03.728840 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:19:04.479238 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:19:07.482218 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:19:08.232205 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:19:08.982597 IP 169.254.67.194.netbios-ns > 169.254.255.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST
+11:19:09.900631 IP 0.0.0.0.bootpc > 255.255.255.255.bootps: BOOTP/DHCP, Request from 00:04:23:57:a5:7a, length: 300
+11:19:13.696821 EAP code=1 id=1 length=0 
+11:19:13.704581 EAP code=1 id=0 length=5 
+11:19:13.718221 EAP code=1 id=0 length=45 
+11:19:13.734974 EAP code=1 id=0 length=20 
+11:19:14.801245 IP 169.254.67.194.netbios-dgm > 169.254.255.255.netbios-dgm: NBT UDP PACKET(138)
+11:19:15.293800 EAP code=1 id=0 length=76 
+11:19:15.312531 EAP code=1 id=0 length=80 
+11:19:15.997763 EAP code=1 id=0 length=28 
+11:19:16.022323 EAP code=1 id=0 length=4 
+11:19:16.023335 EAP code=1 id=3 length=57 
+11:19:16.024149 EAP code=1 id=3 length=44 

diff --git a/tests/esp0.out b/tests/esp0.out
index 2e235160177cee69f07ec194d7f57db2b3736895..a0ddf1b2dc71304f4dae522bf74087334e1dbab0 100644 (file)
--- a/tests/esp0.out
+++ b/tests/esp0.out
@@ -1,8 +1,8 @@
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1), length 116
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2), length 116
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3), length 116
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4), length 116
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5), length 116
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6), length 116
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7), length 116
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8), length 116

diff --git a/tests/esp1.out b/tests/esp1.out
index dbfeb29e221e01b1160fea4f8f250c92156a0806..6039c3e1b291d1f8b0f75f52613e9b32fcfdf952 100644 (file)
--- a/tests/esp1.out
+++ b/tests/esp1.out
@@ -1,8 +1,8 @@
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1280 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1536 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1792 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2048 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2304 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2560 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2816 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 3072 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 1280, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 1536, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 1792, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2048, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2304, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2560, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2816, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 3072, length 64 (ipip-proto-4)

diff --git a/tests/esp1.sh b/tests/esp1.sh
index 791f22771e036f958afc1622b7b9972dbd2670e0..87ee3b92df1e599de117849e6734e25df1f5bba0 100644 (file)
--- a/tests/esp1.sh
+++ b/tests/esp1.sh
@@ -3,7 +3,8 @@
 uudecode 02-sunrise-sunset-esp.puu
 
 echo -n test esp1...
-if (../tcpdump -t -n -E "[email protected] 3des-cbc-hmac96:0x4043434545464649494a4a4c4c4f4f515152525454575758" -r 02-sunrise-sunset-esp.pcap | diff - esp1.out)
+../tcpdump -t -n -E "[email protected] 3des-cbc-hmac96:0x4043434545464649494a4a4c4c4f4f515152525454575758" -r 02-sunrise-sunset-esp.pcap >esp1.new
+if diff esp1.new esp1.out
 then
        echo passed.
 else

diff --git a/tests/esp2.out b/tests/esp2.out
index 229b162f928ca1da740c21fb601a5f0bbbbb427f..190932ba089d59a88f87f947bd07f483ae869d81 100644 (file)
--- a/tests/esp2.out
+++ b/tests/esp2.out
@@ -1,8 +1,8 @@
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x1): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1280 (ipip-proto-4) (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x2): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1536 (ipip-proto-4) (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x3): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1792 (ipip-proto-4) (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x4): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2048 (ipip-proto-4) (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x5): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2304 (ipip-proto-4) (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x6): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2560 (ipip-proto-4) (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x7): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2816 (ipip-proto-4) (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x8): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 3072 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1), length 172: IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x1), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 1280, length 64 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2), length 172: IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x2), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 1536, length 64 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3), length 172: IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x3), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 1792, length 64 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4), length 172: IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x4), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2048, length 64 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5), length 172: IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x5), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2304, length 64 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6), length 172: IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x6), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2560, length 64 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7), length 172: IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x7), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2816, length 64 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8), length 172: IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x8), length 116: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 3072, length 64 (ipip-proto-4) (ipip-proto-4)

diff --git a/tests/esp2.sh b/tests/esp2.sh
index fa85b5b4459423ad2ef43c5957cfa823e1b8bcba..18a70833e05f22816ce17d0e2353eb21d7c1da3d 100644 (file)
--- a/tests/esp2.sh
+++ b/tests/esp2.sh
@@ -3,7 +3,8 @@
 uudecode 08-sunrise-sunset-esp2.puu
 
 echo -n test esp2...
-if (../tcpdump -t -n -E "[email protected] 3des-cbc-hmac96:0x43434545464649494a4a4c4c4f4f51515252545457575840,[email protected] 3des-cbc-hmac96:0x434545464649494a4a4c4c4f4f5151525254545757584043" -r 08-sunrise-sunset-esp2.pcap | diff - esp2.out)
+../tcpdump -t -n -E "[email protected] 3des-cbc-hmac96:0x43434545464649494a4a4c4c4f4f51515252545457575840,[email protected] 3des-cbc-hmac96:0x434545464649494a4a4c4c4f4f5151525254545757584043" -r 08-sunrise-sunset-esp2.pcap >esp2.new
+if diff esp2.new esp2.out
 then
        echo passed.
 else

diff --git a/tests/esp3.sh b/tests/esp3.sh
index ffb303fce069102d7d653dc3f79a3fd6c79dcd02..122beab97ede80addfbdf0442a8da5b1978f9b32 100644 (file)
--- a/tests/esp3.sh
+++ b/tests/esp3.sh
@@ -2,7 +2,8 @@
 
 uudecode 02-sunrise-sunset-esp.puu
 echo -n test esp3...
-if ( ../tcpdump -t -n -E "3des-cbc-hmac96:0x4043434545464649494a4a4c4c4f4f515152525454575758" -r 02-sunrise-sunset-esp.pcap | diff - esp1.out)
+ ../tcpdump -t -n -E "3des-cbc-hmac96:0x4043434545464649494a4a4c4c4f4f515152525454575758" -r 02-sunrise-sunset-esp.pcap >esp3.new
+if diff esp3.new esp1.out
 then
        echo passed.
 else

diff --git a/tests/esp4.sh b/tests/esp4.sh
index f3a911769e3ab05b122c84756283ab4d5a866243..bba26e722a86eb52bb220096d2006b63d8c818de 100644 (file)
--- a/tests/esp4.sh
+++ b/tests/esp4.sh
@@ -2,8 +2,9 @@
 
 uudecode 08-sunrise-sunset-esp2.puu
 
-echo -n test esp2...
-if (../tcpdump -t -n -E "file esp-secrets.txt" -r 08-sunrise-sunset-esp2.pcap | diff - esp2.out)
+echo -n test esp4...
+../tcpdump -t -n -E "file esp-secrets.txt" -r 08-sunrise-sunset-esp2.pcap >esp4.new
+if diff esp4.new esp2.out
 then
        echo passed.
 else

diff --git a/tests/esp5.out b/tests/esp5.out
index 2ae60e566ebe76183273da6d24e6d7abb4e904cb..4614041042fd34257beb083d1eb64229fd23bb61 100644 (file)
--- a/tests/esp5.out
+++ b/tests/esp5.out
@@ -1,8 +1,8 @@
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x1): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1280 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x2): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1536 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x3): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1792 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x4): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2048 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x5): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2304 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x6): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2560 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x7): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2816 (ipip-proto-4)
-IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x8): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 3072 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x1), length 132: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 1280, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x2), length 132: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 1536, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x3), length 132: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 1792, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x4), length 132: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2048, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x5), length 132: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2304, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x6), length 132: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2560, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x7), length 132: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 2816, length 64 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0xd1234567,seq=0x8), length 132: IP 192.0.2.1 > 192.0.1.1: ICMP echo request seq 3072, length 64 (ipip-proto-4)

diff --git a/tests/esp5.sh b/tests/esp5.sh
index 008646a44dc199478cc49b109491aae2b2b9d2aa..405b677bf36e3302cdbfbe8964c987beefc5731b 100644 (file)
--- a/tests/esp5.sh
+++ b/tests/esp5.sh
@@ -3,7 +3,8 @@
 uudecode 08-sunrise-sunset-aes.puu
 
 echo -n test esp5...
-if (../tcpdump -t -n -E "file esp-secrets.txt" -r 08-sunrise-sunset-aes.pcap | diff - esp5.out)
+../tcpdump -t -n -E "file esp-secrets.txt" -r 08-sunrise-sunset-aes.pcap > esp5.new
+if diff esp5.new esp5.out
 then
        echo passed.
 else

diff --git a/tests/isakmp3.out b/tests/isakmp3.out
index fdc2f00c52600ecb55b980f518b9983a50ca4dd4..6b37b77af8ec4e61ad6759f43cd96ca90ff1e27d 100644 (file)
--- a/tests/isakmp3.out
+++ b/tests/isakmp3.out
@@ -1,2 +1,2 @@
-IP (tos 0x0, ttl 255, id 41068, offset 0, flags [none], proto 17, length: 312) 127.0.0.1.501 > 127.0.0.1.500: isakmp 1.0 msgid : phase 1 I ident:
+IP (tos 0x0, ttl 255, id 41068, offset 0, flags [none], proto: UDP (17), length: 312) 127.0.0.1.501 > 127.0.0.1.500: isakmp 1.0 msgid : phase 1 I ident:
     (id: idtype=FQDN protoid=0 port=0 len=248 \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000)

diff --git a/tests/isakmp3.sh b/tests/isakmp3.sh
index f97d5eb96ede9af5c8e8afb32c29989624bf3da6..e6003cc31fc8dd89dd2c2ad4921a3afb00929f55 100644 (file)
--- a/tests/isakmp3.sh
+++ b/tests/isakmp3.sh
@@ -3,7 +3,8 @@
 uudecode isakmp-identification-segfault.puu
 
 echo -n test isakmp3...
-if (../tcpdump -t -v -n -r isakmp-identification-segfault.pcap | diff - isakmp3.out)
+../tcpdump -t -v -n -r isakmp-identification-segfault.pcap > isakmp3.new
+if diff isakmp3.new isakmp3.out
 then
        echo passed.
 else

diff --git a/tests/lmp.sh b/tests/lmp.sh
index 07944094f57d3960956553fc59006752091a2e85..991904480e832ec6b4319d4cdc622d0c62a592bd 100755 (executable)
--- a/tests/lmp.sh
+++ b/tests/lmp.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
 
+uudecode lmp.puu
+
 echo -n test lmp ...
-if (../tcpdump -t -n -v -r lmp.pcap | diff - lmp.out)
+../tcpdump -t -n -v -r lmp.pcap >lmp.new
+if diff lmp.new lmp.out
 then
        echo passed.
 else

diff --git a/tests/mpls-ldp-hello.out b/tests/mpls-ldp-hello.out
index 6888f87fc60be30b96e0b9bb2ab1dec42c56891d..cac9fb36e1990c6746348fb7b8da7e39e201a070 100644 (file)
--- a/tests/mpls-ldp-hello.out
+++ b/tests/mpls-ldp-hello.out
@@ -1,4 +1,4 @@
-IP (tos 0xc0, ttl   1, id 15579, offset 0, flags [none], proto 17, length: 70) 10.1.1.3.646 > 224.0.0.2.646: 
+IP (tos 0xc0, ttl   1, id 15579, offset 0, flags [none], proto: UDP (17), length: 70) 10.1.1.3.646 > 224.0.0.2.646: 
        LDP, Label-Space-ID: 10.1.0.2:0, length: 42
          Hello Message (0x0100), length: 28, Message ID: 0x00011970, Flags: [ignore if unknown]
            Common Hello Parameters TLV (0x0400), length: 4, Flags: [ignore and don't forward if unknown]

diff --git a/tests/mpls-ldp-hello.sh b/tests/mpls-ldp-hello.sh
index d8c01a7645a9e719d9d867d02039771d8c21c145..b1a5b1941705dcfe345eab24f60db20cd789d0a8 100755 (executable)
--- a/tests/mpls-ldp-hello.sh
+++ b/tests/mpls-ldp-hello.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
 
+uudecode mpls-ldp-hello.puu
+
 echo -n test mpls-ldp-hello ...
-if (../tcpdump -t -n -v -r mpls-ldp-hello.pcap | diff - mpls-ldp-hello.out)
+../tcpdump -t -n -v -r mpls-ldp-hello.pcap >mpls-ldp-hello.new
+if diff mpls-ldp-hello.new mpls-ldp-hello.out
 then
        echo passed.
 else

diff --git a/tests/ospf-gmpls.out b/tests/ospf-gmpls.out
index 104ea9698e144362d8ff991a16dd62edcf4c19ce..b440e20e3a83c5105f5f210d353c6affd8782c44 100644 (file)
--- a/tests/ospf-gmpls.out
+++ b/tests/ospf-gmpls.out
@@ -1,4 +1,4 @@
-IP (tos 0xc0, ttl   1, id 4052, offset 0, flags [none], proto 89, length: 172) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update (4), length: 152
+IP (tos 0xc0, ttl   1, id 4052, offset 0, flags [none], proto: OSPF (89), length: 172) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update, length: 152
        Router-ID: 10.255.245.35, Backbone Area, Authentication Type: none (0), 1 LSA
          LSA #1
          Advertising Router: 10.255.245.37, seq 0x80000002, age 9s, length: 104
@@ -22,7 +22,7 @@ IP (tos 0xc0, ttl   1, id 4052, offset 0, flags [none], proto 89, length: 172) 4
                priority level 6: 622.080 Mbps
                priority level 7: 622.080 Mbps
              Administrative Group subTLV (9), length: 4, 0x00000000
-IP (tos 0xc0, ttl   1, id 4106, offset 0, flags [none], proto 89, length: 172) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update (4), length: 152
+IP (tos 0xc0, ttl   1, id 4106, offset 0, flags [none], proto: OSPF (89), length: 172) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update, length: 152
        Router-ID: 10.255.245.35, Backbone Area, Authentication Type: none (0), 1 LSA
          LSA #1
          Advertising Router: 10.255.245.37, seq 0x80000002, age 9s, length: 104
@@ -46,7 +46,7 @@ IP (tos 0xc0, ttl   1, id 4106, offset 0, flags [none], proto 89, length: 172) 4
                priority level 6: 622.080 Mbps
                priority level 7: 622.080 Mbps
              Administrative Group subTLV (9), length: 4, 0x00000000
-IP (tos 0xc0, ttl   1, id 4160, offset 0, flags [none], proto 89, length: 212) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update (4), length: 192
+IP (tos 0xc0, ttl   1, id 4160, offset 0, flags [none], proto: OSPF (89), length: 212) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update, length: 192
        Router-ID: 10.255.245.35, Backbone Area, Authentication Type: none (0), 1 LSA
          LSA #1
          Advertising Router: 10.255.245.35, seq 0x80000003, age 3s, length: 144

diff --git a/tests/ospf-gmpls.sh b/tests/ospf-gmpls.sh
index bc938dfd89d927d7b3cc8495ba89319d51e22a05..da2dd3ba17587b6b94a159a811f27a727dc3a424 100755 (executable)
--- a/tests/ospf-gmpls.sh
+++ b/tests/ospf-gmpls.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
 
+uudecode ospf-gmpls.puu 
+
 echo -n test ospf-gmpls...
-if (../tcpdump -t -n -v -r ospf-gmpls.pcap | diff - ospf-gmpls.out)
+../tcpdump -t -n -v -r ospf-gmpls.pcap > ospf-gmpls.new
+if diff ospf-gmpls.new ospf-gmpls.out
 then
        echo passed.
 else