Add CONTRIBUTING file

[tcpdump] / print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index 9a5dba4313557ce2b318b832d8bf6a63aa5f44b8..a9edfb489a200af9d90d89da8fae5aa0d6055322 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -19,16 +19,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef INET6
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
@@ -67,15 +66,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 +108,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;