From: Guy Harris Date: Tue, 17 Nov 2009 00:35:24 +0000 (-0800) Subject: Propagate X-Git-Tag: tcpdump-4.1.0~53 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/5cd3a3c6af16d59057ecae37cfbdd984e7103ece?ds=inline Propagate commit 0a029bab087e2b66ba35aa144f8993cb26056f5d Author: Michael Richardson Date: Sat Nov 14 20:51:44 2009 -0500 updated print-flags test case to have new TCP flags to print-capXX.out, prior to removing print-XX.out (again - see previous commits; it collides with print-xx.out on systems with case-insensitive file systems). --- diff --git a/tests/print-capX.out b/tests/print-capX.out index 182418bb..f95a9e96 100644 --- a/tests/print-capX.out +++ b/tests/print-capX.out @@ -1,19 +1,19 @@ -23: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 +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 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........... -23: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 +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 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....... -23: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 +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 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... -23:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [P.], ack 1, win 8192, options [nop,nop,TS val 1306300951 ecr 1306300950], length 202 +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 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.... -23: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 +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 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... -23:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [P.], ack 203, win 8192, options [nop,nop,TS val 1306300953 ecr 1306300951], length 5559 +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 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... @@ -322,4 +322,88 @@ 0x11b0: 6420 7468 6520 4465 6269 616e 2047 4e55 d.the.Debian.GNU 0x11c0: 2f4c 696e 7578 206f 7065 7261 7469 6e67 /Linux.operating 0x11d0: 2073 7973 7465 6d2c 0a62 7574 2069 7420 .system,.but.it. - 0x11e0: 6861 732 + 0x11e0: 6861 7320 3c73 7472 6f6e 673e 6e6f 7468 has.noth + 0x11f0: 696e 6720 746f 2064 6f20 7769 7468 2074 ing.to.do.with.t + 0x1200: 6865 2044 6562 6961 6e0a 5072 6f6a 6563 he.Debian.Projec + 0x1210: 743c 2f73 7472 6f6e 673e 2e20 506c 6561 t..Plea + 0x1220: 7365 2064 6f20 3c73 7472 6f6e 673e 6e6f se.do.no + 0x1230: 743c 2f73 7472 6f6e 673e 2063 6f6e 7461 t.conta + 0x1240: 6374 2074 6865 2044 6562 6961 6e0a 5072 ct.the.Debian.Pr + 0x1250: 6f6a 6563 7420 6162 6f75 7420 6974 2e3c oject.about.it.< + 0x1260: 2f50 3e0a 0a3c 503e 4966 2079 6f75 2066 /P>..

If.you.f + 0x1270: 696e 6420 6120 6275 6720 696e 2074 6869 ind.a.bug.in.thi + 0x1280: 7320 6170 6163 6865 2070 6163 6b61 6765 s.apache.package + 0x1290: 2c20 6f72 2069 6e20 4170 6163 6865 2069 ,.or.in.Apache.i + 0x12a0: 7473 656c 662c 0a70 6c65 6173 6520 6669 tself,.please.fi + 0x12b0: 6c65 2061 2062 7567 2072 6570 6f72 7420 le.a.bug.report. + 0x12c0: 6f6e 2069 742e 2020 496e 7374 7275 6374 on.it...Instruct + 0x12d0: 696f 6e73 206f 6e20 646f 696e 6720 7468 ions.on.doing.th + 0x12e0: 6973 2c20 616e 6420 7468 650a 6c69 7374 is,.and.the.list + 0x12f0: 206f 6620 3c41 2048 5245 463d 2268 7474 .of. + 0x1320: 6b6e 6f77 6e20 6275 6773 3c2f 413e 206f known.bugs.o + 0x1330: 6620 7468 6973 0a70 6163 6b61 6765 2c20 f.this.package,. + 0x1340: 6361 6e20 6265 2066 6f75 6e64 2069 6e20 can.be.found.in. + 0x1350: 7468 6520 0a3c 4120 4852 4546 3d22 6874 the..Debian.Bug.T + 0x1390: 7261 636b 696e 6720 5379 7374 656d 3c2f racking.System...

Thanks.f + 0x13b0: 6f72 2075 7369 6e67 2074 6869 7320 7061 or.using.this.pa + 0x13c0: 636b 6167 652c 2061 6e64 2063 6f6e 6772 ckage,.and.congr + 0x13d0: 6174 756c 6174 696f 6e73 2066 6f72 2079 atulations.for.y + 0x13e0: 6f75 7220 6368 6f69 6365 206f 660a 6120 our.choice.of.a. + 0x13f0: 4465 6269 616e 2073 7973 7465 6d21 3c2f Debian.system!...........< + 0x1520: 212d 2d0a 2020 5468 6973 2070 6167 6520 !--...This.page. + 0x1530: 7761 7320 696e 6974 6961 6c6c 7920 6372 was.initially.cr + 0x1540: 6561 7465 6420 6279 204a 6f68 6e69 6520 eated.by.Johnie. + 0x1550: 496e 6772 616d 2028 6874 7470 3a2f 2f6e Ingram.(http://n + 0x1560: 6574 676f 642e 6e65 742f 290a 2020 4974 etgod.net/)...It + 0x1570: 2077 6173 206c 6174 6572 2065 6469 7465 .was.later.edite + 0x1580: 6420 6279 204d 6174 7468 6577 2057 696c d.by.Matthew.Wil + 0x1590: 636f 7820 616e 6420 4a6f 7369 7020 526f cox.and.Josip.Ro + 0x15a0: 6469 6e2e 0a20 204c 6173 7420 6d6f 6469 din....Last.modi + 0x15b0: 6669 6564 3a20 2444 6174 653a 2032 3030 fied:.$Date:.200 + 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 + 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 + 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 + 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 + 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..# + 0x0030: 4ddc 9723 M..#