Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / print-sunrpc.c

diff --git a/print-sunrpc.c b/print-sunrpc.c
index 2589dfd708a0a615ce4c40be6553a033a95e871a..bc7138de5d53c3acfbdeeac275b5dc8ff4af7f8b 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,7 +51,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 
@@ -132,23 +133,23 @@
  * The service supports remote procedure calls on udp/ip or tcp/ip socket 111.
  */
 
-#define SUNRPC_PMAPPORT                ((u_int16_t)111)
-#define SUNRPC_PMAPPROG                ((u_int32_t)100000)
-#define SUNRPC_PMAPVERS                ((u_int32_t)2)
-#define SUNRPC_PMAPVERS_PROTO  ((u_int32_t)2)
-#define SUNRPC_PMAPVERS_ORIG   ((u_int32_t)1)
-#define SUNRPC_PMAPPROC_NULL   ((u_int32_t)0)
-#define SUNRPC_PMAPPROC_SET    ((u_int32_t)1)
-#define SUNRPC_PMAPPROC_UNSET  ((u_int32_t)2)
-#define SUNRPC_PMAPPROC_GETPORT        ((u_int32_t)3)
-#define SUNRPC_PMAPPROC_DUMP   ((u_int32_t)4)
-#define SUNRPC_PMAPPROC_CALLIT ((u_int32_t)5)
+#define SUNRPC_PMAPPORT                ((uint16_t)111)
+#define SUNRPC_PMAPPROG                ((uint32_t)100000)
+#define SUNRPC_PMAPVERS                ((uint32_t)2)
+#define SUNRPC_PMAPVERS_PROTO  ((uint32_t)2)
+#define SUNRPC_PMAPVERS_ORIG   ((uint32_t)1)
+#define SUNRPC_PMAPPROC_NULL   ((uint32_t)0)
+#define SUNRPC_PMAPPROC_SET    ((uint32_t)1)
+#define SUNRPC_PMAPPROC_UNSET  ((uint32_t)2)
+#define SUNRPC_PMAPPROC_GETPORT        ((uint32_t)3)
+#define SUNRPC_PMAPPROC_DUMP   ((uint32_t)4)
+#define SUNRPC_PMAPPROC_CALLIT ((uint32_t)5)
 
 struct sunrpc_pmap {
-       u_int32_t pm_prog;
-       u_int32_t pm_vers;
-       u_int32_t pm_prot;
-       u_int32_t pm_port;
+       uint32_t pm_prog;
+       uint32_t pm_vers;
+       uint32_t pm_prot;
+       uint32_t pm_port;
 };
 
 static const struct tok proc2str[] = {
@@ -162,7 +163,7 @@ static const struct tok proc2str[] = {
 };
 
 /* Forwards */
-static char *progstr(u_int32_t);
+static char *progstr(uint32_t);
 
 void
 sunrpcrequest_print(netdissect_options *ndo, register const u_char *bp,
@@ -173,7 +174,7 @@ sunrpcrequest_print(netdissect_options *ndo, register const u_char *bp,
 #ifdef INET6
        register const struct ip6_hdr *ip6;
 #endif
-       u_int32_t x;
+       uint32_t x;
        char srcid[20], dstid[20];      /*fits 32bit*/
 
        rp = (struct sunrpc_msg *)bp;
@@ -192,15 +193,15 @@ sunrpcrequest_print(netdissect_options *ndo, register const u_char *bp,
        case 4:
                ip = (struct ip *)bp2;
                ND_PRINT((ndo, "%s.%s > %s.%s: %d",
-                   ipaddr_string(&ip->ip_src), srcid,
-                   ipaddr_string(&ip->ip_dst), dstid, length));
+                   ipaddr_string(ndo, &ip->ip_src), srcid,
+                   ipaddr_string(ndo, &ip->ip_dst), dstid, length));
                break;
 #ifdef INET6
        case 6:
                ip6 = (struct ip6_hdr *)bp2;
                ND_PRINT((ndo, "%s.%s > %s.%s: %d",
-                   ip6addr_string(&ip6->ip6_src), srcid,
-                   ip6addr_string(&ip6->ip6_dst), dstid, length));
+                   ip6addr_string(ndo, &ip6->ip6_src), srcid,
+                   ip6addr_string(ndo, &ip6->ip6_dst), dstid, length));
                break;
 #endif
        default:
@@ -231,14 +232,13 @@ sunrpcrequest_print(netdissect_options *ndo, register const u_char *bp,
 }
 
 static char *
-progstr(prog)
-       u_int32_t prog;
+progstr(uint32_t prog)
 {
 #if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
        register struct rpcent *rp;
 #endif
        static char buf[32];
-       static u_int32_t lastprog = 0;
+       static uint32_t lastprog = 0;
 
        if (lastprog != 0 && prog == lastprog)
                return (buf);