CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-arp.c

diff --git a/print-arp.c b/print-arp.c
index a06c1901a7c492e86d1cc1a92107ecd9d5eb6c03..950c3b24ef18d37bad7e84ca75bd4b10ebad2ae3 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -19,25 +19,18 @@
  * 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.57 2002-09-04 11:22:13 guy Exp $ (LBL)";
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: Address Resolution Protocol (ARP) printer */

 
 

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

 
 

-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#define ND_LONGJMP_FROM_TCHECK
+#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"
+

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


@@ -49,52 +42,80 @@ 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 */
+#define ARPHRD_INFINIBAND 32    /* InfiniBand RFC 4391 */
+        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 valid 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))+  GET_U_1((ap)->ar_hln))
+#define ar_tha(ap)     (((const u_char *)((ap)+1))+  GET_U_1((ap)->ar_hln)+GET_U_1((ap)->ar_pln))
+#define ar_tpa(ap)     (((const u_char *)((ap)+1))+2*GET_U_1((ap)->ar_hln)+GET_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) GET_BE_U_2((ap)->ar_hrd)
+#define HRD_LEN(ap) GET_U_1((ap)->ar_hln)
+#define PROTO_LEN(ap) GET_U_1((ap)->ar_pln)
+#define OP(ap)  GET_BE_U_2((ap)->ar_op)
+#define PRO(ap) GET_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" },
+    { ARPHRD_INFINIBAND, "InfiniBand" },
+    { 0, NULL }
+};
+

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


@@ -104,47 +125,45 @@ struct    arp_pkthdr {
  * the ATM number and subaddress - and the hardware addresses consist
  * of an ATM number and an ATM subaddress.
  */
  * the ATM number and subaddress - and the hardware addresses consist
  * of an ATM number and an ATM subaddress.
  */

-struct atmarp_pkthdr {
-       u_short aar_hrd;        /* format of hardware address */
-#define ARPHRD_ATM2225 19      /* ATM (RFC 2225) */
-       u_short aar_pro;        /* format of protocol address */
-       u_char  aar_shtl;       /* length of source ATM number */
-       u_char  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 */
-       u_short aar_op;         /* same as regular ARP */
-#define ATMARPOP_NAK   10      /* NAK */
-       u_char  aar_spln;       /* length of source protocol address */
-       u_char  aar_thtl;       /* length of target ATM number */
-       u_char  aar_tstl;       /* length of target ATM subaddress */
-       u_char  aar_tpln;       /* length of target protocol address */
+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  aar_sha[];      /* source ATM number */
-       u_char  aar_ssa[];      /* source ATM subaddress */
-       u_char  aar_spa[];      /* sender protocol address */
-       u_char  aar_tha[];      /* target ATM number */
-       u_char  aar_tsa[];      /* target ATM subaddress */
-       u_char  aar_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 ATMHRD(ap)  ((ap)->aar_hrd)
-#define ATMSHLN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK)
-#define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK)
-#define ATMSPLN(ap) ((ap)->aar_spln)
-#define ATMOP(ap)   ((ap)->aar_op)
-#define ATMPRO(ap)  ((ap)->aar_pro)
-#define ATMTHLN(ap) ((ap)->aar_thtl & ATMARP_LEN_MASK)
-#define ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK)
-#define ATMTPLN(ap) ((ap)->aar_tpln)
+#define ATMHRD(ap)  GET_BE_U_2((ap)->aar_hrd)
+#define ATMSHRD_LEN(ap) (GET_U_1((ap)->aar_shtl) & ATMARP_LEN_MASK)
+#define ATMSSLN(ap) (GET_U_1((ap)->aar_sstl) & ATMARP_LEN_MASK)
+#define ATMSPROTO_LEN(ap) GET_U_1((ap)->aar_spln)
+#define ATMOP(ap)   GET_BE_U_2((ap)->aar_op)
+#define ATMPRO(ap)  GET_BE_U_2((ap)->aar_pro)
+#define ATMTHRD_LEN(ap) (GET_U_1((ap)->aar_thtl) & ATMARP_LEN_MASK)
+#define ATMTSLN(ap) (GET_U_1((ap)->aar_tstl) & ATMARP_LEN_MASK)
+#define ATMTPROTO_LEN(ap) GET_U_1((ap)->aar_tpln)

 #define aar_sha(ap)    ((const u_char *)((ap)+1))
 #define aar_sha(ap)    ((const u_char *)((ap)+1))

-#define aar_ssa(ap)    (aar_sha(ap) + ATMSHLN(ap))
+#define aar_ssa(ap)    (aar_sha(ap) + ATMSHRD_LEN(ap))

 #define aar_spa(ap)    (aar_ssa(ap) + ATMSSLN(ap))
 #define aar_spa(ap)    (aar_ssa(ap) + ATMSSLN(ap))

-#define aar_tha(ap)    (aar_spa(ap) + ATMSPLN(ap))
-#define aar_tsa(ap)    (aar_tha(ap) + ATMTHLN(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))
 };
 
 #define aar_tpa(ap)    (aar_tsa(ap) + ATMTSLN(ap))
 };
 


@@ -155,184 +174,298 @@ struct  atmarp_pkthdr {
 #define ATMTSA(ap) (aar_tsa(ap))
 #define ATMTPA(ap) (aar_tpa(ap))
 
 #define ATMTSA(ap) (aar_tsa(ap))
 #define ATMTPA(ap) (aar_tpa(ap))
 

-static u_char ezero[6];
+static int
+isnonzero(netdissect_options *ndo, const u_char *a, size_t len)
+{
+       while (len != 0) {
+               if (GET_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("<wrong proto type>");
+       else if (PROTO_LEN(ap) != 4)
+               ND_PRINT("<wrong len>");
+       else
+               ND_PRINT("%s", GET_IPADDR_STRING(TPA(ap)));
+}
+
+static void
+spaddr_print_ip(netdissect_options *ndo,
+               const struct arp_pkthdr *ap, u_short pro)
+{
+       if (pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL)
+               ND_PRINT("<wrong proto type>");
+       else if (PROTO_LEN(ap) != 4)
+               ND_PRINT("<wrong len>");
+       else
+               ND_PRINT("%s", GET_IPADDR_STRING(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("<No address>");
+       else {
+               ND_PRINT("%s", GET_LINKADDR_STRING(ha, LINKADDR_ATM, ha_len));
+               if (srca_len != 0)
+                       ND_PRINT(",%s",
+                                 GET_LINKADDR_STRING(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("<wrong proto type>");
+       else if (ATMTPROTO_LEN(ap) != 4)
+               ND_PRINT("<wrong tplen>");
+       else
+               ND_PRINT("%s", GET_IPADDR_STRING(ATMTPA(ap)));
+}

 
 static void
 
 static void

-atmarp_addr_print(const u_char *ha, u_int ha_len, const u_char *sa,
-    u_int sa_len)
+atmarp_spaddr_print(netdissect_options *ndo,
+                   const struct atmarp_pkthdr *ap, u_short pro)

 {
 {

-       (void)printf("%s", linkaddr_string(ha, ha_len));
-       if (sa_len != 0)
-               (void)printf(",%s", linkaddr_string(sa, sa_len));
+       if (pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL)
+               ND_PRINT("<wrong proto type>");
+       else if (ATMSPROTO_LEN(ap) != 4)
+               ND_PRINT("<wrong splen>");
+       else
+               ND_PRINT("%s", GET_IPADDR_STRING(ATMSPA(ap)));

 }
 
 static void
 }
 
 static void

-atmarp_print(const u_char *bp, u_int length, u_int caplen)
+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;
 
        ap = (const struct atmarp_pkthdr *)bp;
 {
        const struct atmarp_pkthdr *ap;
        u_short pro, hrd, op;
 
        ap = (const struct atmarp_pkthdr *)bp;

-       TCHECK(*ap);
+       ND_TCHECK_SIZE(ap);

 
 

-       hrd = EXTRACT_16BITS(&ATMHRD(ap));
-       pro = EXTRACT_16BITS(&ATMPRO(ap));
-       op = EXTRACT_16BITS(&ATMOP(ap));
+       hrd = ATMHRD(ap);
+       pro = ATMPRO(ap);
+       op = ATMOP(ap);

 
 

-       if (!TTEST2(*aar_tpa(ap), ATMTPLN(ap))) {
-               (void)printf("truncated-atmarp");
-               default_print((const u_char *)ap, length);
-               return;
-       }
+       ND_TCHECK_LEN(ATMTPA(ap), ATMTPROTO_LEN(ap));
+
+        if (!ndo->ndo_eflag) {
+            ND_PRINT("ARP, ");
+        }

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

-           ATMSPLN(ap) != 4 || ATMTPLN(ap) != 4) {
-               (void)printf("atmarp-#%d for proto #%d (%d/%d) hardware #%d",
-                               op, pro, ATMSPLN(ap), ATMTPLN(ap), hrd);
-               return;
+           ATMSPROTO_LEN(ap) != 4 ||
+            ATMTPROTO_LEN(ap) != 4 ||
+            ndo->ndo_vflag) {
+                ND_PRINT("%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 about the address formats */
+                if (!ndo->ndo_vflag) {
+                    goto out;
+                }

        }
        }

-       if (pro == ETHERTYPE_TRAIL)
-               (void)printf("trailer-");
+
+        /* print operation */
+        ND_PRINT("%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(ATMTPA(ap)));
-               if (ATMTHLN(ap) != 0) {
-                       (void)printf(" (");
-                       atmarp_addr_print(ATMTHA(ap), ATMTHLN(ap),
+               ND_PRINT("who-has ");
+               atmarp_tpaddr_print(ndo, ap, pro);
+               if (ATMTHRD_LEN(ap) != 0) {
+                       ND_PRINT(" (");
+                       atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap),

                            ATMTSA(ap), ATMTSLN(ap));
                            ATMTSA(ap), ATMTSLN(ap));

-                       (void)printf(")");
+                       ND_PRINT(")");

                }
                }

-               (void)printf(" tell %s", ipaddr_string(ATMSPA(ap)));
+               ND_PRINT(" tell ");
+               atmarp_spaddr_print(ndo, ap, pro);

                break;
 
        case ARPOP_REPLY:
                break;
 
        case ARPOP_REPLY:

-               (void)printf("arp reply %s", ipaddr_string(ATMSPA(ap)));
-               (void)printf(" is-at ");
-               if (ATMSHLN(ap) != 0)
-                       atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap),
-                           ATMSSA(ap), ATMSSLN(ap));
-               else
-                       (void)printf("<No address>");
+               atmarp_spaddr_print(ndo, ap, pro);
+               ND_PRINT(" 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 ");
-               if (ATMTHLN(ap) != 0)
-                       atmarp_addr_print(ATMTHA(ap), ATMTHLN(ap),
-                           ATMTSA(ap), ATMTSLN(ap));
-               else
-                       (void)printf("<No address>");
-               (void)printf(" tell ");
-               if (ATMSHLN(ap) != 0)
-                       atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap),
-                           ATMSSA(ap), ATMSSLN(ap));
-               else
-                       (void)printf("<No address>");
+               ND_PRINT("who-is ");
+               atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap), ATMTSA(ap),
+                   ATMTSLN(ap));
+               ND_PRINT(" 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 ");
-               if (ATMSHLN(ap) != 0)
-                       atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap),
-                           ATMSSA(ap), ATMSSLN(ap));
-               else
-                       (void)printf("<No address>");
-               (void)printf(" at %s", ipaddr_string(ATMSPA(ap)));
+               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
+                   ATMSSLN(ap));
+               ND_PRINT("at ");
+               atmarp_spaddr_print(ndo, ap, pro);

                break;
 
                break;
 

-       case ATMARPOP_NAK:
-               (void)printf("nak reply for %s",
-                       ipaddr_string(ATMSPA(ap)));
+       case ARPOP_NAK:
+               ND_PRINT("for ");
+               atmarp_spaddr_print(ndo, ap, pro);

                break;
 
        default:
                break;
 
        default:

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

                return;
        }
                return;
        }

-       return;
-trunc:
-       (void)printf("[|atmarp]");
+
+ out:
+        ND_PRINT(", length %u", length);

 }
 
 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;

 
 

+       ndo->ndo_protocol = "arp";

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

-       TCHECK(*ap);
-       hrd = EXTRACT_16BITS(&HRD(ap));
-       if (hrd == ARPHRD_ATM2225) {
-               atmarp_print(bp, length, caplen);
-               return;
+       ND_TCHECK_SIZE(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 GET_LINKADDR_STRING() accordingly */
+
+        switch(hrd) {
+        case ARPHRD_ATM2225:
+            atmarp_print(ndo, bp, length, caplen);
+            return;
+        case ARPHRD_FRELAY:
+            linkaddr = LINKADDR_FRELAY;
+            break;
+        default:
+            linkaddr = LINKADDR_MAC48;
+            break;

        }
        }

-       pro = EXTRACT_16BITS(&PRO(ap));
-       op = EXTRACT_16BITS(&OP(ap));

 
 

-       if (!TTEST2(*ar_tpa(ap), PLN(ap))) {
-               (void)printf("truncated-arp");
-               default_print((const u_char *)ap, length);
-               return;
+       ND_TCHECK_LEN(TPA(ap), PROTO_LEN(ap));
+
+        if (!ndo->ndo_eflag) {
+            ND_PRINT("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("%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 about the address formats */
+            if (!ndo->ndo_vflag) {
+                goto out;
+            }

        }
 
        }
 

-       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;
-       }
-       if (pro == ETHERTYPE_TRAIL)
-               (void)printf("trailer-");
+        /* print operation */
+        ND_PRINT("%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("who-has ");
+               tpaddr_print_ip(ndo, ap, pro);
+               if (isnonzero(ndo, (const u_char *)THA(ap), HRD_LEN(ap)))
+                       ND_PRINT(" (%s)",
+                                 GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)));
+               ND_PRINT(" 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(" is-at %s",
+                          GET_LINKADDR_STRING(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)));
+               /*
+                * XXX - GET_LINKADDR_STRING() may return a pointer to
+                * a static buffer, so we only have one call to it per
+                * ND_PRINT() call.
+                *
+                * This should be done in a cleaner fashion.
+                */
+               ND_PRINT("who-is %s",
+                         GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)));
+               ND_PRINT(" tell %s",
+                         GET_LINKADDR_STRING(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("%s at ",
+                         GET_LINKADDR_STRING(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)));
+               /*
+                * XXX - GET_LINKADDR_STRING() may return a pointer to
+                * a static buffer, so we only have one call to it per
+                * ND_PRINT() call.
+                *
+                * This should be done in a cleaner fashion.
+                */
+               ND_PRINT("who-is %s",
+                         GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)));
+               ND_PRINT(" tell %s",
+                         GET_LINKADDR_STRING(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("%s at ",
+                         GET_LINKADDR_STRING(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);
-       return;
-trunc:
-       (void)printf("[|arp]");
+
+ out:
+        ND_PRINT(", length %u", length);

 }
 }