Regenerate config files.

[tcpdump] / print-dccp.c

diff --git a/print-dccp.c b/print-dccp.c
index d691ac3665bbf74f866ea67bbddca1de99770da8..6e252642724037bab9cde76adc064568c6c40803 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -7,23 +7,22 @@
  * BSD-style license that accompanies tcpdump or the GNU GPL version 2
  */
 
  * BSD-style license that accompanies tcpdump or the GNU GPL version 2
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: Datagram Congestion Control Protocol (DCCP) printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include <stdio.h>
 #include <string.h>
 
 
 #include <stdio.h>
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "addrtoname.h"

-#include "extract.h"                   /* must come after interface.h */
+#include "extract.h"

 #include "ip.h"
 #include "ip.h"

-#ifdef INET6

 #include "ip6.h"
 #include "ip6.h"

-#endif

 #include "ipproto.h"
 
 /* RFC4340: Datagram Congestion Control Protocol (DCCP) */
 #include "ipproto.h"
 
 /* RFC4340: Datagram Congestion Control Protocol (DCCP) */


@@ -129,17 +128,17 @@ enum dccp_pkt_type {
 };
 
 static const struct tok dccp_pkt_type_str[] = {
 };
 
 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}
+       { 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 {
 };
 
 enum dccp_reset_codes {


@@ -201,17 +200,16 @@ static inline u_int dccp_csum_coverage(const struct dccp_hdr* dh, u_int len)
 static int dccp_cksum(netdissect_options *ndo, const struct ip *ip,
        const struct dccp_hdr *dh, u_int len)
 {
 static int dccp_cksum(netdissect_options *ndo, const struct ip *ip,
        const struct dccp_hdr *dh, u_int len)
 {

-       return nextproto4_cksum(ndo, ip, (const uint8_t *)(void *)dh, len,
+       return nextproto4_cksum(ndo, ip, (const uint8_t *)(const void *)dh, len,

                                dccp_csum_coverage(dh, len), IPPROTO_DCCP);
 }
 
                                dccp_csum_coverage(dh, len), IPPROTO_DCCP);
 }
 

-#ifdef INET6
-static int dccp6_cksum(const struct ip6_hdr *ip6, const struct dccp_hdr *dh, u_int len)
+static int dccp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,
+       const struct dccp_hdr *dh, u_int len)

 {
 {

-       return nextproto6_cksum(ip6, (const uint8_t *)(void *)dh, len,
+       return nextproto6_cksum(ndo, ip6, (const uint8_t *)(const void *)dh, len,

                                dccp_csum_coverage(dh, len), IPPROTO_DCCP);
 }
                                dccp_csum_coverage(dh, len), IPPROTO_DCCP);
 }

-#endif

 
 static const char *dccp_reset_code(uint8_t code)
 {
 
 static const char *dccp_reset_code(uint8_t code)
 {


@@ -268,13 +266,11 @@ 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,
  * @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;
 {
        const struct dccp_hdr *dh;
        const struct ip *ip;

-#ifdef INET6

        const struct ip6_hdr *ip6;
        const struct ip6_hdr *ip6;

-#endif

        const u_char *cp;
        u_short sport, dport;
        u_int hlen;
        const u_char *cp;
        u_short sport, dport;
        u_int hlen;


@@ -283,13 +279,11 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 
        dh = (const struct dccp_hdr *)bp;
 
 
        dh = (const struct dccp_hdr *)bp;
 

-       ip = (struct ip *)data2;
-#ifdef INET6
+       ip = (const struct ip *)data2;

        if (IP_V(ip) == 6)
                ip6 = (const struct ip6_hdr *)data2;
        else
                ip6 = NULL;
        if (IP_V(ip) == 6)
                ip6 = (const struct ip6_hdr *)data2;
        else
                ip6 = NULL;

-#endif /*INET6*/

 
        /* make sure we have enough data to look at the X bit */
        cp = (const u_char *)(dh + 1);
 
        /* make sure we have enough data to look at the X bit */
        cp = (const u_char *)(dh + 1);


@@ -299,7 +293,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!",
        }
        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;
        }
 
                return;
        }
 


@@ -307,7 +301,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!",
        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);
                return;
        }
        ND_TCHECK2(*dh, fixed_hdrlen);


@@ -316,31 +310,30 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        dport = EXTRACT_16BITS(&dh->dccph_dport);
        hlen = dh->dccph_doff * 4;
 
        dport = EXTRACT_16BITS(&dh->dccph_dport);
        hlen = dh->dccph_doff * 4;
 

-#ifdef INET6

        if (ip6) {
                ND_PRINT((ndo, "%s.%d > %s.%d: ",
        if (ip6) {
                ND_PRINT((ndo, "%s.%d > %s.%d: ",

-                            ip6addr_string(ndo, &ip6->ip6_src), sport,
-                            ip6addr_string(ndo, &ip6->ip6_dst), dport));
-       } else
-#endif /*INET6*/
-       {
+                         ip6addr_string(ndo, &ip6->ip6_src), sport,
+                         ip6addr_string(ndo, &ip6->ip6_dst), dport));
+       } else {

                ND_PRINT((ndo, "%s.%d > %s.%d: ",
                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) {
        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) {
                }
                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 */
        }
 
        /* checksum calculation */


@@ -351,21 +344,23 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                ND_PRINT((ndo, "cksum 0x%04x ", dccp_sum));
                if (IP_V(ip) == 4)
                        sum = dccp_cksum(ndo, ip, dh, len);
                ND_PRINT((ndo, "cksum 0x%04x ", dccp_sum));
                if (IP_V(ip) == 4)
                        sum = dccp_cksum(ndo, ip, dh, len);

-#ifdef INET6

                else if (IP_V(ip) == 6)
                else if (IP_V(ip) == 6)

-                       sum = dccp6_cksum(ip6, dh, len);
-#endif
+                       sum = dccp6_cksum(ndo, ip6, dh, len);

                if (sum != 0)
                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
                else

-                       ND_PRINT((ndo, "(correct), "));
+                       ND_PRINT((ndo, "(correct)"));

        }
 
        }
 

+       if (ndo->ndo_vflag)
+               ND_PRINT((ndo, ")"));
+       ND_PRINT((ndo, " "));
+

        dccph_type = DCCPH_TYPE(dh);
        switch (dccph_type) {
        case DCCP_PKT_REQUEST: {
        dccph_type = DCCPH_TYPE(dh);
        switch (dccph_type) {
        case DCCP_PKT_REQUEST: {

-               struct dccp_hdr_request *dhr =
-                       (struct dccp_hdr_request *)(bp + fixed_hdrlen);
+               const struct dccp_hdr_request *dhr =
+                       (const struct dccp_hdr_request *)(bp + fixed_hdrlen);

                fixed_hdrlen += 4;
                if (len < fixed_hdrlen) {
                        ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
                fixed_hdrlen += 4;
                if (len < fixed_hdrlen) {
                        ND_PRINT((ndo, "truncated-%s - %u bytes missing!",


@@ -380,8 +375,8 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                break;
        }
        case DCCP_PKT_RESPONSE: {
                break;
        }
        case DCCP_PKT_RESPONSE: {

-               struct dccp_hdr_response *dhr =
-                       (struct dccp_hdr_response *)(bp + fixed_hdrlen);
+               const struct dccp_hdr_response *dhr =
+                       (const struct dccp_hdr_response *)(bp + fixed_hdrlen);

                fixed_hdrlen += 12;
                if (len < fixed_hdrlen) {
                        ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
                fixed_hdrlen += 12;
                if (len < fixed_hdrlen) {
                        ND_PRINT((ndo, "truncated-%s - %u bytes missing!",


@@ -403,7 +398,7 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                if (len < fixed_hdrlen) {
                        ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
                                  tok2str(dccp_pkt_type_str, "", dccph_type),
                if (len < fixed_hdrlen) {
                        ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
                                  tok2str(dccp_pkt_type_str, "", dccph_type),

-                                 len - fixed_hdrlen));
+                                 len - fixed_hdrlen));

                        return;
                }
                ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
                        return;
                }
                ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));


@@ -441,8 +436,8 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
                break;
        case DCCP_PKT_RESET: {
                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);
+               const struct dccp_hdr_reset *dhr =
+                       (const struct dccp_hdr_reset *)(bp + fixed_hdrlen);

                fixed_hdrlen += 12;
                if (len < fixed_hdrlen) {
                        ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
                fixed_hdrlen += 12;
                if (len < fixed_hdrlen) {
                        ND_PRINT((ndo, "truncated-%s - %u bytes missing!",


@@ -492,7 +487,6 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 
        /* process options */
        if (hlen > fixed_hdrlen){
 
        /* process options */
        if (hlen > fixed_hdrlen){

-               const u_char *cp;

                u_int optlen;
                cp = bp + fixed_hdrlen;
                ND_PRINT((ndo, " <"));
                u_int optlen;
                cp = bp + fixed_hdrlen;
                ND_PRINT((ndo, " <"));


@@ -533,7 +527,7 @@ static const struct tok dccp_option_values[] = {
        { 42, "timestamp_echo" },
        { 43, "elapsed_time" },
        { 44, "data_checksum" },
        { 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)
 };
 
 static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_int hlen)


@@ -550,7 +544,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",
                                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
                        return 0;
                }
        } else


@@ -559,10 +553,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",
        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",
                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);
                return 0;
        }
        ND_TCHECK2(*option, optlen);