DNS: Sync types with IANA

[tcpdump] / print-rip.c

diff --git a/print-rip.c b/print-rip.c
index 47f0ac7c6bc3c47a9740286b7655897fda9f88d5..fca534fb100b4c41a094f61567f78e53bce2ea36 100644 (file)
--- a/print-rip.c
+++ b/print-rip.c
@@ -29,8 +29,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <stdio.h>
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -190,28 +188,28 @@ rip_entry_print_v1(netdissect_options *ndo, const u_char *p,
        if (remaining < RIP_ROUTELEN)
                return (0);
        ND_TCHECK_SIZE(ni);
-       family = EXTRACT_BE_U_2(ni->rip_family);
+       family = GET_BE_U_2(ni->rip_family);
        if (family != BSD_AFNUM_INET && family != 0) {
                ND_PRINT("\n\t AFI %s, ", tok2str(bsd_af_values, "Unknown (%u)", family));
                print_unknown_data(ndo, p + sizeof(*eh), "\n\t  ", RIP_ROUTELEN - sizeof(*eh));
                return (RIP_ROUTELEN);
        }
-       if (EXTRACT_BE_U_2(ni->rip_mbz1) ||
-           EXTRACT_BE_U_4(ni->rip_mbz2) ||
-           EXTRACT_BE_U_4(ni->rip_mbz3)) {
+       if (GET_BE_U_2(ni->rip_mbz1) ||
+           GET_BE_U_4(ni->rip_mbz2) ||
+           GET_BE_U_4(ni->rip_mbz3)) {
                /* MBZ fields not zero */
                print_unknown_data(ndo, p, "\n\t  ", RIP_ROUTELEN);
                return (RIP_ROUTELEN);
        }
        if (family == 0) {
                ND_PRINT("\n\t  AFI 0, %s, metric: %u",
-                        ipaddr_string(ndo, ni->rip_dest),
-                        EXTRACT_BE_U_4(ni->rip_metric));
+                        GET_IPADDR_STRING(ni->rip_dest),
+                        GET_BE_U_4(ni->rip_metric));
                return (RIP_ROUTELEN);
        } /* BSD_AFNUM_INET */
        ND_PRINT("\n\t  %s, metric: %u",
-                ipaddr_string(ndo, ni->rip_dest),
-                EXTRACT_BE_U_4(ni->rip_metric));
+                GET_IPADDR_STRING(ni->rip_dest),
+                GET_BE_U_4(ni->rip_metric));
        return (RIP_ROUTELEN);
 trunc:
        return 0;
@@ -228,16 +226,15 @@ rip_entry_print_v2(netdissect_options *ndo, const u_char *p,
        if (remaining < sizeof(*eh))
                return (0);
        ND_TCHECK_SIZE(eh);
-       family = EXTRACT_BE_U_2(eh->rip_family);
+       family = GET_BE_U_2(eh->rip_family);
        if (family == 0xFFFF) { /* variable-sized authentication structures */
-               uint16_t auth_type = EXTRACT_BE_U_2(eh->rip_tag);
+               uint16_t auth_type = GET_BE_U_2(eh->rip_tag);
 
                p += sizeof(*eh);
                remaining -= sizeof(*eh);
                if (auth_type == 2) {
                        ND_PRINT("\n\t  Simple Text Authentication data: ");
-                       if (nd_printzp(ndo, p, RIP_AUTHLEN, p + remaining))
-                               return (0);
+                       nd_printjnp(ndo, p, RIP_AUTHLEN);
                } else if (auth_type == 3) {
                        const struct rip_auth_crypto_v2 *ch;
 
@@ -246,12 +243,14 @@ rip_entry_print_v2(netdissect_options *ndo, const u_char *p,
                        if (remaining < sizeof(*ch))
                                return (0);
                        ND_PRINT("\n\t  Auth header:");
-                       ND_PRINT(" Packet Len %u,", EXTRACT_BE_U_2(ch->rip_packet_len));
-                       ND_PRINT(" Key-ID %u,", EXTRACT_U_1(ch->rip_key_id));
-                       ND_PRINT(" Auth Data Len %u,", EXTRACT_U_1(ch->rip_auth_data_len));
-                       ND_PRINT(" SeqNo %u,", EXTRACT_BE_U_4(ch->rip_seq_num));
-                       ND_PRINT(" MBZ %u,", EXTRACT_BE_U_4(ch->rip_mbz1));
-                       ND_PRINT(" MBZ %u", EXTRACT_BE_U_4(ch->rip_mbz2));
+                       ND_PRINT(" Packet Len %u,",
+                                GET_BE_U_2(ch->rip_packet_len));
+                       ND_PRINT(" Key-ID %u,", GET_U_1(ch->rip_key_id));
+                       ND_PRINT(" Auth Data Len %u,",
+                                GET_U_1(ch->rip_auth_data_len));
+                       ND_PRINT(" SeqNo %u,", GET_BE_U_4(ch->rip_seq_num));
+                       ND_PRINT(" MBZ %u,", GET_BE_U_4(ch->rip_mbz1));
+                       ND_PRINT(" MBZ %u", GET_BE_U_4(ch->rip_mbz2));
                } else if (auth_type == 1) {
                        ND_PRINT("\n\t  Auth trailer:");
                        print_unknown_data(ndo, p, "\n\t  ", remaining);
@@ -272,12 +271,12 @@ rip_entry_print_v2(netdissect_options *ndo, const u_char *p,
                        return (0);
                ND_PRINT("\n\t  AFI %s, %15s/%-2d, tag 0x%04x, metric: %u, next-hop: ",
                         tok2str(bsd_af_values, "%u", family),
-                        ipaddr_string(ndo, ni->rip_dest),
-                        mask2plen(EXTRACT_BE_U_4(ni->rip_dest_mask)),
-                        EXTRACT_BE_U_2(ni->rip_tag),
-                        EXTRACT_BE_U_4(ni->rip_metric));
-               if (EXTRACT_BE_U_4(ni->rip_router))
-                       ND_PRINT("%s", ipaddr_string(ndo, ni->rip_router));
+                        GET_IPADDR_STRING(ni->rip_dest),
+                        mask2plen(GET_BE_U_4(ni->rip_dest_mask)),
+                        GET_BE_U_2(ni->rip_tag),
+                        GET_BE_U_4(ni->rip_metric));
+               if (GET_BE_U_4(ni->rip_router))
+                       ND_PRINT("%s", GET_IPADDR_STRING(ni->rip_router));
                else
                        ND_PRINT("self");
        }
@@ -301,7 +300,7 @@ rip_print(netdissect_options *ndo,
                nd_print_trunc(ndo);
                return;
        }
-       len = ndo->ndo_snapend - dat;
+       len = ND_BYTES_AVAILABLE_AFTER(dat);
        if (len > length)
                len = length;
        if (len < sizeof(*rp)) {
@@ -313,7 +312,7 @@ rip_print(netdissect_options *ndo,
        rp = (const struct rip *)dat;
 
        ND_TCHECK_SIZE(rp);
-       vers = EXTRACT_U_1(rp->rip_vers);
+       vers = GET_U_1(rp->rip_vers);
        ND_PRINT("%sRIPv%u",
                 (ndo->ndo_vflag >= 1) ? "\n\t" : "",
                 vers);
@@ -335,7 +334,7 @@ rip_print(netdissect_options *ndo,
        }
 
        /* dump version and lets see if we know the commands name*/
-       cmd = EXTRACT_U_1(rp->rip_cmd);
+       cmd = GET_U_1(rp->rip_cmd);
        ND_PRINT(", %s, length: %u",
                tok2str(rip_cmd_values, "unknown command (%u)", cmd),
                length);