Merge git://github.com/the-tcpdump-group/tcpdump

diff --git a/CHANGES b/CHANGES
index 84fac25781f1b4e5858deaeef070a6855e3fcb02..9eea2ed062f5d4e05c7b52f514a9b24205a86a7a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Thursday Nov. 20, 2014 [email protected]
+  Summary for 5.0.0 tcpdump release
+       DCCP: update Packet Types with RFC4340/IANA names
+
 Friday Nov. 12, 2014 [email protected]
   Summary for 4.7.0 tcpdump release
         changes to hex printing of CDP packets 

diff --git a/print-dccp.c b/print-dccp.c
index 34d78c3173b3f64e121b25ebb27993bc5b4ccc2f..45468b555473c70c487aadbd9c78483f73660d09 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -26,6 +26,8 @@
 #endif
 #include "ipproto.h"
 
+/* RFC4340: Datagram Congestion Control Protocol (DCCP) */
+
 /**
  * struct dccp_hdr - generic part of DCCP packet header, with a 24-bit
  * sequence number
@@ -123,8 +125,21 @@ enum dccp_pkt_type {
        DCCP_PKT_CLOSE,
        DCCP_PKT_RESET,
        DCCP_PKT_SYNC,
-       DCCP_PKT_SYNCACK,
-       DCCP_PKT_INVALID
+       DCCP_PKT_SYNCACK
+};
+
+static const struct tok dccp_pkt_type_str[] = {
+       { DCCP_PKT_REQUEST, "DCCP-Request" },
+       { DCCP_PKT_RESPONSE, "DCCP-Response" },
+       { DCCP_PKT_DATA, "DCCP-Data" },
+       { DCCP_PKT_ACK, "DCCP-Ack" },
+       { DCCP_PKT_DATAACK, "DCCP-DataAck" },
+       { DCCP_PKT_CLOSEREQ, "DCCP-CloseReq" },
+       { DCCP_PKT_CLOSE, "DCCP-Close" },
+       { DCCP_PKT_RESET, "DCCP-Reset" },
+       { DCCP_PKT_SYNC, "DCCP-Sync" },
+       { DCCP_PKT_SYNCACK, "DCCP-SyncAck" },
+       { 0, NULL}
 };
 
 enum dccp_reset_codes {
@@ -253,7 +268,7 @@ static int dccp_print_option(netdissect_options *, const u_char *, u_int);
  * @len - lenght of ip packet
  */
 void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
-                u_int len)
+               u_int len)
 {
        const struct dccp_hdr *dh;
        const struct ip *ip;
@@ -264,6 +279,7 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        u_short sport, dport;
        u_int hlen;
        u_int fixed_hdrlen;
+       uint8_t dccph_type;
 
        dh = (const struct dccp_hdr *)bp;
 
@@ -283,7 +299,7 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        }
        if (len < sizeof(struct dccp_hdr)) {
                ND_PRINT((ndo, "truncated-dccp - %u bytes missing!",
-                            len - (u_int)sizeof(struct dccp_hdr)));
+                         len - (u_int)sizeof(struct dccp_hdr)));
                return;
        }
 
@@ -291,7 +307,7 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        fixed_hdrlen = dccp_basic_hdr_len(dh);
        if (len < fixed_hdrlen) {
                ND_PRINT((ndo, "truncated-dccp - %u bytes missing!",
-                            len - fixed_hdrlen));
+                         len - fixed_hdrlen));
                return;
        }
        ND_TCHECK2(*dh, fixed_hdrlen);
@@ -303,28 +319,30 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 #ifdef INET6
        if (ip6) {
                ND_PRINT((ndo, "%s.%d > %s.%d: ",
-                            ip6addr_string(ndo, &ip6->ip6_src), sport,
-                            ip6addr_string(ndo, &ip6->ip6_dst), dport));
+                         ip6addr_string(ndo, &ip6->ip6_src), sport,
+                         ip6addr_string(ndo, &ip6->ip6_dst), dport));
        } else
 #endif /*INET6*/
        {
                ND_PRINT((ndo, "%s.%d > %s.%d: ",
-                            ipaddr_string(ndo, &ip->ip_src), sport,
-                            ipaddr_string(ndo, &ip->ip_dst), dport));
+                         ipaddr_string(ndo, &ip->ip_src), sport,
+                         ipaddr_string(ndo, &ip->ip_dst), dport));
        }
 
+       ND_PRINT((ndo, "DCCP"));
+
        if (ndo->ndo_qflag) {
                ND_PRINT((ndo, " %d", len - hlen));
                if (hlen > len) {
-                       ND_PRINT((ndo, "dccp [bad hdr length %u - too long, > %u]",
-                           hlen, len));
+                       ND_PRINT((ndo, " [bad hdr length %u - too long, > %u]",
+                                 hlen, len));
                }
                return;
        }
 
        /* other variables in generic header */
        if (ndo->ndo_vflag) {
-               ND_PRINT((ndo, "CCVal %d, CsCov %d, ", DCCPH_CCVAL(dh), DCCPH_CSCOV(dh)));
+               ND_PRINT((ndo, " (CCVal %d, CsCov %d, ", DCCPH_CCVAL(dh), DCCPH_CSCOV(dh)));
        }
 
        /* checksum calculation */
@@ -340,24 +358,31 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                        sum = dccp6_cksum(ip6, dh, len);
 #endif
                if (sum != 0)
-                       ND_PRINT((ndo, "(incorrect -> 0x%04x), ",in_cksum_shouldbe(dccp_sum, sum)));
+                       ND_PRINT((ndo, "(incorrect -> 0x%04x)",in_cksum_shouldbe(dccp_sum, sum)));
                else
-                       ND_PRINT((ndo, "(correct), "));
+                       ND_PRINT((ndo, "(correct)"));
        }
 
-       switch (DCCPH_TYPE(dh)) {
+       if (ndo->ndo_vflag)
+               ND_PRINT((ndo, ")"));
+       ND_PRINT((ndo, " "));
+
+       dccph_type = DCCPH_TYPE(dh);
+       switch (dccph_type) {
        case DCCP_PKT_REQUEST: {
                struct dccp_hdr_request *dhr =
                        (struct dccp_hdr_request *)(bp + fixed_hdrlen);
                fixed_hdrlen += 4;
                if (len < fixed_hdrlen) {
-                       ND_PRINT((ndo, "truncated-dccp request - %u bytes missing!",
-                                    len - fixed_hdrlen));
+                       ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+                                 tok2str(dccp_pkt_type_str, "", dccph_type),
+                                 len - fixed_hdrlen));
                        return;
                }
                ND_TCHECK(*dhr);
-               ND_PRINT((ndo, "request (service=%d) ",
-                            EXTRACT_32BITS(&dhr->dccph_req_service)));
+               ND_PRINT((ndo, "%s (service=%d) ",
+                         tok2str(dccp_pkt_type_str, "", dccph_type),
+                         EXTRACT_32BITS(&dhr->dccph_req_service)));
                break;
        }
        case DCCP_PKT_RESPONSE: {
@@ -365,90 +390,100 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                        (struct dccp_hdr_response *)(bp + fixed_hdrlen);
                fixed_hdrlen += 12;
                if (len < fixed_hdrlen) {
-                       ND_PRINT((ndo, "truncated-dccp response - %u bytes missing!",
-                                    len - fixed_hdrlen));
+                       ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+                                 tok2str(dccp_pkt_type_str, "", dccph_type),
+                                 len - fixed_hdrlen));
                        return;
                }
                ND_TCHECK(*dhr);
-               ND_PRINT((ndo, "response (service=%d) ",
-                            EXTRACT_32BITS(&dhr->dccph_resp_service)));
+               ND_PRINT((ndo, "%s (service=%d) ",
+                         tok2str(dccp_pkt_type_str, "", dccph_type),
+                         EXTRACT_32BITS(&dhr->dccph_resp_service)));
                break;
        }
        case DCCP_PKT_DATA:
-               ND_PRINT((ndo, "data "));
+               ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
                break;
        case DCCP_PKT_ACK: {
                fixed_hdrlen += 8;
                if (len < fixed_hdrlen) {
-                       ND_PRINT((ndo, "truncated-dccp ack - %u bytes missing!",
-                                    len - fixed_hdrlen));
+                       ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+                                 tok2str(dccp_pkt_type_str, "", dccph_type),
+                                 len - fixed_hdrlen));
                        return;
                }
-               ND_PRINT((ndo, "ack "));
+               ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
                break;
        }
        case DCCP_PKT_DATAACK: {
                fixed_hdrlen += 8;
                if (len < fixed_hdrlen) {
-                       ND_PRINT((ndo, "truncated-dccp dataack - %u bytes missing!",
-                                    len - fixed_hdrlen));
+                       ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+                                 tok2str(dccp_pkt_type_str, "", dccph_type),
+                                 len - fixed_hdrlen));
                        return;
                }
-               ND_PRINT((ndo, "dataack "));
+               ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
                break;
        }
        case DCCP_PKT_CLOSEREQ:
                fixed_hdrlen += 8;
                if (len < fixed_hdrlen) {
-                       ND_PRINT((ndo, "truncated-dccp closereq - %u bytes missing!",
-                                    len - fixed_hdrlen));
+                       ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+                                 tok2str(dccp_pkt_type_str, "", dccph_type),
+                                 len - fixed_hdrlen));
                        return;
                }
-               ND_PRINT((ndo, "closereq "));
+               ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
                break;
        case DCCP_PKT_CLOSE:
                fixed_hdrlen += 8;
                if (len < fixed_hdrlen) {
-                       ND_PRINT((ndo, "truncated-dccp close - %u bytes missing!",
-                                    len - fixed_hdrlen));
+                       ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+                                 tok2str(dccp_pkt_type_str, "", dccph_type),
+                                 len - fixed_hdrlen));
                        return;
                }
-               ND_PRINT((ndo, "close "));
+               ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
                break;
        case DCCP_PKT_RESET: {
                struct dccp_hdr_reset *dhr =
                        (struct dccp_hdr_reset *)(bp + fixed_hdrlen);
                fixed_hdrlen += 12;
                if (len < fixed_hdrlen) {
-                       ND_PRINT((ndo, "truncated-dccp reset - %u bytes missing!",
-                                    len - fixed_hdrlen));
+                       ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+                                 tok2str(dccp_pkt_type_str, "", dccph_type),
+                                 len - fixed_hdrlen));
                        return;
                }
                ND_TCHECK(*dhr);
-               ND_PRINT((ndo, "reset (code=%s) ",
-                            dccp_reset_code(dhr->dccph_reset_code)));
+               ND_PRINT((ndo, "%s (code=%s) ",
+                         tok2str(dccp_pkt_type_str, "", dccph_type),
+                         dccp_reset_code(dhr->dccph_reset_code)));
                break;
        }
        case DCCP_PKT_SYNC:
                fixed_hdrlen += 8;
                if (len < fixed_hdrlen) {
-                       ND_PRINT((ndo, "truncated-dccp sync - %u bytes missing!",
-                                    len - fixed_hdrlen));
+                       ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+                                 tok2str(dccp_pkt_type_str, "", dccph_type),
+                                 len - fixed_hdrlen));
                        return;
                }
-               ND_PRINT((ndo, "sync "));
+               ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
                break;
        case DCCP_PKT_SYNCACK:
                fixed_hdrlen += 8;
                if (len < fixed_hdrlen) {
-                       ND_PRINT((ndo, "truncated-dccp syncack - %u bytes missing!",
-                                    len - fixed_hdrlen));
+                       ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+                                 tok2str(dccp_pkt_type_str, "", dccph_type),
+                                 len - fixed_hdrlen));
                        return;
                }
-               ND_PRINT((ndo, "syncack "));
+               ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
                break;
        default:
-               ND_PRINT((ndo, "invalid "));
+               ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "unknown-type-%u", dccph_type)));
                break;
        }
 
@@ -504,7 +539,7 @@ static const struct tok dccp_option_values[] = {
        { 42, "timestamp_echo" },
        { 43, "elapsed_time" },
        { 44, "data_checksum" },
-        { 0, NULL }
+       { 0, NULL }
 };
 
 static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_int hlen)
@@ -521,7 +556,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
                                ND_PRINT((ndo, "CCID option %u optlen too short", *option));
                        else
                                ND_PRINT((ndo, "%s optlen too short",
-                                   tok2str(dccp_option_values, "Option %u", *option)));
+                                         tok2str(dccp_option_values, "Option %u", *option)));
                        return 0;
                }
        } else
@@ -530,10 +565,10 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
        if (hlen < optlen) {
                if (*option >= 128)
                        ND_PRINT((ndo, "CCID option %u optlen goes past header length",
-                           *option));
+                                 *option));
                else
                        ND_PRINT((ndo, "%s optlen goes past header length",
-                           tok2str(dccp_option_values, "Option %u", *option)));
+                                 tok2str(dccp_option_values, "Option %u", *option)));
                return 0;
        }
        ND_TCHECK2(*option, optlen);

diff --git a/tests/dccp_partial_csum_v4_longer.out b/tests/dccp_partial_csum_v4_longer.out
index a16458e4de884d232f6f83174d076167f9c15ff0..1ec7002a721b8babc3af66267e90642cdb441275 100644 (file)
--- a/tests/dccp_partial_csum_v4_longer.out
+++ b/tests/dccp_partial_csum_v4_longer.out
@@ -1,30 +1,30 @@
 IP (tos 0x0, ttl 64, id 65312, offset 0, flags [DF], proto DCCP (33), length 52)
-    139.133.209.176.39420 > 139.133.209.65.5001: CCVal 0, CsCov 0, cksum 0xaaf3 (correct), request (service=0) seq 38464816766 <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
+    139.133.209.176.39420 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 0, cksum 0xaaf3 (correct)) DCCP-Request (service=0) seq 38464816766 <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
 IP (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto DCCP (33), length 68)
-    139.133.209.65.5001 > 139.133.209.176.39420: CCVal 0, CsCov 0, cksum 0xb04b (correct), response (service=0) (ack=38464816766) seq 1960341146 <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
+    139.133.209.65.5001 > 139.133.209.176.39420: DCCP (CCVal 0, CsCov 0, cksum 0xb04b (correct)) DCCP-Response (service=0) (ack=38464816766) seq 1960341146 <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
 IP (tos 0x0, ttl 64, id 65313, offset 0, flags [DF], proto DCCP (33), length 56)
-    139.133.209.176.39420 > 139.133.209.65.5001: CCVal 0, CsCov 0, cksum 0xf53a (correct), ack (ack=1960341146) seq 38464816767 <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 1>
+    139.133.209.176.39420 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 0, cksum 0xf53a (correct)) DCCP-Ack (ack=1960341146) seq 38464816767 <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 1>
 IP (tos 0x0, ttl 64, id 65314, offset 0, flags [DF], proto DCCP (33), length 152)
-    139.133.209.176.39420 > 139.133.209.65.5001: CCVal 0, CsCov 6, cksum 0x7d28 (correct), dataack (ack=1960341146) seq 38464816768 <nop, nop, ack_vector0 0x00, elapsed_time 1249, ndp_count 1>
+    139.133.209.176.39420 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 6, cksum 0x7d28 (correct)) DCCP-DataAck (ack=1960341146) seq 38464816768 <nop, nop, ack_vector0 0x00, elapsed_time 1249, ndp_count 1>
 IP (tos 0x0, ttl 64, id 3176, offset 0, flags [DF], proto DCCP (33), length 52)
-    139.133.209.65.5001 > 139.133.209.176.39420: CCVal 0, CsCov 0, cksum 0xfc63 (correct), ack (ack=38464816768) seq 1960341147 <nop, ack_vector0 0x01, elapsed_time 1>
+    139.133.209.65.5001 > 139.133.209.176.39420: DCCP (CCVal 0, CsCov 0, cksum 0xfc63 (correct)) DCCP-Ack (ack=38464816768) seq 1960341147 <nop, ack_vector0 0x01, elapsed_time 1>
 IP (tos 0x0, ttl 64, id 65315, offset 0, flags [DF], proto DCCP (33), length 148)
-    139.133.209.176.39420 > 139.133.209.65.5001: CCVal 0, CsCov 6, cksum 0x5e05 (correct), dataack (ack=1960341147) seq 38464816769 <nop, ack_vector0 0x00, elapsed_time 84>
+    139.133.209.176.39420 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 6, cksum 0x5e05 (correct)) DCCP-DataAck (ack=1960341147) seq 38464816769 <nop, ack_vector0 0x00, elapsed_time 84>
 IP (tos 0x0, ttl 64, id 3177, offset 0, flags [DF], proto DCCP (33), length 52)
-    139.133.209.65.5001 > 139.133.209.176.39420: CCVal 0, CsCov 0, cksum 0x0165 (correct), ack (ack=38464816769) seq 1960341148 <nop, nop, ack_vector0 0x00, ndp_count 1>
+    139.133.209.65.5001 > 139.133.209.176.39420: DCCP (CCVal 0, CsCov 0, cksum 0x0165 (correct)) DCCP-Ack (ack=38464816769) seq 1960341148 <nop, nop, ack_vector0 0x00, ndp_count 1>
 IP (tos 0x0, ttl 64, id 65316, offset 0, flags [DF], proto DCCP (33), length 148)
-    139.133.209.176.39420 > 139.133.209.65.5001: CCVal 0, CsCov 6, cksum 0x5e1e (correct), dataack (ack=1960341148) seq 38464816770 <nop, ack_vector0 0x00, elapsed_time 57>
+    139.133.209.176.39420 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 6, cksum 0x5e1e (correct)) DCCP-DataAck (ack=1960341148) seq 38464816770 <nop, ack_vector0 0x00, elapsed_time 57>
 IP (tos 0x0, ttl 64, id 65317, offset 0, flags [DF], proto DCCP (33), length 148)
-    139.133.209.176.39420 > 139.133.209.65.5001: CCVal 0, CsCov 6, cksum 0x5e15 (correct), dataack (ack=1960341148) seq 38464816771 <nop, ack_vector0 0x00, elapsed_time 65>
+    139.133.209.176.39420 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 6, cksum 0x5e15 (correct)) DCCP-DataAck (ack=1960341148) seq 38464816771 <nop, ack_vector0 0x00, elapsed_time 65>
 IP (tos 0x0, ttl 64, id 3178, offset 0, flags [DF], proto DCCP (33), length 56)
-    139.133.209.65.5001 > 139.133.209.176.39420: CCVal 0, CsCov 0, cksum 0xfb32 (correct), ack (ack=38464816770) seq 1960341149 <nop, nop, ack_vector0 0x00, elapsed_time 1, ndp_count 2>
+    139.133.209.65.5001 > 139.133.209.176.39420: DCCP (CCVal 0, CsCov 0, cksum 0xfb32 (correct)) DCCP-Ack (ack=38464816770) seq 1960341149 <nop, nop, ack_vector0 0x00, elapsed_time 1, ndp_count 2>
 IP (tos 0x0, ttl 64, id 3179, offset 0, flags [DF], proto DCCP (33), length 56)
-    139.133.209.65.5001 > 139.133.209.176.39420: CCVal 0, CsCov 0, cksum 0xfa2f (correct), ack (ack=38464816771) seq 1960341150 <nop, nop, ack_vector0 0x01, elapsed_time 1, ndp_count 3>
+    139.133.209.65.5001 > 139.133.209.176.39420: DCCP (CCVal 0, CsCov 0, cksum 0xfa2f (correct)) DCCP-Ack (ack=38464816771) seq 1960341150 <nop, nop, ack_vector0 0x01, elapsed_time 1, ndp_count 3>
 IP (tos 0x0, ttl 64, id 65318, offset 0, flags [DF], proto DCCP (33), length 148)
-    139.133.209.176.39420 > 139.133.209.65.5001: CCVal 0, CsCov 6, cksum 0x5e35 (correct), dataack (ack=1960341150) seq 38464816772 <nop, ack_vector0 0x00, elapsed_time 30>
+    139.133.209.176.39420 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 6, cksum 0x5e35 (correct)) DCCP-DataAck (ack=1960341150) seq 38464816772 <nop, ack_vector0 0x00, elapsed_time 30>
 IP (tos 0x0, ttl 64, id 65319, offset 0, flags [DF], proto DCCP (33), length 52)
-    139.133.209.176.39420 > 139.133.209.65.5001: CCVal 0, CsCov 0, cksum 0xf638 (correct), close (ack=1960341150) seq 38464816773 <nop, ack_vector0 0x00, elapsed_time 37>
+    139.133.209.176.39420 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 0, cksum 0xf638 (correct)) DCCP-Close (ack=1960341150) seq 38464816773 <nop, ack_vector0 0x00, elapsed_time 37>
 IP (tos 0x0, ttl 64, id 3180, offset 0, flags [DF], proto DCCP (33), length 56)
-    139.133.209.65.5001 > 139.133.209.176.39420: CCVal 0, CsCov 0, cksum 0xfb2c (correct), ack (ack=38464816772) seq 1960341151 <nop, nop, ack_vector0 0x00, elapsed_time 1, ndp_count 4>
+    139.133.209.65.5001 > 139.133.209.176.39420: DCCP (CCVal 0, CsCov 0, cksum 0xfb2c (correct)) DCCP-Ack (ack=38464816772) seq 1960341151 <nop, nop, ack_vector0 0x00, elapsed_time 1, ndp_count 4>
 IP (tos 0x0, ttl 64, id 3181, offset 0, flags [DF], proto DCCP (33), length 60)
-    139.133.209.65.5001 > 139.133.209.176.39420: CCVal 0, CsCov 0, cksum 0xef25 (correct), reset (code=closed) (ack=38464816773) seq 1960341152 <nop, nop, ack_vector0 0x01, elapsed_time 2, ndp_count 5>
+    139.133.209.65.5001 > 139.133.209.176.39420: DCCP (CCVal 0, CsCov 0, cksum 0xef25 (correct)) DCCP-Reset (code=closed) (ack=38464816773) seq 1960341152 <nop, nop, ack_vector0 0x01, elapsed_time 2, ndp_count 5>

diff --git a/tests/dccp_partial_csum_v4_simple.out b/tests/dccp_partial_csum_v4_simple.out
index a29b35f9b74ab97f15442967534521973fdf6f2a..6fee70d88c99d701b7ca55d944032dfaaa97982b 100644 (file)
--- a/tests/dccp_partial_csum_v4_simple.out
+++ b/tests/dccp_partial_csum_v4_simple.out
@@ -1,14 +1,14 @@
 IP (tos 0x0, ttl 64, id 30095, offset 0, flags [DF], proto DCCP (33), length 52)
-    139.133.209.176.52667 > 139.133.209.65.5001: CCVal 0, CsCov 0, cksum 0xa766 (correct), request (service=0) seq 33164071488 <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
+    139.133.209.176.52667 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 0, cksum 0xa766 (correct)) DCCP-Request (service=0) seq 33164071488 <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
 IP (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto DCCP (33), length 68)
-    139.133.209.65.5001 > 139.133.209.176.52667: CCVal 0, CsCov 0, cksum 0x9a1a (correct), response (service=0) (ack=33164071488) seq 1925546833 <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
+    139.133.209.65.5001 > 139.133.209.176.52667: DCCP (CCVal 0, CsCov 0, cksum 0x9a1a (correct)) DCCP-Response (service=0) (ack=33164071488) seq 1925546833 <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
 IP (tos 0x0, ttl 64, id 30096, offset 0, flags [DF], proto DCCP (33), length 56)
-    139.133.209.176.52667 > 139.133.209.65.5001: CCVal 0, CsCov 0, cksum 0xdf09 (correct), ack (ack=1925546833) seq 33164071489 <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 1>
+    139.133.209.176.52667 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 0, cksum 0xdf09 (correct)) DCCP-Ack (ack=1925546833) seq 33164071489 <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 1>
 IP (tos 0x0, ttl 64, id 30097, offset 0, flags [DF], proto DCCP (33), length 68)
-    139.133.209.176.52667 > 139.133.209.65.5001: CCVal 0, CsCov 1, cksum 0x9dfa (correct), dataack (ack=1925546833) seq 33164071490 <nop, nop, ack_vector0 0x00, elapsed_time 70, ndp_count 1>
+    139.133.209.176.52667 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 1, cksum 0x9dfa (correct)) DCCP-DataAck (ack=1925546833) seq 33164071490 <nop, nop, ack_vector0 0x00, elapsed_time 70, ndp_count 1>
 IP (tos 0x0, ttl 64, id 24713, offset 0, flags [DF], proto DCCP (33), length 52)
-    139.133.209.65.5001 > 139.133.209.176.52667: CCVal 0, CsCov 0, cksum 0xe632 (correct), ack (ack=33164071490) seq 1925546834 <nop, ack_vector0 0x01, elapsed_time 1>
+    139.133.209.65.5001 > 139.133.209.176.52667: DCCP (CCVal 0, CsCov 0, cksum 0xe632 (correct)) DCCP-Ack (ack=33164071490) seq 1925546834 <nop, ack_vector0 0x01, elapsed_time 1>
 IP (tos 0x0, ttl 64, id 30098, offset 0, flags [DF], proto DCCP (33), length 52)
-    139.133.209.176.52667 > 139.133.209.65.5001: CCVal 0, CsCov 0, cksum 0xdf8d (correct), close (ack=1925546834) seq 33164071491 <nop, ack_vector0 0x00, elapsed_time 166>
+    139.133.209.176.52667 > 139.133.209.65.5001: DCCP (CCVal 0, CsCov 0, cksum 0xdf8d (correct)) DCCP-Close (ack=1925546834) seq 33164071491 <nop, ack_vector0 0x00, elapsed_time 166>
 IP (tos 0x0, ttl 64, id 24714, offset 0, flags [DF], proto DCCP (33), length 60)
-    139.133.209.65.5001 > 139.133.209.176.52667: CCVal 0, CsCov 0, cksum 0xd900 (correct), reset (code=closed) (ack=33164071491) seq 1925546835 <nop, nop, ack_vector0 0x00, elapsed_time 3, ndp_count 1>
+    139.133.209.65.5001 > 139.133.209.176.52667: DCCP (CCVal 0, CsCov 0, cksum 0xd900 (correct)) DCCP-Reset (code=closed) (ack=33164071491) seq 1925546835 <nop, nop, ack_vector0 0x00, elapsed_time 3, ndp_count 1>

diff --git a/tests/dccp_partial_csum_v6_longer.out b/tests/dccp_partial_csum_v6_longer.out
index adee6c3a308fd97a5ba8b7d6931c9bbed3ee82f8..76355d4c823beb36dc5a658aed645b1ac5669e34 100644 (file)
--- a/tests/dccp_partial_csum_v6_longer.out
+++ b/tests/dccp_partial_csum_v6_longer.out
@@ -1,9 +1,9 @@
-IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::1.55024 > 3ffe::2.5001: CCVal 0, CsCov 0, cksum 0xd538 (correct), request (service=0) seq 1559687427 <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
-IP6 (hlim 64, next-header DCCP (33) payload length: 48) 3ffe::2.5001 > 3ffe::1.55024: CCVal 0, CsCov 0, cksum 0x81a3 (correct), response (service=0) (ack=1559687427) seq 1585962456 <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
-IP6 (hlim 64, next-header DCCP (33) payload length: 36) 3ffe::1.55024 > 3ffe::2.5001: CCVal 0, CsCov 0, cksum 0xc692 (correct), ack (ack=1585962456) seq 1559687428 <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 1>
-IP6 (hlim 64, next-header DCCP (33) payload length: 164) 3ffe::1.55024 > 3ffe::2.5001: CCVal 0, CsCov 10, cksum 0xe362 (correct), dataack (ack=1585962456) seq 1559687429 <nop, nop, ack_vector0 0x00, elapsed_time 7282, ndp_count 1>
-IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::2.5001 > 3ffe::1.55024: CCVal 0, CsCov 0, cksum 0xcdbb (correct), ack (ack=1559687429) seq 1585962457 <nop, ack_vector0 0x01, elapsed_time 1>
-IP6 (hlim 64, next-header DCCP (33) payload length: 160) 3ffe::1.55024 > 3ffe::2.5001: CCVal 0, CsCov 10, cksum 0x5574 (correct), dataack (ack=1585962457) seq 1559687430 <nop, ack_vector0 0x00, elapsed_time 55>
-IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::1.55024 > 3ffe::2.5001: CCVal 0, CsCov 0, cksum 0xc778 (correct), close (ack=1585962457) seq 1559687431 <nop, ack_vector0 0x00, elapsed_time 67>
-IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::2.5001 > 3ffe::1.55024: CCVal 0, CsCov 0, cksum 0xd2bc (correct), ack (ack=1559687430) seq 1585962458 <nop, nop, ack_vector0 0x00, ndp_count 1>
-IP6 (hlim 64, next-header DCCP (33) payload length: 40) 3ffe::2.5001 > 3ffe::1.55024: CCVal 0, CsCov 0, cksum 0xc186 (correct), reset (code=closed) (ack=1559687431) seq 1585962459 <nop, nop, ack_vector0 0x01, elapsed_time 1, ndp_count 2>
+IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::1.55024 > 3ffe::2.5001: DCCP (CCVal 0, CsCov 0, cksum 0xd538 (correct)) DCCP-Request (service=0) seq 1559687427 <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
+IP6 (hlim 64, next-header DCCP (33) payload length: 48) 3ffe::2.5001 > 3ffe::1.55024: DCCP (CCVal 0, CsCov 0, cksum 0x81a3 (correct)) DCCP-Response (service=0) (ack=1559687427) seq 1585962456 <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
+IP6 (hlim 64, next-header DCCP (33) payload length: 36) 3ffe::1.55024 > 3ffe::2.5001: DCCP (CCVal 0, CsCov 0, cksum 0xc692 (correct)) DCCP-Ack (ack=1585962456) seq 1559687428 <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 1>
+IP6 (hlim 64, next-header DCCP (33) payload length: 164) 3ffe::1.55024 > 3ffe::2.5001: DCCP (CCVal 0, CsCov 10, cksum 0xe362 (correct)) DCCP-DataAck (ack=1585962456) seq 1559687429 <nop, nop, ack_vector0 0x00, elapsed_time 7282, ndp_count 1>
+IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::2.5001 > 3ffe::1.55024: DCCP (CCVal 0, CsCov 0, cksum 0xcdbb (correct)) DCCP-Ack (ack=1559687429) seq 1585962457 <nop, ack_vector0 0x01, elapsed_time 1>
+IP6 (hlim 64, next-header DCCP (33) payload length: 160) 3ffe::1.55024 > 3ffe::2.5001: DCCP (CCVal 0, CsCov 10, cksum 0x5574 (correct)) DCCP-DataAck (ack=1585962457) seq 1559687430 <nop, ack_vector0 0x00, elapsed_time 55>
+IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::1.55024 > 3ffe::2.5001: DCCP (CCVal 0, CsCov 0, cksum 0xc778 (correct)) DCCP-Close (ack=1585962457) seq 1559687431 <nop, ack_vector0 0x00, elapsed_time 67>
+IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::2.5001 > 3ffe::1.55024: DCCP (CCVal 0, CsCov 0, cksum 0xd2bc (correct)) DCCP-Ack (ack=1559687430) seq 1585962458 <nop, nop, ack_vector0 0x00, ndp_count 1>
+IP6 (hlim 64, next-header DCCP (33) payload length: 40) 3ffe::2.5001 > 3ffe::1.55024: DCCP (CCVal 0, CsCov 0, cksum 0xc186 (correct)) DCCP-Reset (code=closed) (ack=1559687431) seq 1585962459 <nop, nop, ack_vector0 0x01, elapsed_time 1, ndp_count 2>

diff --git a/tests/dccp_partial_csum_v6_simple.out b/tests/dccp_partial_csum_v6_simple.out
index 55136770836c943680a08eeacdef01dd6967f1ae..317a68acbf5f6fc35088b226ea5bb8c23c653aaa 100644 (file)
--- a/tests/dccp_partial_csum_v6_simple.out
+++ b/tests/dccp_partial_csum_v6_simple.out
@@ -1,7 +1,7 @@
-IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::1.52921 > 3ffe::2.5001: CCVal 0, CsCov 0, cksum 0xef1a (correct), request (service=0) seq 1337846929 <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
-IP6 (hlim 64, next-header DCCP (33) payload length: 48) 3ffe::2.5001 > 3ffe::1.52921: CCVal 0, CsCov 0, cksum 0x0b73 (correct), response (service=0) (ack=1337846929) seq 1385331168 <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
-IP6 (hlim 64, next-header DCCP (33) payload length: 36) 3ffe::1.52921 > 3ffe::2.5001: CCVal 0, CsCov 0, cksum 0x5062 (correct), ack (ack=1385331168) seq 1337846930 <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 1>
-IP6 (hlim 64, next-header DCCP (33) payload length: 48) 3ffe::1.52921 > 3ffe::2.5001: CCVal 0, CsCov 1, cksum 0x8792 (correct), dataack (ack=1385331168) seq 1337846931 <nop, nop, ack_vector0 0x00, elapsed_time 49357, ndp_count 1>
-IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::2.5001 > 3ffe::1.52921: CCVal 0, CsCov 0, cksum 0x578b (correct), ack (ack=1337846931) seq 1385331169 <nop, ack_vector0 0x01, elapsed_time 1>
-IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::1.52921 > 3ffe::2.5001: CCVal 0, CsCov 0, cksum 0x61e0 (correct), close (ack=1385331169) seq 1337846932 <nop, ack_vector0 0x00, elapsed_time 61355>
-IP6 (hlim 64, next-header DCCP (33) payload length: 40) 3ffe::2.5001 > 3ffe::1.52921: CCVal 0, CsCov 0, cksum 0x4b59 (correct), reset (code=closed) (ack=1337846932) seq 1385331170 <nop, nop, ack_vector0 0x00, elapsed_time 2, ndp_count 1>
+IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::1.52921 > 3ffe::2.5001: DCCP (CCVal 0, CsCov 0, cksum 0xef1a (correct)) DCCP-Request (service=0) seq 1337846929 <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
+IP6 (hlim 64, next-header DCCP (33) payload length: 48) 3ffe::2.5001 > 3ffe::1.52921: DCCP (CCVal 0, CsCov 0, cksum 0x0b73 (correct)) DCCP-Response (service=0) (ack=1337846929) seq 1385331168 <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
+IP6 (hlim 64, next-header DCCP (33) payload length: 36) 3ffe::1.52921 > 3ffe::2.5001: DCCP (CCVal 0, CsCov 0, cksum 0x5062 (correct)) DCCP-Ack (ack=1385331168) seq 1337846930 <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 1>
+IP6 (hlim 64, next-header DCCP (33) payload length: 48) 3ffe::1.52921 > 3ffe::2.5001: DCCP (CCVal 0, CsCov 1, cksum 0x8792 (correct)) DCCP-DataAck (ack=1385331168) seq 1337846931 <nop, nop, ack_vector0 0x00, elapsed_time 49357, ndp_count 1>
+IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::2.5001 > 3ffe::1.52921: DCCP (CCVal 0, CsCov 0, cksum 0x578b (correct)) DCCP-Ack (ack=1337846931) seq 1385331169 <nop, ack_vector0 0x01, elapsed_time 1>
+IP6 (hlim 64, next-header DCCP (33) payload length: 32) 3ffe::1.52921 > 3ffe::2.5001: DCCP (CCVal 0, CsCov 0, cksum 0x61e0 (correct)) DCCP-Close (ack=1385331169) seq 1337846932 <nop, ack_vector0 0x00, elapsed_time 61355>
+IP6 (hlim 64, next-header DCCP (33) payload length: 40) 3ffe::2.5001 > 3ffe::1.52921: DCCP (CCVal 0, CsCov 0, cksum 0x4b59 (correct)) DCCP-Reset (code=closed) (ack=1337846932) seq 1385331170 <nop, nop, ack_vector0 0x00, elapsed_time 2, ndp_count 1>