Regenerate config files.

[tcpdump] / print-dccp.c

diff --git a/print-dccp.c b/print-dccp.c
index 09cf72b2bab754fc6d27f97638a32af0fa04e536..6e252642724037bab9cde76adc064568c6c40803 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -7,22 +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
  */
 

+/* \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) */


@@ -204,13 +204,12 @@ static int dccp_cksum(netdissect_options *ndo, const struct ip *ip,
                                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 *)(const 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)
 {


@@ -271,9 +270,7 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 {
        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,12 +280,10 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        dh = (const struct dccp_hdr *)bp;
 
        ip = (const struct ip *)data2;
        dh = (const struct dccp_hdr *)bp;
 
        ip = (const struct ip *)data2;

-#ifdef INET6

        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);


@@ -315,14 +310,11 @@ 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: ",
                          ip6addr_string(ndo, &ip6->ip6_src), sport,
                          ip6addr_string(ndo, &ip6->ip6_dst), dport));
        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*/
-       {
+       } else {

                ND_PRINT((ndo, "%s.%d > %s.%d: ",
                          ipaddr_string(ndo, &ip->ip_src), sport,
                          ipaddr_string(ndo, &ip->ip_dst), dport));
                ND_PRINT((ndo, "%s.%d > %s.%d: ",
                          ipaddr_string(ndo, &ip->ip_src), sport,
                          ipaddr_string(ndo, &ip->ip_dst), dport));


@@ -352,10 +344,8 @@ 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)
                        ND_PRINT((ndo, "(incorrect -> 0x%04x)",in_cksum_shouldbe(dccp_sum, sum)));
                else
                if (sum != 0)
                        ND_PRINT((ndo, "(incorrect -> 0x%04x)",in_cksum_shouldbe(dccp_sum, sum)));
                else


@@ -497,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, " <"));