Add program_name field in the netdissect_options structure

[tcpdump] / print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index 6bd47e67a3d13559cb79e1a96d8c885c7470a45f..764680770b30cfeaeba5688c626140de1b7c5fda 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -66,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];
@@ -97,7 +97,7 @@ static int
 rip6_entry_print(netdissect_options *ndo, register const struct netinfo6 *ni, int metric)
 {
        int l;
-       l = ND_PRINT((ndo, "%s/%d", ip6addr_string(&ni->rip6_dest), ni->rip6_plen));
+       l = ND_PRINT((ndo, "%s/%d", ip6addr_string(ndo, &ni->rip6_dest), ni->rip6_plen));
        if (ni->rip6_tag)
                l += ND_PRINT((ndo, " [%d]", EXTRACT_16BITS(&ni->rip6_tag)));
        if (metric)
@@ -108,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;