X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/7885cfa165458a05ef818c34ee03affc79f03725..0023eaa78f123676bfa9c5fba72ea4b8a59aaa70:/print-dccp.c

diff --git a/print-dccp.c b/print-dccp.c
index b28db0ae..62d8988b 100644
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -11,15 +11,10 @@
 
 /* specification: RFC 4340 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -192,7 +187,7 @@ static const char *dccp_feature_nums[] = {
 
 static u_int
 dccp_csum_coverage(netdissect_options *ndo,
-		   const struct dccp_hdr* dh, u_int len)
+		   const struct dccp_hdr *dh, u_int len)
 {
 	u_int cov;
 
@@ -252,16 +247,12 @@ static void dccp_print_ack_no(netdissect_options *ndo, const u_char *bp)
 	uint64_t ackno;
 
 	if (DCCPH_X(dh) != 0) {
-		ND_TCHECK_8(ackp);
 		ackno = GET_BE_U_6(ackp + 2);
 	} else {
-		ND_TCHECK_4(ackp);
 		ackno = GET_BE_U_3(ackp + 1);
 	}
 
 	ND_PRINT("(ack=%" PRIu64 ") ", ackno);
-trunc:
-	return;
 }
 
 static u_int dccp_print_option(netdissect_options *, const u_char *, u_int);
@@ -299,8 +290,8 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 	if (cp > ndo->ndo_snapend)
 		goto trunc;
 	if (len < sizeof(struct dccp_hdr)) {
-		ND_PRINT("truncated-dccp - %u bytes missing!",
-			 (u_int)sizeof(struct dccp_hdr) - len);
+		ND_PRINT("truncated-dccp - %zu bytes missing!",
+			 sizeof(struct dccp_hdr) - len);
 		return;
 	}
 
@@ -319,12 +310,12 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 
 	if (ip6) {
 		ND_PRINT("%s.%u > %s.%u: ",
-			  ip6addr_string(ndo, ip6->ip6_src), sport,
-			  ip6addr_string(ndo, ip6->ip6_dst), dport);
+			  GET_IP6ADDR_STRING(ip6->ip6_src), sport,
+			  GET_IP6ADDR_STRING(ip6->ip6_dst), dport);
 	} else {
 		ND_PRINT("%s.%u > %s.%u: ",
-			  ipaddr_string(ndo, ip->ip_src), sport,
-			  ipaddr_string(ndo, ip->ip_dst), dport);
+			  GET_IPADDR_STRING(ip->ip_src), sport,
+			  GET_IPADDR_STRING(ip->ip_dst), dport);
 	}
 
 	nd_print_protocol_caps(ndo);
@@ -340,7 +331,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 
 	/* other variables in generic header */
 	if (ndo->ndo_vflag) {
-		ND_PRINT(" (CCVal %u, CsCov %u, ", DCCPH_CCVAL(dh), DCCPH_CSCOV(dh));
+		ND_PRINT(" (CCVal %u, CsCov %u", DCCPH_CCVAL(dh), DCCPH_CSCOV(dh));
 	}
 
 	/* checksum calculation */
@@ -348,7 +339,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 		uint16_t sum = 0, dccp_sum;
 
 		dccp_sum = GET_BE_U_2(dh->dccph_checksum);
-		ND_PRINT("cksum 0x%04x ", dccp_sum);
+		ND_PRINT(", cksum 0x%04x ", dccp_sum);
 		if (IP_V(ip) == 4)
 			sum = dccp_cksum(ndo, ip, dh, len);
 		else if (IP_V(ip) == 6)
@@ -514,7 +505,6 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 	return;
 trunc:
 	nd_print_trunc(ndo);
-	return;
 }
 
 static const struct tok dccp_option_values[] = {
@@ -542,10 +532,7 @@ dccp_print_option(netdissect_options *ndo, const u_char *option, u_int hlen)
 {
 	uint8_t optlen, i;
 
-	ND_TCHECK_1(option);
-
 	if (GET_U_1(option) >= 32) {
-		ND_TCHECK_1(option + 1);
 		optlen = GET_U_1(option + 1);
 		if (optlen < 2) {
 			if (GET_U_1(option) >= 128)