Update .gitignore for other configurations

[tcpdump] / print-sunrpc.c

diff --git a/print-sunrpc.c b/print-sunrpc.c
index 74e9db384da130bd7a0b6869743972dd5810cee3..f83f4eb92d31935272ace99ec0fb699a37676401 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -167,7 +167,9 @@ 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) {
                nd_snprintf(srcid, sizeof(srcid), "0x%x",
@@ -183,14 +185,14 @@ sunrpc_print(netdissect_options *ndo, const u_char *bp,
        case 4:
                ip = (const struct ip *)bp2;
                ND_PRINT("%s.%s > %s.%s: %u",
-                   ipaddr_string(ndo, &ip->ip_src), srcid,
-                   ipaddr_string(ndo, &ip->ip_dst), dstid, length);
+                   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: %u",
-                   ip6addr_string(ndo, &ip6->ip6_src), srcid,
-                   ip6addr_string(ndo, &ip6->ip6_dst), dstid, length);
+                   ip6addr_string(ndo, ip6->ip6_src), srcid,
+                   ip6addr_string(ndo, ip6->ip6_dst), dstid, length);
                break;
        default:
                ND_PRINT("%s.%s > %s.%s: %u", "?", srcid, "?", dstid, length);
@@ -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 *