Use nd_ types, add EXTRACT_ calls, clean up signed vs. unsigned.

[tcpdump] / print-arp.c

diff --git a/print-arp.c b/print-arp.c
index 3f09d63cb4578c1a49cb54c3569a5ebeb6e5fb2f..7409099fad587b0b711c13b3d14b085d6f9ea2b9 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -19,25 +19,22 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.56 2002-09-04 10:11:44 guy Exp $ (LBL)";
-#endif
+/* \summary: Address Resolution Protocol (ARP) printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include <stdio.h>

 #include <string.h>
 
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "addrtoname.h"

-#include "ether.h"

 #include "ethertype.h"
 #include "ethertype.h"

-#include "extract.h"                   /* must come after interface.h */
+#include "extract.h"
+
+static const char tstr[] = "[|ARP]";

 
 /*
  * Address Resolution Protocol.
 
 /*
  * Address Resolution Protocol.


@@ -49,245 +46,434 @@ static const char rcsid[] =
  * arp_tha and arp_tpa in that order, according to the lengths
  * specified.  Field names used correspond to RFC 826.
  */
  * arp_tha and arp_tpa in that order, according to the lengths
  * specified.  Field names used correspond to RFC 826.
  */

-struct arp_pkthdr {
-       u_short ar_hrd;         /* format of hardware address */
-#define ARPHRD_ETHER   1       /* ethernet hardware format */
-#define ARPHRD_IEEE802 6       /* token-ring hardware format */
-#define ARPHRD_ARCNET  7       /* arcnet hardware format */
-#define ARPHRD_FRELAY  15      /* frame relay hardware format */
-#define ARPHRD_STRIP   23      /* Ricochet Starmode Radio hardware format */
-#define ARPHRD_IEEE1394        24      /* IEEE 1394 (FireWire) hardware format */
-       u_short ar_pro;         /* format of protocol address */
-       u_char  ar_hln;         /* length of hardware address */
-       u_char  ar_pln;         /* length of protocol address */
-       u_short ar_op;          /* one of: */
-#define        ARPOP_REQUEST   1       /* request to resolve address */
-#define        ARPOP_REPLY     2       /* response to previous request */
-#define        ARPOP_REVREQUEST 3      /* request protocol address given hardware */
-#define        ARPOP_REVREPLY  4       /* response giving protocol address */
-#define ARPOP_INVREQUEST 8     /* request to identify peer */
-#define ARPOP_INVREPLY 9       /* response identifying peer */
+struct  arp_pkthdr {
+        nd_uint16_t ar_hrd;     /* format of hardware address */
+#define ARPHRD_ETHER    1       /* ethernet hardware format */
+#define ARPHRD_IEEE802  6       /* token-ring hardware format */
+#define ARPHRD_ARCNET   7       /* arcnet hardware format */
+#define ARPHRD_FRELAY   15      /* frame relay hardware format */
+#define ARPHRD_ATM2225  19      /* ATM (RFC 2225) */
+#define ARPHRD_STRIP    23      /* Ricochet Starmode Radio hardware format */
+#define ARPHRD_IEEE1394 24      /* IEEE 1394 (FireWire) hardware format */
+        nd_uint16_t ar_pro;     /* format of protocol address */
+        nd_uint8_t  ar_hln;     /* length of hardware address */
+        nd_uint8_t  ar_pln;     /* length of protocol address */
+        nd_uint16_t ar_op;      /* one of: */
+#define ARPOP_REQUEST   1       /* request to resolve address */
+#define ARPOP_REPLY     2       /* response to previous request */
+#define ARPOP_REVREQUEST 3      /* request protocol address given hardware */
+#define ARPOP_REVREPLY  4       /* response giving protocol address */
+#define ARPOP_INVREQUEST 8      /* request to identify peer */
+#define ARPOP_INVREPLY  9       /* response identifying peer */
+#define ARPOP_NAK       10      /* NAK - only valif for ATM ARP */
+

 /*
  * The remaining fields are variable in size,
  * according to the sizes above.
  */
 #ifdef COMMENT_ONLY
 /*
  * The remaining fields are variable in size,
  * according to the sizes above.
  */
 #ifdef COMMENT_ONLY

-       u_char  ar_sha[];       /* sender hardware address */
-       u_char  ar_spa[];       /* sender protocol address */
-       u_char  ar_tha[];       /* target hardware address */
-       u_char  ar_tpa[];       /* target protocol address */
+       nd_byte         ar_sha[];       /* sender hardware address */
+       nd_byte         ar_spa[];       /* sender protocol address */
+       nd_byte         ar_tha[];       /* target hardware address */
+       nd_byte         ar_tpa[];       /* target protocol address */

 #endif
 #endif

-#define ar_sha(ap)     (((const u_char *)((ap)+1))+0)
-#define ar_spa(ap)     (((const u_char *)((ap)+1))+  (ap)->ar_hln)
-#define ar_tha(ap)     (((const u_char *)((ap)+1))+  (ap)->ar_hln+(ap)->ar_pln)
-#define ar_tpa(ap)     (((const u_char *)((ap)+1))+2*(ap)->ar_hln+(ap)->ar_pln)
+#define ar_sha(ap)     (((const u_char *)((ap)+1))+  0)
+#define ar_spa(ap)     (((const u_char *)((ap)+1))+  EXTRACT_U_1((ap)->ar_hln))
+#define ar_tha(ap)     (((const u_char *)((ap)+1))+  EXTRACT_U_1((ap)->ar_hln)+EXTRACT_U_1((ap)->ar_pln))
+#define ar_tpa(ap)     (((const u_char *)((ap)+1))+2*EXTRACT_U_1((ap)->ar_hln)+EXTRACT_U_1((ap)->ar_pln))

 };
 
 #define ARP_HDRLEN     8
 
 };
 
 #define ARP_HDRLEN     8
 

-#define HRD(ap) ((ap)->ar_hrd)
-#define HLN(ap) ((ap)->ar_hln)
-#define PLN(ap) ((ap)->ar_pln)
-#define OP(ap)  ((ap)->ar_op)
-#define PRO(ap) ((ap)->ar_pro)
+#define HRD(ap) EXTRACT_BE_U_2((ap)->ar_hrd)
+#define HRD_LEN(ap) EXTRACT_U_1((ap)->ar_hln)
+#define PROTO_LEN(ap) EXTRACT_U_1((ap)->ar_pln)
+#define OP(ap)  EXTRACT_BE_U_2((ap)->ar_op)
+#define PRO(ap) EXTRACT_BE_U_2((ap)->ar_pro)

 #define SHA(ap) (ar_sha(ap))
 #define SPA(ap) (ar_spa(ap))
 #define THA(ap) (ar_tha(ap))
 #define TPA(ap) (ar_tpa(ap))
 
 #define SHA(ap) (ar_sha(ap))
 #define SPA(ap) (ar_spa(ap))
 #define THA(ap) (ar_tha(ap))
 #define TPA(ap) (ar_tpa(ap))
 

+
+static const struct tok arpop_values[] = {
+    { ARPOP_REQUEST, "Request" },
+    { ARPOP_REPLY, "Reply" },
+    { ARPOP_REVREQUEST, "Reverse Request" },
+    { ARPOP_REVREPLY, "Reverse Reply" },
+    { ARPOP_INVREQUEST, "Inverse Request" },
+    { ARPOP_INVREPLY, "Inverse Reply" },
+    { ARPOP_NAK, "NACK Reply" },
+    { 0, NULL }
+};
+
+static const struct tok arphrd_values[] = {
+    { ARPHRD_ETHER, "Ethernet" },
+    { ARPHRD_IEEE802, "TokenRing" },
+    { ARPHRD_ARCNET, "ArcNet" },
+    { ARPHRD_FRELAY, "FrameRelay" },
+    { ARPHRD_STRIP, "Strip" },
+    { ARPHRD_IEEE1394, "IEEE 1394" },
+    { ARPHRD_ATM2225, "ATM" },
+    { 0, NULL }
+};
+

 /*
  * ATM Address Resolution Protocol.
  *
 /*
  * ATM Address Resolution Protocol.
  *

- * See RFC 2225 for protocol description.  ARP packets are variable
- * in size; the arphdr structure defines the fixed-length portion.
- * Protocol type values are the same as those for 10 Mb/s Ethernet.
- * It is followed by the variable-sized fields ar_sha, arp_spa,
- * arp_tha and arp_tpa in that order, according to the lengths
- * specified.  Field names used correspond to RFC 826.
+ * See RFC 2225 for protocol description.  ATMARP packets are similar
+ * to ARP packets, except that there are no length fields for the
+ * protocol address - instead, there are type/length fields for
+ * the ATM number and subaddress - and the hardware addresses consist
+ * of an ATM number and an ATM subaddress.

  */
  */

-struct atmarp_pkthdr {
-       u_short ar_hrd;         /* format of hardware address */
-#define ARPHRD_ATM2225 19      /* ATM (RFC 2225) */
-       u_short ar_pro;         /* format of protocol address */
-       u_char  ar_shtl;        /* length of hardware address */
-       u_char  ar_sstl;        /* length of hardware address */
-       u_short ar_op;          /* same as regular ARP */
-       u_char  ar_spln;
-       u_char  ar_thtl;
-       u_char  ar_tstl;
-       u_char  ar_tpln;
+struct  atmarp_pkthdr {
+        nd_uint16_t aar_hrd;    /* format of hardware address */
+        nd_uint16_t aar_pro;    /* format of protocol address */
+        nd_uint8_t  aar_shtl;   /* length of source ATM number */
+        nd_uint8_t  aar_sstl;   /* length of source ATM subaddress */
+#define ATMARP_IS_E164  0x40    /* bit in type/length for E.164 format */
+#define ATMARP_LEN_MASK 0x3F    /* length of {sub}address in type/length */
+        nd_uint16_t aar_op;     /* same as regular ARP */
+        nd_uint8_t  aar_spln;   /* length of source protocol address */
+        nd_uint8_t  aar_thtl;   /* length of target ATM number */
+        nd_uint8_t  aar_tstl;   /* length of target ATM subaddress */
+        nd_uint8_t  aar_tpln;   /* length of target protocol address */

 /*
  * The remaining fields are variable in size,
  * according to the sizes above.
  */
 #ifdef COMMENT_ONLY
 /*
  * The remaining fields are variable in size,
  * according to the sizes above.
  */
 #ifdef COMMENT_ONLY

-       u_char  ar_sha[];       /* sender hardware address */
-       u_char  ar_spa[];       /* sender protocol address */
-       u_char  ar_tha[];       /* target hardware address */
-       u_char  ar_tpa[];       /* target protocol address */
+       nd_byte         aar_sha[];      /* source ATM number */
+       nd_byte         aar_ssa[];      /* source ATM subaddress */
+       nd_byte         aar_spa[];      /* sender protocol address */
+       nd_byte         aar_tha[];      /* target ATM number */
+       nd_byte         aar_tsa[];      /* target ATM subaddress */
+       nd_byte         aar_tpa[];      /* target protocol address */

 #endif
 #endif

-#define ar_sha(ap)     (((const u_char *)((ap)+1))+0)
-#define ar_spa(ap)     (((const u_char *)((ap)+1))+  (ap)->ar_hln)
-#define ar_tha(ap)     (((const u_char *)((ap)+1))+  (ap)->ar_hln+(ap)->ar_pln)
-#define ar_tpa(ap)     (((const u_char *)((ap)+1))+2*(ap)->ar_hln+(ap)->ar_pln)
+
+#define ATMHRD(ap)  EXTRACT_BE_U_2((ap)->aar_hrd)
+#define ATMSHRD_LEN(ap) (EXTRACT_U_1((ap)->aar_shtl) & ATMARP_LEN_MASK)
+#define ATMSSLN(ap) (EXTRACT_U_1((ap)->aar_sstl) & ATMARP_LEN_MASK)
+#define ATMSPROTO_LEN(ap) EXTRACT_U_1((ap)->aar_spln)
+#define ATMOP(ap)   EXTRACT_BE_U_2((ap)->aar_op)
+#define ATMPRO(ap)  EXTRACT_BE_U_2((ap)->aar_pro)
+#define ATMTHRD_LEN(ap) (EXTRACT_U_1((ap)->aar_thtl) & ATMARP_LEN_MASK)
+#define ATMTSLN(ap) (EXTRACT_U_1((ap)->aar_tstl) & ATMARP_LEN_MASK)
+#define ATMTPROTO_LEN(ap) EXTRACT_U_1((ap)->aar_tpln)
+#define aar_sha(ap)    ((const u_char *)((ap)+1))
+#define aar_ssa(ap)    (aar_sha(ap) + ATMSHRD_LEN(ap))
+#define aar_spa(ap)    (aar_ssa(ap) + ATMSSLN(ap))
+#define aar_tha(ap)    (aar_spa(ap) + ATMSPROTO_LEN(ap))
+#define aar_tsa(ap)    (aar_tha(ap) + ATMTHRD_LEN(ap))
+#define aar_tpa(ap)    (aar_tsa(ap) + ATMTSLN(ap))

 };
 
 };
 

-static u_char ezero[6];
+#define ATMSHA(ap) (aar_sha(ap))
+#define ATMSSA(ap) (aar_ssa(ap))
+#define ATMSPA(ap) (aar_spa(ap))
+#define ATMTHA(ap) (aar_tha(ap))
+#define ATMTSA(ap) (aar_tsa(ap))
+#define ATMTPA(ap) (aar_tpa(ap))
+
+static int
+isnonzero(const u_char *a, size_t len)
+{
+       while (len > 0) {
+               if (EXTRACT_U_1(a) != 0)
+                       return (1);
+               a++;
+               len--;
+       }
+       return (0);
+}
+
+static void
+tpaddr_print_ip(netdissect_options *ndo,
+               const struct arp_pkthdr *ap, u_short pro)
+{
+       if (pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL)
+               ND_PRINT((ndo, "<wrong proto type>"));
+       else if (PROTO_LEN(ap) != 4)
+               ND_PRINT((ndo, "<wrong len>"));
+       else
+               ND_PRINT((ndo, "%s", ipaddr_string(ndo, TPA(ap))));
+}

 
 static void
 
 static void

-atmarp_print(const u_char *bp, u_int length, u_int caplen)
+spaddr_print_ip(netdissect_options *ndo,
+               const struct arp_pkthdr *ap, u_short pro)

 {
 {

-       const struct arp_pkthdr *ap;
+       if (pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL)
+               ND_PRINT((ndo, "<wrong proto type>"));
+       else if (PROTO_LEN(ap) != 4)
+               ND_PRINT((ndo, "<wrong len>"));
+       else
+               ND_PRINT((ndo, "%s", ipaddr_string(ndo, SPA(ap))));
+}
+
+static void
+atmarp_addr_print(netdissect_options *ndo,
+                 const u_char *ha, u_int ha_len, const u_char *srca,
+    u_int srca_len)
+{
+       if (ha_len == 0)
+               ND_PRINT((ndo, "<No address>"));
+       else {
+               ND_PRINT((ndo, "%s", linkaddr_string(ndo, ha, LINKADDR_ATM, ha_len)));
+               if (srca_len != 0)
+                       ND_PRINT((ndo, ",%s",
+                                 linkaddr_string(ndo, srca, LINKADDR_ATM, srca_len)));
+       }
+}
+
+static void
+atmarp_tpaddr_print(netdissect_options *ndo,
+                   const struct atmarp_pkthdr *ap, u_short pro)
+{
+       if (pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL)
+               ND_PRINT((ndo, "<wrong proto type>"));
+       else if (ATMTPROTO_LEN(ap) != 4)
+               ND_PRINT((ndo, "<wrong tplen>"));
+       else
+               ND_PRINT((ndo, "%s", ipaddr_string(ndo, ATMTPA(ap))));
+}
+
+static void
+atmarp_spaddr_print(netdissect_options *ndo,
+                   const struct atmarp_pkthdr *ap, u_short pro)
+{
+       if (pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL)
+               ND_PRINT((ndo, "<wrong proto type>"));
+       else if (ATMSPROTO_LEN(ap) != 4)
+               ND_PRINT((ndo, "<wrong splen>"));
+       else
+               ND_PRINT((ndo, "%s", ipaddr_string(ndo, ATMSPA(ap))));
+}
+
+static void
+atmarp_print(netdissect_options *ndo,
+            const u_char *bp, u_int length, u_int caplen)
+{
+       const struct atmarp_pkthdr *ap;

        u_short pro, hrd, op;
 
        u_short pro, hrd, op;
 

-       ap = (const struct arp_pkthdr *)bp;
-       TCHECK(*ap);
-       if ((const u_char *)(ar_tpa(ap) + PLN(ap)) > snapend) {
-               (void)printf("truncated-arp");
-               default_print((const u_char *)ap, length);
+       ap = (const struct atmarp_pkthdr *)bp;
+       ND_TCHECK(*ap);
+
+       hrd = ATMHRD(ap);
+       pro = ATMPRO(ap);
+       op = ATMOP(ap);
+
+       if (!ND_TTEST_LEN(aar_tpa(ap), ATMTPROTO_LEN(ap))) {
+               ND_PRINT((ndo, "%s", tstr));
+               ND_DEFAULTPRINT((const u_char *)ap, length);

                return;
        }
 
                return;
        }
 

-       hrd = EXTRACT_16BITS(&HRD(ap));
-       if (hrd == ARPHRD_ATM2225)
-               atmarp_print(bp, length, caplen);
-       pro = EXTRACT_16BITS(&PRO(ap));
-       op = EXTRACT_16BITS(&OP(ap));
+        if (!ndo->ndo_eflag) {
+            ND_PRINT((ndo, "ARP, "));
+        }

 
        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
 
        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||

-           PLN(ap) != 4 || HLN(ap) == 0) {
-               (void)printf("arp-#%d for proto #%d (%d) hardware #%d (%d)",
-                               op, pro, PLN(ap), hrd, HLN(ap));
-               return;
+           ATMSPROTO_LEN(ap) != 4 ||
+            ATMTPROTO_LEN(ap) != 4 ||
+            ndo->ndo_vflag) {
+                ND_PRINT((ndo, "%s, %s (len %u/%u)",
+                          tok2str(arphrd_values, "Unknown Hardware (%u)", hrd),
+                          tok2str(ethertype_values, "Unknown Protocol (0x%04x)", pro),
+                          ATMSPROTO_LEN(ap),
+                          ATMTPROTO_LEN(ap)));
+
+                /* don't know know about the address formats */
+                if (!ndo->ndo_vflag) {
+                    goto out;
+                }

        }
        }

-       if (pro == ETHERTYPE_TRAIL)
-               (void)printf("trailer-");
+
+        /* print operation */
+        ND_PRINT((ndo, "%s%s ",
+               ndo->ndo_vflag ? ", " : "",
+               tok2str(arpop_values, "Unknown (%u)", op)));
+

        switch (op) {
 
        case ARPOP_REQUEST:
        switch (op) {
 
        case ARPOP_REQUEST:

-               (void)printf("arp who-has %s", ipaddr_string(TPA(ap)));
-               if (memcmp((const char *)ezero, (const char *)THA(ap), HLN(ap)) != 0)
-                       (void)printf(" (%s)",
-                           linkaddr_string(THA(ap), HLN(ap)));
-               (void)printf(" tell %s", ipaddr_string(SPA(ap)));
+               ND_PRINT((ndo, "who-has "));
+               atmarp_tpaddr_print(ndo, ap, pro);
+               if (ATMTHRD_LEN(ap) != 0) {
+                       ND_PRINT((ndo, " ("));
+                       atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap),
+                           ATMTSA(ap), ATMTSLN(ap));
+                       ND_PRINT((ndo, ")"));
+               }
+               ND_PRINT((ndo, " tell "));
+               atmarp_spaddr_print(ndo, ap, pro);

                break;
 
        case ARPOP_REPLY:
                break;
 
        case ARPOP_REPLY:

-               (void)printf("arp reply %s", ipaddr_string(SPA(ap)));
-               (void)printf(" is-at %s", linkaddr_string(SHA(ap), HLN(ap)));
-               break;
-
-       case ARPOP_REVREQUEST:
-               (void)printf("rarp who-is %s tell %s",
-                       linkaddr_string(THA(ap), HLN(ap)),
-                       linkaddr_string(SHA(ap), HLN(ap)));
-               break;
-
-       case ARPOP_REVREPLY:
-               (void)printf("rarp reply %s at %s",
-                       linkaddr_string(THA(ap), HLN(ap)),
-                       ipaddr_string(TPA(ap)));
+               atmarp_spaddr_print(ndo, ap, pro);
+               ND_PRINT((ndo, " is-at "));
+               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
+                                  ATMSSLN(ap));

                break;
 
        case ARPOP_INVREQUEST:
                break;
 
        case ARPOP_INVREQUEST:

-               (void)printf("invarp who-is %s tell %s",
-                       linkaddr_string(THA(ap), HLN(ap)),
-                       linkaddr_string(SHA(ap), HLN(ap)));
+               ND_PRINT((ndo, "who-is "));
+               atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap), ATMTSA(ap),
+                   ATMTSLN(ap));
+               ND_PRINT((ndo, " tell "));
+               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
+                   ATMSSLN(ap));

                break;
 
        case ARPOP_INVREPLY:
                break;
 
        case ARPOP_INVREPLY:

-               (void)printf("invarp reply %s at %s",
-                       linkaddr_string(THA(ap), HLN(ap)),
-                       ipaddr_string(TPA(ap)));
+               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
+                   ATMSSLN(ap));
+               ND_PRINT((ndo, "at "));
+               atmarp_spaddr_print(ndo, ap, pro);
+               break;
+
+       case ARPOP_NAK:
+               ND_PRINT((ndo, "for "));
+               atmarp_spaddr_print(ndo, ap, pro);

                break;
 
        default:
                break;
 
        default:

-               (void)printf("arp-#%d", op);
-               default_print((const u_char *)ap, caplen);
+               ND_DEFAULTPRINT((const u_char *)ap, caplen);

                return;
        }
                return;
        }

-       if (hrd != ARPHRD_ETHER)
-               printf(" hardware #%d", hrd);
-       return;
+
+ out:
+        ND_PRINT((ndo, ", length %u", length));
+        return;
+

 trunc:
 trunc:

-       (void)printf("[|arp]");
+       ND_PRINT((ndo, "%s", tstr));

 }
 
 void
 }
 
 void

-arp_print(const u_char *bp, u_int length, u_int caplen)
+arp_print(netdissect_options *ndo,
+         const u_char *bp, u_int length, u_int caplen)

 {
        const struct arp_pkthdr *ap;
 {
        const struct arp_pkthdr *ap;

-       u_short pro, hrd, op;
+       u_short pro, hrd, op, linkaddr;

 
        ap = (const struct arp_pkthdr *)bp;
 
        ap = (const struct arp_pkthdr *)bp;

-       TCHECK(*ap);
-       if ((const u_char *)(ar_tpa(ap) + PLN(ap)) > snapend) {
-               (void)printf("truncated-arp");
-               default_print((const u_char *)ap, length);
-               return;
+       ND_TCHECK(*ap);
+
+       hrd = HRD(ap);
+       pro = PRO(ap);
+       op = OP(ap);
+
+
+        /* if its ATM then call the ATM ARP printer
+           for Frame-relay ARP most of the fields
+           are similar to Ethernet so overload the Ethernet Printer
+           and set the linkaddr type for linkaddr_string(ndo, ) accordingly */
+
+        switch(hrd) {
+        case ARPHRD_ATM2225:
+            atmarp_print(ndo, bp, length, caplen);
+            return;
+        case ARPHRD_FRELAY:
+            linkaddr = LINKADDR_FRELAY;
+            break;
+        default:
+            linkaddr = LINKADDR_ETHER;
+            break;

        }
 
        }
 

-       hrd = EXTRACT_16BITS(&HRD(ap));
-       if (hrd == ARPHRD_ATM2225)
-               atmarp_print(bp, length, caplen);
-       pro = EXTRACT_16BITS(&PRO(ap));
-       op = EXTRACT_16BITS(&OP(ap));
-
-       if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
-           PLN(ap) != 4 || HLN(ap) == 0) {
-               (void)printf("arp-#%d for proto #%d (%d) hardware #%d (%d)",
-                               op, pro, PLN(ap), hrd, HLN(ap));
+       if (!ND_TTEST_LEN(TPA(ap), PROTO_LEN(ap))) {
+               ND_PRINT((ndo, "%s", tstr));
+               ND_DEFAULTPRINT((const u_char *)ap, length);

                return;
        }
                return;
        }

-       if (pro == ETHERTYPE_TRAIL)
-               (void)printf("trailer-");
+
+        if (!ndo->ndo_eflag) {
+            ND_PRINT((ndo, "ARP, "));
+        }
+
+        /* print hardware type/len and proto type/len */
+        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
+           PROTO_LEN(ap) != 4 ||
+            HRD_LEN(ap) == 0 ||
+            ndo->ndo_vflag) {
+            ND_PRINT((ndo, "%s (len %u), %s (len %u)",
+                      tok2str(arphrd_values, "Unknown Hardware (%u)", hrd),
+                      HRD_LEN(ap),
+                      tok2str(ethertype_values, "Unknown Protocol (0x%04x)", pro),
+                      PROTO_LEN(ap)));
+
+            /* don't know know about the address formats */
+            if (!ndo->ndo_vflag) {
+                goto out;
+            }
+       }
+
+        /* print operation */
+        ND_PRINT((ndo, "%s%s ",
+               ndo->ndo_vflag ? ", " : "",
+               tok2str(arpop_values, "Unknown (%u)", op)));
+

        switch (op) {
 
        case ARPOP_REQUEST:
        switch (op) {
 
        case ARPOP_REQUEST:

-               (void)printf("arp who-has %s", ipaddr_string(TPA(ap)));
-               if (memcmp((const char *)ezero, (const char *)THA(ap), HLN(ap)) != 0)
-                       (void)printf(" (%s)",
-                           linkaddr_string(THA(ap), HLN(ap)));
-               (void)printf(" tell %s", ipaddr_string(SPA(ap)));
+               ND_PRINT((ndo, "who-has "));
+               tpaddr_print_ip(ndo, ap, pro);
+               if (isnonzero((const u_char *)THA(ap), HRD_LEN(ap)))
+                       ND_PRINT((ndo, " (%s)",
+                                 linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap))));
+               ND_PRINT((ndo, " tell "));
+               spaddr_print_ip(ndo, ap, pro);

                break;
 
        case ARPOP_REPLY:
                break;
 
        case ARPOP_REPLY:

-               (void)printf("arp reply %s", ipaddr_string(SPA(ap)));
-               (void)printf(" is-at %s", linkaddr_string(SHA(ap), HLN(ap)));
+               spaddr_print_ip(ndo, ap, pro);
+               ND_PRINT((ndo, " is-at %s",
+                          linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));

                break;
 
        case ARPOP_REVREQUEST:
                break;
 
        case ARPOP_REVREQUEST:

-               (void)printf("rarp who-is %s tell %s",
-                       linkaddr_string(THA(ap), HLN(ap)),
-                       linkaddr_string(SHA(ap), HLN(ap)));
+               ND_PRINT((ndo, "who-is %s tell %s",
+                         linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)),
+                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));

                break;
 
        case ARPOP_REVREPLY:
                break;
 
        case ARPOP_REVREPLY:

-               (void)printf("rarp reply %s at %s",
-                       linkaddr_string(THA(ap), HLN(ap)),
-                       ipaddr_string(TPA(ap)));
+               ND_PRINT((ndo, "%s at ",
+                         linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap))));
+               tpaddr_print_ip(ndo, ap, pro);

                break;
 
        case ARPOP_INVREQUEST:
                break;
 
        case ARPOP_INVREQUEST:

-               (void)printf("invarp who-is %s tell %s",
-                       linkaddr_string(THA(ap), HLN(ap)),
-                       linkaddr_string(SHA(ap), HLN(ap)));
+               ND_PRINT((ndo, "who-is %s tell %s",
+                         linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)),
+                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));

                break;
 
        case ARPOP_INVREPLY:
                break;
 
        case ARPOP_INVREPLY:

-               (void)printf("invarp reply %s at %s",
-                       linkaddr_string(THA(ap), HLN(ap)),
-                       ipaddr_string(TPA(ap)));
+               ND_PRINT((ndo,"%s at ",
+                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));
+               spaddr_print_ip(ndo, ap, pro);

                break;
 
        default:
                break;
 
        default:

-               (void)printf("arp-#%d", op);
-               default_print((const u_char *)ap, caplen);
+               ND_DEFAULTPRINT((const u_char *)ap, caplen);

                return;
        }
                return;
        }

-       if (hrd != ARPHRD_ETHER)
-               printf(" hardware #%d", hrd);
+
+ out:
+        ND_PRINT((ndo, ", length %u", length));
+

        return;
 trunc:
        return;
 trunc:

-       (void)printf("[|arp]");
+       ND_PRINT((ndo, "%s", tstr));

 }
 }

+
+/*
+ * Local Variables:
+ * c-style: bsd
+ * End:
+ */
+