X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c5b61e83e3cadd855842e4ec009cf86193679130..refs/pull/703/head:/print-dvmrp.c

diff --git a/print-dvmrp.c b/print-dvmrp.c
index 0da9dbea..983b63b4 100644
--- a/print-dvmrp.c
+++ b/print-dvmrp.c
@@ -22,10 +22,10 @@
 /* \summary: Distance Vector Multicast Routing Protocol printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -73,6 +73,7 @@ dvmrp_print(netdissect_options *ndo,
 	u_char type;
 	uint8_t major_version, minor_version;
 
+	ndo->ndo_protocol = "dvmrp";
 	ep = ndo->ndo_snapend;
 	if (bp >= ep)
 		return;
@@ -156,7 +157,7 @@ dvmrp_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("[|dvmrp]");
+	nd_print_trunc(ndo);
 	return;
 }
 
@@ -234,8 +235,7 @@ print_probe(netdissect_options *ndo,
 		ND_PRINT(" [|}");
 		return (0);
 	}
-	genid = (EXTRACT_U_1(bp) << 24) | (EXTRACT_U_1(bp + 1) << 16) |
-		 (EXTRACT_U_1(bp + 2) << 8) | EXTRACT_U_1(bp + 3);
+	genid = EXTRACT_BE_U_4(bp);
 	bp += 4;
 	len -= 4;
 	ND_PRINT(ndo->ndo_vflag > 1 ? "\n\t" : " ");