Update tests to reflect the new HTTP dissector.

diff --git a/tests/print-A.out b/tests/print-A.out
index 9daff5a2543e4a7972a02b5a637f072c8ddd0d84..d35b968e083fe31c4bc38b5d792c3bb23cdbf839 100644 (file)
--- a/tests/print-A.out
+++ b/tests/print-A.out
@@ -7,7 +7,7 @@ M...M.......
 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...
-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: HTTP: GET / HTTP/1.1
 E....l@.@. ..........p.P7X..7z.... ........
 M...M...GET / HTTP/1.1
 Host: localhost
@@ -21,7 +21,7 @@ Connection: Keep-Alive
 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..@[email protected].. .7......
 M...M...
-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: HTTP: HTTP/1.1 200 OK
 E.....@.@..%.........P.p7z..7X.I.. ........
 M...M...HTTP/1.1 200 OK
 Date: Wed, 06 Jul 2005 03:57:35 GMT

diff --git a/tests/print-AA.out b/tests/print-AA.out
index a1bc485eda13f7056213d4a7413d2726f105d31d..d2ea084c03aec9766d799901f9d471d46e80517d 100644 (file)
--- a/tests/print-AA.out
+++ b/tests/print-AA.out
@@ -7,7 +7,7 @@ M...M.......
 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...
-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: HTTP: GET / HTTP/1.1
 ..............E....l@.@. ..........p.P7X..7z.... ........
 M...M...GET / HTTP/1.1
 Host: localhost
@@ -21,7 +21,7 @@ Connection: Keep-Alive
 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..@[email protected].. .7......
 M...M...
-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: HTTP: HTTP/1.1 200 OK
 ..............E.....@.@..%.........P.p7z..7X.I.. ........
 M...M...HTTP/1.1 200 OK
 Date: Wed, 06 Jul 2005 03:57:35 GMT

diff --git a/tests/print-capX.out b/tests/print-capX.out
index 22b909043b7d4494da2d8aae05938a3a4ce2ac24..8a27a9669c5517d222070ccbc04a56bb56eec399 100644 (file)
--- a/tests/print-capX.out
+++ b/tests/print-capX.out
@@ -13,7 +13,7 @@ IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,
        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...
-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: HTTP: GET / HTTP/1.1
        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...
@@ -35,7 +35,7 @@ IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,no
        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...
-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: HTTP: HTTP/1.1 200 OK
        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...

diff --git a/tests/print-capXX.out b/tests/print-capXX.out
index 524030c3b2b723acb44fc17d6b83349aa8b9a812..8fc3095d5fd4bd84a66c2269efd14596ac613c0f 100644 (file)
--- a/tests/print-capXX.out
+++ b/tests/print-capXX.out
@@ -16,7 +16,7 @@ IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,
        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                                     ..
-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: HTTP: GET / HTTP/1.1
        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....
@@ -40,7 +40,7 @@ IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,no
        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                                     ..
-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: HTTP: HTTP/1.1 200 OK
        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..

diff --git a/tests/print-x.out b/tests/print-x.out
index 34e0544bf9473f1807974abc624b45389808b93b..f2a4e2c0b917fd4ed1aca3b27f3e6ce45ca6a4c1 100644 (file)
--- a/tests/print-x.out
+++ b/tests/print-x.out
@@ -13,7 +13,7 @@ IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,
        0x0010:  7f00 0001 da70 0050 3758 897f 377a 8df2
        0x0020:  8010 2000 37d0 0000 0101 080a 4ddc 9216
        0x0030:  4ddc 9216
-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: HTTP: GET / HTTP/1.1
        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
@@ -35,7 +35,7 @@ IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,no
        0x0010:  7f00 0001 0050 da70 377a 8df2 3758 8a49
        0x0020:  8010 2000 3703 0000 0101 080a 4ddc 9218
        0x0030:  4ddc 9217
-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: HTTP: HTTP/1.1 200 OK
        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

diff --git a/tests/print-xx.out b/tests/print-xx.out
index 2d5b2419a696dbd8af8ade97972dd46b2b38eafe..542fdc302a2fbafab5433a7798060d8174b51bf1 100644 (file)
--- a/tests/print-xx.out
+++ b/tests/print-xx.out
@@ -16,7 +16,7 @@ IP 127.0.0.1.55920 > 127.0.0.1.80: Flags [.], ack 1, win 8192, options [nop,nop,
        0x0020:  0001 da70 0050 3758 897f 377a 8df2 8010
        0x0030:  2000 37d0 0000 0101 080a 4ddc 9216 4ddc
        0x0040:  9216
-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: HTTP: GET / HTTP/1.1
        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
@@ -40,7 +40,7 @@ IP 127.0.0.1.80 > 127.0.0.1.55920: Flags [.], ack 203, win 8192, options [nop,no
        0x0020:  0001 0050 da70 377a 8df2 3758 8a49 8010
        0x0030:  2000 3703 0000 0101 080a 4ddc 9218 4ddc
        0x0040:  9217
-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: HTTP: HTTP/1.1 200 OK
        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