LWRES: Use more ND_TCHECK_n() macros

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index 0199ce0715da7244fcb3984018b91bda4812d07b..5d350f87280456bdffc1612c56161a52fd791467 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -31,10 +31,10 @@ __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -57,7 +57,7 @@ __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 
 static int tcp_verify_signature(netdissect_options *ndo,
                                 const struct ip *ip, const struct tcphdr *tp,
-                                const u_char *data, int length, const u_char *rcvsig);
+                                const u_char *data, u_int length, const u_char *rcvsig);
 #endif
 
 static void print_tcp_rst_data(netdissect_options *, const u_char *sp, u_int length);
@@ -180,7 +180,7 @@ tcp_print(netdissect_options *ndo,
         else
                 ip6 = NULL;
         ch = '\0';
-        if (!ND_TTEST(tp->th_dport)) {
+        if (!ND_TTEST_2(tp->th_dport)) {
                 ND_PRINT("%s > %s: [|tcp]",
                              ipaddr_string(ndo, &ip->ip_src),
                              ipaddr_string(ndo, &ip->ip_dst));
@@ -219,7 +219,7 @@ tcp_print(netdissect_options *ndo,
         hlen = TH_OFF(tp) * 4;
 
         if (hlen < sizeof(*tp)) {
-                ND_PRINT(" tcp %d [bad hdr length %u - too short, < %lu]",
+                ND_PRINT(" tcp %u [bad hdr length %u - too short, < %lu]",
                              length - hlen, hlen, (unsigned long)sizeof(*tp));
                 return;
         }
@@ -230,7 +230,7 @@ tcp_print(netdissect_options *ndo,
         urp = EXTRACT_BE_U_2(tp->th_urp);
 
         if (ndo->ndo_qflag) {
-                ND_PRINT("tcp %d", length - hlen);
+                ND_PRINT("tcp %u", length - hlen);
                 if (hlen > length) {
                         ND_PRINT(" [bad hdr length %u - too long, > %u]",
                                      hlen, length);
@@ -410,10 +410,10 @@ tcp_print(netdissect_options *ndo,
                 ND_PRINT(", ack %u", ack);
         }
 
-        ND_PRINT(", win %d", win);
+        ND_PRINT(", win %u", win);
 
         if (flags & TH_URG)
-                ND_PRINT(", urg %d", urp);
+                ND_PRINT(", urg %u", urp);
         /*
          * Handle any options.
          */
@@ -471,7 +471,7 @@ tcp_print(netdissect_options *ndo,
                                 } else {
                                         uint32_t s, e;
 
-                                        ND_PRINT(" %d ", datalen / 8);
+                                        ND_PRINT(" %u ", datalen / 8);
                                         for (i = 0; i < datalen; i += 8) {
                                                 LENCHECK(i + 4);
                                                 s = EXTRACT_BE_U_4(cp + i);
@@ -647,7 +647,7 @@ tcp_print(netdissect_options *ndo,
                         if (!ZEROLENOPT(opt))
                                 ++datalen;             /* size octet */
                         if (datalen != len)
-                                ND_PRINT("[len %d]", len);
+                                ND_PRINT("[len %u]", len);
                         ch = ',';
                         if (opt == TCPOPT_EOL)
                                 break;
@@ -748,7 +748,7 @@ tcp_print(netdissect_options *ndo,
                 if (fraglen > (length) - 4)
                         fraglen = (length) - 4;
                 rp = (const struct sunrpc_msg *)(bp + 4);
-                if (ND_TTEST(rp->rm_direction)) {
+                if (ND_TTEST_4(rp->rm_direction)) {
                         direction = (enum sunrpc_msg_type) EXTRACT_BE_U_4(rp->rm_direction);
                         if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                                 ND_PRINT(": NFS request xid %u ",
@@ -841,7 +841,7 @@ USES_APPLE_DEPRECATED_API
 static int
 tcp_verify_signature(netdissect_options *ndo,
                      const struct ip *ip, const struct tcphdr *tp,
-                     const u_char *data, int length, const u_char *rcvsig)
+                     const u_char *data, u_int length, const u_char *rcvsig)
 {
         struct tcphdr tp1;
         u_char sig[TCP_SIGLEN];