X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1cde6435df23876fb88998e38739def0dc7dca47..refs/pull/471/head:/print-ripng.c?ds=sidebyside

diff --git a/print-ripng.c b/print-ripng.c
index 9a5dba43..9bda0fd3 100644
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -19,16 +19,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef INET6
+#include <netdissect-stdinc.h>
 
-#include <tcpdump-stdinc.h>
-
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
@@ -67,15 +64,15 @@
 
 struct netinfo6 {
 	struct in6_addr	rip6_dest;
-	u_int16_t	rip6_tag;
-	u_int8_t	rip6_plen;
-	u_int8_t	rip6_metric;
+	uint16_t	rip6_tag;
+	uint8_t		rip6_plen;
+	uint8_t		rip6_metric;
 };
 
 struct	rip6 {
-	u_int8_t	rip6_cmd;
-	u_int8_t	rip6_vers;
-	u_int8_t	rip6_res1[2];
+	uint8_t		rip6_cmd;
+	uint8_t		rip6_vers;
+	uint8_t		rip6_res1[2];
 	union {
 		struct	netinfo6	ru6_nets[1];
 		char	ru6_tracefile[1];
@@ -109,7 +106,7 @@ rip6_entry_print(netdissect_options *ndo, register const struct netinfo6 *ni, in
 void
 ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 {
-	register const struct rip6 *rp = (struct rip6 *)dat;
+	register const struct rip6 *rp = (const struct rip6 *)dat;
 	register const struct netinfo6 *ni;
 	register u_int amt;
 	register u_int i;
@@ -173,4 +170,3 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 	if (rp->rip6_vers != RIP6_VERSION)
 		ND_PRINT((ndo, " [vers %d]", rp->rip6_vers));
 }
-#endif /* INET6 */