The third argument to linkaddr_string is one of the LINKADDR_ enums.

[tcpdump] / print-sunrpc.c

diff --git a/print-sunrpc.c b/print-sunrpc.c
index e1da350a19c080da218e47ddecb3b18cbfea4a7c..94b867075b543d6ef7ca4a37a4270efbae6f2536 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -19,8 +19,10 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: Sun Remote Procedure Call printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 /*
@@ -38,7 +40,7 @@
  */
 #undef _XOPEN_SOURCE_EXTENDED
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
 #include <rpc/rpc.h>
@@ -50,14 +52,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
 #include "ip.h"
-#ifdef INET6
 #include "ip6.h"
-#endif
 
 #include "rpc_auth.h"
 #include "rpc_msg.h"
@@ -144,13 +144,6 @@
 #define SUNRPC_PMAPPROC_DUMP   ((uint32_t)4)
 #define SUNRPC_PMAPPROC_CALLIT ((uint32_t)5)
 
-struct sunrpc_pmap {
-       uint32_t pm_prog;
-       uint32_t pm_vers;
-       uint32_t pm_prot;
-       uint32_t pm_port;
-};
-
 static const struct tok proc2str[] = {
        { SUNRPC_PMAPPROC_NULL,         "null" },
        { SUNRPC_PMAPPROC_SET,          "set" },
@@ -165,76 +158,78 @@ static const struct tok proc2str[] = {
 static char *progstr(uint32_t);
 
 void
-sunrpcrequest_print(netdissect_options *ndo, register const u_char *bp,
-                    register u_int length, register const u_char *bp2)
+sunrpc_print(netdissect_options *ndo, const u_char *bp,
+                    u_int length, const u_char *bp2)
 {
-       register const struct sunrpc_msg *rp;
-       register const struct ip *ip;
-#ifdef INET6
-       register const struct ip6_hdr *ip6;
-#endif
+       const struct sunrpc_msg *rp;
+       const struct ip *ip;
+       const struct ip6_hdr *ip6;
        uint32_t x;
        char srcid[20], dstid[20];      /*fits 32bit*/
 
+       ndo->ndo_protocol = "sunrpc";
        rp = (const struct sunrpc_msg *)bp;
+       ND_TCHECK_SIZE(rp);
 
        if (!ndo->ndo_nflag) {
                snprintf(srcid, sizeof(srcid), "0x%x",
-                   EXTRACT_32BITS(&rp->rm_xid));
+                   GET_BE_U_4(rp->rm_xid));
                strlcpy(dstid, "sunrpc", sizeof(dstid));
        } else {
                snprintf(srcid, sizeof(srcid), "0x%x",
-                   EXTRACT_32BITS(&rp->rm_xid));
+                   GET_BE_U_4(rp->rm_xid));
                snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT);
        }
 
        switch (IP_V((const struct ip *)bp2)) {
        case 4:
                ip = (const struct ip *)bp2;
-               ND_PRINT((ndo, "%s.%s > %s.%s: %d",
-                   ipaddr_string(ndo, &ip->ip_src), srcid,
-                   ipaddr_string(ndo, &ip->ip_dst), dstid, length));
+               ND_PRINT("%s.%s > %s.%s: %u",
+                   ipaddr_string(ndo, ip->ip_src), srcid,
+                   ipaddr_string(ndo, ip->ip_dst), dstid, length);
                break;
-#ifdef INET6
        case 6:
                ip6 = (const struct ip6_hdr *)bp2;
-               ND_PRINT((ndo, "%s.%s > %s.%s: %d",
-                   ip6addr_string(ndo, &ip6->ip6_src), srcid,
-                   ip6addr_string(ndo, &ip6->ip6_dst), dstid, length));
+               ND_PRINT("%s.%s > %s.%s: %u",
+                   ip6addr_string(ndo, ip6->ip6_src), srcid,
+                   ip6addr_string(ndo, ip6->ip6_dst), dstid, length);
                break;
-#endif
        default:
-               ND_PRINT((ndo, "%s.%s > %s.%s: %d", "?", srcid, "?", dstid, length));
+               ND_PRINT("%s.%s > %s.%s: %u", "?", srcid, "?", dstid, length);
                break;
        }
 
-       ND_PRINT((ndo, " %s", tok2str(proc2str, " proc #%u",
-           EXTRACT_32BITS(&rp->rm_call.cb_proc))));
-       x = EXTRACT_32BITS(&rp->rm_call.cb_rpcvers);
+       ND_PRINT(" %s", tok2str(proc2str, " proc #%u",
+           GET_BE_U_4(rp->rm_call.cb_proc)));
+       x = GET_BE_U_4(rp->rm_call.cb_rpcvers);
        if (x != 2)
-               ND_PRINT((ndo, " [rpcver %u]", x));
+               ND_PRINT(" [rpcver %u]", x);
 
-       switch (EXTRACT_32BITS(&rp->rm_call.cb_proc)) {
+       switch (GET_BE_U_4(rp->rm_call.cb_proc)) {
 
        case SUNRPC_PMAPPROC_SET:
        case SUNRPC_PMAPPROC_UNSET:
        case SUNRPC_PMAPPROC_GETPORT:
        case SUNRPC_PMAPPROC_CALLIT:
-               x = EXTRACT_32BITS(&rp->rm_call.cb_prog);
+               x = GET_BE_U_4(rp->rm_call.cb_prog);
                if (!ndo->ndo_nflag)
-                       ND_PRINT((ndo, " %s", progstr(x)));
+                       ND_PRINT(" %s", progstr(x));
                else
-                       ND_PRINT((ndo, " %u", x));
-               ND_PRINT((ndo, ".%u", EXTRACT_32BITS(&rp->rm_call.cb_vers)));
+                       ND_PRINT(" %u", x);
+               ND_PRINT(".%u", GET_BE_U_4(rp->rm_call.cb_vers));
                break;
        }
+       return;
+
+trunc:
+       nd_print_trunc(ndo);
 }
 
 static char *
 progstr(uint32_t prog)
 {
 #if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
-       register struct rpcent *rp;
+       struct rpcent *rp;
 #endif
        static char buf[32];
        static uint32_t lastprog = 0;