From: Denis Ovsienko Date: Sat, 26 Oct 2013 07:23:10 +0000 (+0400) Subject: fix flags printing tests X-Git-Tag: tcpdump-4.5.0~10 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/c9569fd10ac8b0a9abde3bfd908db98625d11592 fix flags printing tests The test cases included the timestamp (due to missing -t) and failed unless run in the same timezone as produced. The failures printed by print-flags.sh did not make it into the final report because the script always returned 0. Strip the timestamps and replace print-flags.sh with some contents in TESTLIST. --- diff --git a/tests/TESTLIST b/tests/TESTLIST index f0ab002e..8892b841 100644 --- a/tests/TESTLIST +++ b/tests/TESTLIST @@ -1,3 +1,21 @@ +# Various flags applied to a TCP session. +# +# We cannot rely on, for example, "print-x.out" and +# "print-X.out" being different files - we might be running +# this on a case-insensitive file system, e.g. a Windows +# file system or a case-insensitive HFS+ file system on +# Mac OS X. +# +# Therefore, for "X" and "XX", we have "print-capX.out" +# and "print-capXX.out". +# +print-x print-flags.pcap print-x.out -t -x +print-xx print-flags.pcap print-xx.out -t -xx +print-X print-flags.pcap print-capX.out -t -X +print-XX print-flags.pcap print-capXX.out -t -XX +print-A print-flags.pcap print-A.out -t -A +print-AA print-flags.pcap print-AA.out -t -AA + # BGP tests bgp_vpn_attrset bgp_vpn_attrset.pcap bgp_vpn_attrset.out -t -v mpbgp-linklocal-nexthop mpbgp-linklocal-nexthop.pcap mpbgp-linklocal-nexthop.out -t -v diff --git a/tests/print-A.out b/tests/print-A.out index 742a41d4..9daff5a2 100644 --- a/tests/print-A.out +++ b/tests/print-A.out @@ -1,13 +1,13 @@ -22:57:35.938066 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 E..<.h@.@.!R.........p.P7X.~.........!....@.... M........... -22:57:35.938122 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 E..<..@.@.<..........P.p7z..7X......n.....@.... M...M....... -22:57:35.938167 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 E..4.j@.@.!X.........p.P7X..7z.... .7...... M...M... -22:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 E....l@.@. ..........p.P7X..7z.... ........ M...M...GET / HTTP/1.1 Host: localhost @@ -18,10 +18,10 @@ Accept-Language: en Connection: Keep-Alive -22:57:35.940474 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 E..4..@.@............P.p7z..7X.I.. .7...... M...M... -22:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 E.....@.@..%.........P.p7z..7X.I.. ........ M...M...HTTP/1.1 200 OK Date: Wed, 06 Jul 2005 03:57:35 GMT @@ -179,15 +179,15 @@ a Debian system!

-22:57:35.941260 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 E..4.n@.@.!T.........p.P7X.I7z....0_....... M...M... -22:57:37.229575 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 E..4.p@.@.!R.........p.P7X.I7z....0_....... M..!M... -22:57:37.230839 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 E..4..@.@............P.p7z..7X.J.. ..5..... M..#M..! -22:57:37.230900 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 E..4.r@.@.!P.........p.P7X.J7z....0_....... M..#M..# diff --git a/tests/print-AA.out b/tests/print-AA.out index 13440504..a1bc485e 100644 --- a/tests/print-AA.out +++ b/tests/print-AA.out @@ -1,13 +1,13 @@ -22:57:35.938066 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 ..............E..<.h@.@.!R.........p.P7X.~.........!....@.... M........... -22:57:35.938122 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 ..............E..<..@.@.<..........P.p7z..7X......n.....@.... M...M....... -22:57:35.938167 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 ..............E..4.j@.@.!X.........p.P7X..7z.... .7...... M...M... -22:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 ..............E....l@.@. ..........p.P7X..7z.... ........ M...M...GET / HTTP/1.1 Host: localhost @@ -18,10 +18,10 @@ Accept-Language: en Connection: Keep-Alive -22:57:35.940474 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 ..............E..4..@.@............P.p7z..7X.I.. .7...... M...M... -22:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 ..............E.....@.@..%.........P.p7z..7X.I.. ........ M...M...HTTP/1.1 200 OK Date: Wed, 06 Jul 2005 03:57:35 GMT @@ -179,15 +179,15 @@ a Debian system!

-22:57:35.941260 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 ..............E..4.n@.@.!T.........p.P7X.I7z....0_....... M...M... -22:57:37.229575 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 ..............E..4.p@.@.!R.........p.P7X.I7z....0_....... M..!M... -22:57:37.230839 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 ..............E..4..@.@............P.p7z..7X.J.. ..5..... M..#M..! -22:57:37.230900 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 ..............E..4.r@.@.!P.........p.P7X.J7z....0_....... M..#M..# diff --git a/tests/print-capX.out b/tests/print-capX.out index f95a9e96..22b90904 100644 --- a/tests/print-capX.out +++ b/tests/print-capX.out @@ -1,19 +1,19 @@ -22:57:35.938066 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 0x0000: 4500 003c 1b68 4000 4006 2152 7f00 0001 E..<.h@.@.!R.... 0x0010: 7f00 0001 da70 0050 3758 897e 0000 0000 .....p.P7X.~.... 0x0020: a002 7fff 1421 0000 0204 400c 0402 080a .....!....@..... 0x0030: 4ddc 9216 0000 0000 0103 0302 M........... -22:57:35.938122 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 0x0000: 4500 003c 0000 4000 4006 3cba 7f00 0001 E..<..@.@.<..... 0x0010: 7f00 0001 0050 da70 377a 8df1 3758 897f .....P.p7z..7X.. 0x0020: a012 7fff 6eb1 0000 0204 400c 0402 080a ....n.....@..... 0x0030: 4ddc 9216 4ddc 9216 0103 0302 M...M....... -22:57:35.938167 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 0x0000: 4500 0034 1b6a 4000 4006 2158 7f00 0001 E..4.j@.@.!X.... 0x0010: 7f00 0001 da70 0050 3758 897f 377a 8df2 .....p.P7X..7z.. 0x0020: 8010 2000 37d0 0000 0101 080a 4ddc 9216 ....7.......M... 0x0030: 4ddc 9216 M... -22:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 0x0000: 4500 00fe 1b6c 4000 4006 208c 7f00 0001 E....l@.@....... 0x0010: 7f00 0001 da70 0050 3758 897f 377a 8df2 .....p.P7X..7z.. 0x0020: 8018 2000 fef2 0000 0101 080a 4ddc 9217 ............M... @@ -30,12 +30,12 @@ 0x00d0: 6363 6570 742d 4c61 6e67 7561 6765 3a20 ccept-Language:. 0x00e0: 656e 0d0a 436f 6e6e 6563 7469 6f6e 3a20 en..Connection:. 0x00f0: 4b65 6570 2d41 6c69 7665 0d0a 0d0a Keep-Alive.... -22:57:35.940474 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 0x0000: 4500 0034 1fe4 4000 4006 1cde 7f00 0001 E..4..@.@....... 0x0010: 7f00 0001 0050 da70 377a 8df2 3758 8a49 .....P.p7z..7X.I 0x0020: 8010 2000 3703 0000 0101 080a 4ddc 9218 ....7.......M... 0x0030: 4ddc 9217 M... -22:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 0x0000: 4500 15eb 1fe6 4000 4006 0725 7f00 0001 E.....@.@..%.... 0x0010: 7f00 0001 0050 da70 377a 8df2 3758 8a49 .....P.p7z..7X.I 0x0020: 8018 2000 13e0 0000 0101 080a 4ddc 9219 ............M... @@ -387,22 +387,22 @@ 0x15c0: 342f 3036 2f32 3020 3135 3a33 333a 3537 4/06/20.15:33:57 0x15d0: 2024 2e0a 2020 2d2d 3e0a 0a3c 2f42 4f44 .$....-->.... -22:57:35.941260 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 0x0000: 4500 0034 1b6e 4000 4006 2154 7f00 0001 E..4.n@.@.!T.... 0x0010: 7f00 0001 da70 0050 3758 8a49 377a a3a9 .....p.P7X.I7z.. 0x0020: 8010 305f 10ea 0000 0101 080a 4ddc 9219 ..0_........M... 0x0030: 4ddc 9219 M... -22:57:37.229575 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 0x0000: 4500 0034 1b70 4000 4006 2152 7f00 0001 E..4.p@.@.!R.... 0x0010: 7f00 0001 da70 0050 3758 8a49 377a a3a9 .....p.P7X.I7z.. 0x0020: 8011 305f 0be1 0000 0101 080a 4ddc 9721 ..0_........M..! 0x0030: 4ddc 9219 M... -22:57:37.230839 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 0x0000: 4500 0034 1fe8 4000 4006 1cda 7f00 0001 E..4..@.@....... 0x0010: 7f00 0001 0050 da70 377a a3a9 3758 8a4a .....P.p7z..7X.J 0x0020: 8011 2000 1735 0000 0101 080a 4ddc 9723 .....5......M..# 0x0030: 4ddc 9721 M..! -22:57:37.230900 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 0x0000: 4500 0034 1b72 4000 4006 2150 7f00 0001 E..4.r@.@.!P.... 0x0010: 7f00 0001 da70 0050 3758 8a4a 377a a3aa .....p.P7X.J7z.. 0x0020: 8010 305f 06d4 0000 0101 080a 4ddc 9723 ..0_........M..# diff --git a/tests/print-capXX.out b/tests/print-capXX.out index 5062a85a..524030c3 100644 --- a/tests/print-capXX.out +++ b/tests/print-capXX.out @@ -1,22 +1,22 @@ -22:57:35.938066 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E. 0x0010: 003c 1b68 4000 4006 2152 7f00 0001 7f00 .<.h@.@.!R...... 0x0020: 0001 da70 0050 3758 897e 0000 0000 a002 ...p.P7X.~...... 0x0030: 7fff 1421 0000 0204 400c 0402 080a 4ddc ...!....@.....M. 0x0040: 9216 0000 0000 0103 0302 .......... -22:57:35.938122 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E. 0x0010: 003c 0000 4000 4006 3cba 7f00 0001 7f00 .<..@.@.<....... 0x0020: 0001 0050 da70 377a 8df1 3758 897f a012 ...P.p7z..7X.... 0x0030: 7fff 6eb1 0000 0204 400c 0402 080a 4ddc ..n.....@.....M. 0x0040: 9216 4ddc 9216 0103 0302 ..M....... -22:57:35.938167 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E. 0x0010: 0034 1b6a 4000 4006 2158 7f00 0001 7f00 .4.j@.@.!X...... 0x0020: 0001 da70 0050 3758 897f 377a 8df2 8010 ...p.P7X..7z.... 0x0030: 2000 37d0 0000 0101 080a 4ddc 9216 4ddc ..7.......M...M. 0x0040: 9216 .. -22:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E. 0x0010: 00fe 1b6c 4000 4006 208c 7f00 0001 7f00 ...l@.@......... 0x0020: 0001 da70 0050 3758 897f 377a 8df2 8018 ...p.P7X..7z.... @@ -34,13 +34,13 @@ 0x00e0: 6570 742d 4c61 6e67 7561 6765 3a20 656e ept-Language:.en 0x00f0: 0d0a 436f 6e6e 6563 7469 6f6e 3a20 4b65 ..Connection:.Ke 0x0100: 6570 2d41 6c69 7665 0d0a 0d0a ep-Alive.... -22:57:35.940474 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E. 0x0010: 0034 1fe4 4000 4006 1cde 7f00 0001 7f00 .4..@.@......... 0x0020: 0001 0050 da70 377a 8df2 3758 8a49 8010 ...P.p7z..7X.I.. 0x0030: 2000 3703 0000 0101 080a 4ddc 9218 4ddc ..7.......M...M. 0x0040: 9217 .. -22:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E. 0x0010: 15eb 1fe6 4000 4006 0725 7f00 0001 7f00 ....@.@..%...... 0x0020: 0001 0050 da70 377a 8df2 3758 8a49 8018 ...P.p7z..7X.I.. @@ -393,25 +393,25 @@ 0x15d0: 3036 2f32 3020 3135 3a33 333a 3537 2024 06/20.15:33:57.$ 0x15e0: 2e0a 2020 2d2d 3e0a 0a3c 2f42 4f44 593e ....-->.. 0x15f0: 0a3c 2f48 544d 4c3e 0a .. -22:57:35.941260 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E. 0x0010: 0034 1b6e 4000 4006 2154 7f00 0001 7f00 .4.n@.@.!T...... 0x0020: 0001 da70 0050 3758 8a49 377a a3a9 8010 ...p.P7X.I7z.... 0x0030: 305f 10ea 0000 0101 080a 4ddc 9219 4ddc 0_........M...M. 0x0040: 9219 .. -22:57:37.229575 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E. 0x0010: 0034 1b70 4000 4006 2152 7f00 0001 7f00 .4.p@.@.!R...... 0x0020: 0001 da70 0050 3758 8a49 377a a3a9 8011 ...p.P7X.I7z.... 0x0030: 305f 0be1 0000 0101 080a 4ddc 9721 4ddc 0_........M..!M. 0x0040: 9219 .. -22:57:37.230839 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E. 0x0010: 0034 1fe8 4000 4006 1cda 7f00 0001 7f00 .4..@.@......... 0x0020: 0001 0050 da70 377a a3a9 3758 8a4a 8011 ...P.p7z..7X.J.. 0x0030: 2000 1735 0000 0101 080a 4ddc 9723 4ddc ...5......M..#M. 0x0040: 9721 .! -22:57:37.230900 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E. 0x0010: 0034 1b72 4000 4006 2150 7f00 0001 7f00 .4.r@.@.!P...... 0x0020: 0001 da70 0050 3758 8a4a 377a a3aa 8010 ...p.P7X.J7z.... diff --git a/tests/print-flags.sh b/tests/print-flags.sh deleted file mode 100755 index cc1eb1a5..00000000 --- a/tests/print-flags.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -for i in x xx X XX A AA; do - # - # We cannot rely on, for example, "print-x.out" and - # "print-X.out" being different files - we might be running - # this on a case-insensitive file system, e.g. a Windows - # file system or a case-insensitive HFS+ file system on - # Mac OS X. - # - # Therefore, for "X" and "XX", we have "print-capX.out" - # and "print-capXX.out". - # - if test $i = X - then - printname=capX - elif test $i = XX - then - printname=capXX - else - printname=$i - fi - if (../tcpdump -$i -s0 -nr print-flags.pcap | tee NEW/print-$printname.new | diff - print-$printname.out >DIFF/print-$printname.out.diff ) - then - echo print-$i passed. - else - echo print-$i failed. - fi -done diff --git a/tests/print-x.out b/tests/print-x.out index 77942230..34e0544b 100644 --- a/tests/print-x.out +++ b/tests/print-x.out @@ -1,19 +1,19 @@ -22:57:35.938066 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 0x0000: 4500 003c 1b68 4000 4006 2152 7f00 0001 0x0010: 7f00 0001 da70 0050 3758 897e 0000 0000 0x0020: a002 7fff 1421 0000 0204 400c 0402 080a 0x0030: 4ddc 9216 0000 0000 0103 0302 -22:57:35.938122 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 0x0000: 4500 003c 0000 4000 4006 3cba 7f00 0001 0x0010: 7f00 0001 0050 da70 377a 8df1 3758 897f 0x0020: a012 7fff 6eb1 0000 0204 400c 0402 080a 0x0030: 4ddc 9216 4ddc 9216 0103 0302 -22:57:35.938167 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 0x0000: 4500 0034 1b6a 4000 4006 2158 7f00 0001 0x0010: 7f00 0001 da70 0050 3758 897f 377a 8df2 0x0020: 8010 2000 37d0 0000 0101 080a 4ddc 9216 0x0030: 4ddc 9216 -22:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 0x0000: 4500 00fe 1b6c 4000 4006 208c 7f00 0001 0x0010: 7f00 0001 da70 0050 3758 897f 377a 8df2 0x0020: 8018 2000 fef2 0000 0101 080a 4ddc 9217 @@ -30,12 +30,12 @@ 0x00d0: 6363 6570 742d 4c61 6e67 7561 6765 3a20 0x00e0: 656e 0d0a 436f 6e6e 6563 7469 6f6e 3a20 0x00f0: 4b65 6570 2d41 6c69 7665 0d0a 0d0a -22:57:35.940474 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 0x0000: 4500 0034 1fe4 4000 4006 1cde 7f00 0001 0x0010: 7f00 0001 0050 da70 377a 8df2 3758 8a49 0x0020: 8010 2000 3703 0000 0101 080a 4ddc 9218 0x0030: 4ddc 9217 -22:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 0x0000: 4500 15eb 1fe6 4000 4006 0725 7f00 0001 0x0010: 7f00 0001 0050 da70 377a 8df2 3758 8a49 0x0020: 8018 2000 13e0 0000 0101 080a 4ddc 9219 @@ -387,22 +387,22 @@ 0x15c0: 342f 3036 2f32 3020 3135 3a33 333a 3537 0x15d0: 2024 2e0a 2020 2d2d 3e0a 0a3c 2f42 4f44 0x15e0: 593e 0a3c 2f48 544d 4c3e 0a -22:57:35.941260 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 0x0000: 4500 0034 1b6e 4000 4006 2154 7f00 0001 0x0010: 7f00 0001 da70 0050 3758 8a49 377a a3a9 0x0020: 8010 305f 10ea 0000 0101 080a 4ddc 9219 0x0030: 4ddc 9219 -22:57:37.229575 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 0x0000: 4500 0034 1b70 4000 4006 2152 7f00 0001 0x0010: 7f00 0001 da70 0050 3758 8a49 377a a3a9 0x0020: 8011 305f 0be1 0000 0101 080a 4ddc 9721 0x0030: 4ddc 9219 -22:57:37.230839 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 0x0000: 4500 0034 1fe8 4000 4006 1cda 7f00 0001 0x0010: 7f00 0001 0050 da70 377a a3a9 3758 8a4a 0x0020: 8011 2000 1735 0000 0101 080a 4ddc 9723 0x0030: 4ddc 9721 -22:57:37.230900 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 0x0000: 4500 0034 1b72 4000 4006 2150 7f00 0001 0x0010: 7f00 0001 da70 0050 3758 8a4a 377a a3aa 0x0020: 8010 305f 06d4 0000 0101 080a 4ddc 9723 diff --git a/tests/print-xx.out b/tests/print-xx.out index d9d24db5..2d5b2419 100644 --- a/tests/print-xx.out +++ b/tests/print-xx.out @@ -1,22 +1,22 @@ -22:57:35.938066 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [S], seq 928549246, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 0,nop,wscale 2], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 0x0010: 003c 1b68 4000 4006 2152 7f00 0001 7f00 0x0020: 0001 da70 0050 3758 897e 0000 0000 a002 0x0030: 7fff 1421 0000 0204 400c 0402 080a 4ddc 0x0040: 9216 0000 0000 0103 0302 -22:57:35.938122 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [S.], seq 930778609, ack 928549247, win 32767, options [mss 16396,sackOK,TS val 1306300950 ecr 1306300950,nop,wscale 2], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 0x0010: 003c 0000 4000 4006 3cba 7f00 0001 7f00 0x0020: 0001 0050 da70 377a 8df1 3758 897f a012 0x0030: 7fff 6eb1 0000 0204 400c 0402 080a 4ddc 0x0040: 9216 4ddc 9216 0103 0302 -22:57:35.938167 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,TS val 1306300950 ecr 1306300950], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 0x0010: 0034 1b6a 4000 4006 2158 7f00 0001 7f00 0x0020: 0001 da70 0050 3758 897f 377a 8df2 8010 0x0030: 2000 37d0 0000 0101 080a 4ddc 9216 4ddc 0x0040: 9216 -22:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], seq 1:203, ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 0x0010: 00fe 1b6c 4000 4006 208c 7f00 0001 7f00 0x0020: 0001 da70 0050 3758 897f 377a 8df2 8018 @@ -34,13 +34,13 @@ 0x00e0: 6570 742d 4c61 6e67 7561 6765 3a20 656e 0x00f0: 0d0a 436f 6e6e 6563 7469 6f6e 3a20 4b65 0x0100: 6570 2d41 6c69 7665 0d0a 0d0a -22:57:35.940474 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,nop,TS val 1306300952 ecr 1306300951], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 0x0010: 0034 1fe4 4000 4006 1cde 7f00 0001 7f00 0x0020: 0001 0050 da70 377a 8df2 3758 8a49 8010 0x0030: 2000 3703 0000 0101 080a 4ddc 9218 4ddc 0x0040: 9217 -22:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], seq 1:5560, ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 0x0010: 15eb 1fe6 4000 4006 0725 7f00 0001 7f00 0x0020: 0001 0050 da70 377a 8df2 3758 8a49 8018 @@ -393,25 +393,25 @@ 0x15d0: 3036 2f32 3020 3135 3a33 333a 3537 2024 0x15e0: 2e0a 2020 2d2d 3e0a 0a3c 2f42 4f44 593e 0x15f0: 0a3c 2f48 544d 4c3e 0a -22:57:35.941260 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5560, win 12383, options [nop,nop,TS val 1306300953 ecr 1306300953], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 0x0010: 0034 1b6e 4000 4006 2154 7f00 0001 7f00 0x0020: 0001 da70 0050 3758 8a49 377a a3a9 8010 0x0030: 305f 10ea 0000 0101 080a 4ddc 9219 4ddc 0x0040: 9219 -22:57:37.229575 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [F.], seq 203, ack 5560, win 12383, options [nop,nop,TS val 1306302241 ecr 1306300953], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 0x0010: 0034 1b70 4000 4006 2152 7f00 0001 7f00 0x0020: 0001 da70 0050 3758 8a49 377a a3a9 8011 0x0030: 305f 0be1 0000 0101 080a 4ddc 9721 4ddc 0x0040: 9219 -22:57:37.230839 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 +IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [F.], seq 5560, ack 204, win 8192, options [nop,nop,TS val 1306302243 ecr 1306302241], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 0x0010: 0034 1fe8 4000 4006 1cda 7f00 0001 7f00 0x0020: 0001 0050 da70 377a a3a9 3758 8a4a 8011 0x0030: 2000 1735 0000 0101 080a 4ddc 9723 4ddc 0x0040: 9721 -22:57:37.230900 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 +IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 5561, win 12383, options [nop,nop,TS val 1306302243 ecr 1306302243], length 0 0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 0x0010: 0034 1b72 4000 4006 2150 7f00 0001 7f00 0x0020: 0001 da70 0050 3758 8a4a 377a a3aa 8010