Update .gitignore for other configurations

[tcpdump] / print-sunrpc.c

diff --git a/print-sunrpc.c b/print-sunrpc.c
index dc08a2df3a5b29d25639565b97fa3619192f8fcc..f83f4eb92d31935272ace99ec0fb699a37676401 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -22,7 +22,7 @@
 /* \summary: Sun Remote Procedure Call printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 /*
@@ -40,7 +40,7 @@
  */
 #undef _XOPEN_SOURCE_EXTENDED
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
 #include <rpc/rpc.h>
@@ -167,33 +167,35 @@ sunrpc_print(netdissect_options *ndo, const u_char *bp,
        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",
+               nd_snprintf(srcid, sizeof(srcid), "0x%x",
                    EXTRACT_BE_U_4(rp->rm_xid));
                strlcpy(dstid, "sunrpc", sizeof(dstid));
        } else {
-               snprintf(srcid, sizeof(srcid), "0x%x",
+               nd_snprintf(srcid, sizeof(srcid), "0x%x",
                    EXTRACT_BE_U_4(rp->rm_xid));
-               snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT);
+               nd_snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT);
        }
 
        switch (IP_V((const struct ip *)bp2)) {
        case 4:
                ip = (const struct ip *)bp2;
-               ND_PRINT("%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;
        case 6:
                ip6 = (const struct ip6_hdr *)bp2;
-               ND_PRINT("%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;
        default:
-               ND_PRINT("%s.%s > %s.%s: %d", "?", srcid, "?", dstid, length);
+               ND_PRINT("%s.%s > %s.%s: %u", "?", srcid, "?", dstid, length);
                break;
        }
 
@@ -217,6 +219,10 @@ sunrpc_print(netdissect_options *ndo, const u_char *bp,
                ND_PRINT(".%u", EXTRACT_BE_U_4(rp->rm_call.cb_vers));
                break;
        }
+       return;
+
+trunc:
+       nd_print_trunc(ndo);
 }
 
 static char *
@@ -234,7 +240,7 @@ progstr(uint32_t prog)
        rp = getrpcbynumber(prog);
        if (rp == NULL)
 #endif
-               (void) snprintf(buf, sizeof(buf), "#%u", prog);
+               (void) nd_snprintf(buf, sizeof(buf), "#%u", prog);
 #if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
        else
                strlcpy(buf, rp->r_name, sizeof(buf));