Add the ndo parameter to some functions

[tcpdump] / print-arp.c

diff --git a/print-arp.c b/print-arp.c
index eff97c469074d215360ea8666b1389d521e6f348..5e74458751fb288d8e7a3ea5011c120c73a9379e 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -22,20 +22,18 @@
 /* \summary: Address Resolution Protocol (ARP) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Address Resolution Protocol (ARP) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

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

 
 #include <string.h>
 
 #include "netdissect.h"
 #include "addrtoname.h"
 
 #include <string.h>
 
 #include "netdissect.h"
 #include "addrtoname.h"

-#include "ether.h"

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

-static const char tstr[] = "[|ARP]";

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


@@ -48,7 +46,7 @@ static const char tstr[] = "[|ARP]";
  * specified.  Field names used correspond to RFC 826.
  */
 struct  arp_pkthdr {
  * specified.  Field names used correspond to RFC 826.
  */
 struct  arp_pkthdr {

-        u_short ar_hrd;         /* format of hardware address */
+        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_ETHER    1       /* ethernet hardware format */
 #define ARPHRD_IEEE802  6       /* token-ring hardware format */
 #define ARPHRD_ARCNET   7       /* arcnet hardware format */


@@ -56,10 +54,10 @@ struct  arp_pkthdr {
 #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_ATM2225  19      /* ATM (RFC 2225) */
 #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: */
+        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_REQUEST   1       /* request to resolve address */
 #define ARPOP_REPLY     2       /* response to previous request */
 #define ARPOP_REVREQUEST 3      /* request protocol address given hardware */


@@ -73,24 +71,24 @@ struct  arp_pkthdr {
  * according to the sizes above.
  */
 #ifdef COMMENT_ONLY
  * 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) EXTRACT_16BITS(&(ap)->ar_hrd)
-#define HRD_LEN(ap) ((ap)->ar_hln)
-#define PROTO_LEN(ap) ((ap)->ar_pln)
-#define OP(ap)  EXTRACT_16BITS(&(ap)->ar_op)
-#define PRO(ap) EXTRACT_16BITS(&(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 SHA(ap) (ar_sha(ap))
 #define SPA(ap) (ar_spa(ap))
 #define THA(ap) (ar_tha(ap))


@@ -129,39 +127,39 @@ static const struct tok arphrd_values[] = {
  * of an ATM number and an ATM subaddress.
  */
 struct  atmarp_pkthdr {
  * of an ATM number and an ATM subaddress.
  */
 struct  atmarp_pkthdr {

-        u_short aar_hrd;        /* format of hardware address */
-        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 */
+        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 */
 #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 */
-        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 */
+        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)  EXTRACT_16BITS(&(ap)->aar_hrd)
-#define ATMSHRD_LEN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK)
-#define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK)
-#define ATMSPROTO_LEN(ap) ((ap)->aar_spln)
-#define ATMOP(ap)   EXTRACT_16BITS(&(ap)->aar_op)
-#define ATMPRO(ap)  EXTRACT_16BITS(&(ap)->aar_pro)
-#define ATMTHRD_LEN(ap) ((ap)->aar_thtl & ATMARP_LEN_MASK)
-#define ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK)
-#define ATMTPROTO_LEN(ap) ((ap)->aar_tpln)
+#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_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))


@@ -178,10 +176,10 @@ struct  atmarp_pkthdr {
 #define ATMTPA(ap) (aar_tpa(ap))
 
 static int
 #define ATMTPA(ap) (aar_tpa(ap))
 
 static int

-isnonzero(const u_char *a, size_t len)
+isnonzero(netdissect_options *ndo, const u_char *a, size_t len)

 {
        while (len > 0) {
 {
        while (len > 0) {

-               if (*a != 0)
+               if (EXTRACT_U_1(a) != 0)

                        return (1);
                a++;
                len--;
                        return (1);
                a++;
                len--;


@@ -189,21 +187,69 @@ isnonzero(const u_char *a, size_t len)
        return (0);
 }
 
        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", ipaddr_string(ndo, 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", 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)
 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>"));
+               ND_PRINT("<No address>");

        else {
        else {

-               ND_PRINT((ndo, "%s", linkaddr_string(ndo, ha, LINKADDR_ATM, ha_len)));
+               ND_PRINT("%s", linkaddr_string(ndo, ha, LINKADDR_ATM, ha_len));

                if (srca_len != 0)
                if (srca_len != 0)

-                       ND_PRINT((ndo, ",%s",
-                                 linkaddr_string(ndo, srca, LINKADDR_ATM, srca_len)));
+                       ND_PRINT(",%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("<wrong proto type>");
+       else if (ATMTPROTO_LEN(ap) != 4)
+               ND_PRINT("<wrong tplen>");
+       else
+               ND_PRINT("%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("<wrong proto type>");
+       else if (ATMSPROTO_LEN(ap) != 4)
+               ND_PRINT("<wrong splen>");
+       else
+               ND_PRINT("%s", ipaddr_string(ndo, ATMSPA(ap)));
+}
+

 static void
 atmarp_print(netdissect_options *ndo,
             const u_char *bp, u_int length, u_int caplen)
 static void
 atmarp_print(netdissect_options *ndo,
             const u_char *bp, u_int length, u_int caplen)


@@ -212,31 +258,31 @@ atmarp_print(netdissect_options *ndo,
        u_short pro, hrd, op;
 
        ap = (const struct atmarp_pkthdr *)bp;
        u_short pro, hrd, op;
 
        ap = (const struct atmarp_pkthdr *)bp;

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

 
        hrd = ATMHRD(ap);
        pro = ATMPRO(ap);
        op = ATMOP(ap);
 
 
        hrd = ATMHRD(ap);
        pro = ATMPRO(ap);
        op = ATMOP(ap);
 

-       if (!ND_TTEST2(*aar_tpa(ap), ATMTPROTO_LEN(ap))) {
-               ND_PRINT((ndo, "%s", tstr));
+       if (!ND_TTEST_LEN(aar_tpa(ap), ATMTPROTO_LEN(ap))) {
+               nd_print_trunc(ndo);

                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
        }
 
         if (!ndo->ndo_eflag) {
                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
        }
 
         if (!ndo->ndo_eflag) {

-            ND_PRINT((ndo, "ARP, "));
+            ND_PRINT("ARP, ");

         }
 
        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
            ATMSPROTO_LEN(ap) != 4 ||
             ATMTPROTO_LEN(ap) != 4 ||
             ndo->ndo_vflag) {
         }
 
        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
            ATMSPROTO_LEN(ap) != 4 ||
             ATMTPROTO_LEN(ap) != 4 ||
             ndo->ndo_vflag) {

-                ND_PRINT((ndo, "%s, %s (len %u/%u)",
+                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),
                           tok2str(arphrd_values, "Unknown Hardware (%u)", hrd),
                           tok2str(ethertype_values, "Unknown Protocol (0x%04x)", pro),
                           ATMSPROTO_LEN(ap),

-                          ATMTPROTO_LEN(ap)));
+                          ATMTPROTO_LEN(ap));

 
                 /* don't know know about the address formats */
                 if (!ndo->ndo_vflag) {
 
                 /* don't know know about the address formats */
                 if (!ndo->ndo_vflag) {


@@ -245,34 +291,37 @@ atmarp_print(netdissect_options *ndo,
        }
 
         /* print operation */
        }
 
         /* print operation */

-        ND_PRINT((ndo, "%s%s ",
+        ND_PRINT("%s%s ",

                ndo->ndo_vflag ? ", " : "",
                ndo->ndo_vflag ? ", " : "",

-               tok2str(arpop_values, "Unknown (%u)", op)));
+               tok2str(arpop_values, "Unknown (%u)", op));

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

-               ND_PRINT((ndo, "who-has %s", ipaddr_string(ndo, ATMTPA(ap))));
+               ND_PRINT("who-has ");
+               atmarp_tpaddr_print(ndo, ap, pro);

                if (ATMTHRD_LEN(ap) != 0) {
                if (ATMTHRD_LEN(ap) != 0) {

-                       ND_PRINT((ndo, " ("));
+                       ND_PRINT(" (");

                        atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap),
                            ATMTSA(ap), ATMTSLN(ap));
                        atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap),
                            ATMTSA(ap), ATMTSLN(ap));

-                       ND_PRINT((ndo, ")"));
+                       ND_PRINT(")");

                }
                }

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

                break;
 
        case ARPOP_REPLY:
                break;
 
        case ARPOP_REPLY:

-               ND_PRINT((ndo, "%s is-at ", ipaddr_string(ndo, ATMSPA(ap))));
+               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:
                atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
                                   ATMSSLN(ap));
                break;
 
        case ARPOP_INVREQUEST:

-               ND_PRINT((ndo, "who-is "));
+               ND_PRINT("who-is ");

                atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap), ATMTSA(ap),
                    ATMTSLN(ap));
                atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap), ATMTSA(ap),
                    ATMTSLN(ap));

-               ND_PRINT((ndo, " tell "));
+               ND_PRINT(" tell ");

                atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
                    ATMSSLN(ap));
                break;
                atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
                    ATMSSLN(ap));
                break;


@@ -280,11 +329,13 @@ atmarp_print(netdissect_options *ndo,
        case ARPOP_INVREPLY:
                atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
                    ATMSSLN(ap));
        case ARPOP_INVREPLY:
                atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
                    ATMSSLN(ap));

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

                break;
 
        case ARPOP_NAK:
                break;
 
        case ARPOP_NAK:

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

                break;
 
        default:
                break;
 
        default:


@@ -293,11 +344,11 @@ atmarp_print(netdissect_options *ndo,
        }
 
  out:
        }
 
  out:

-        ND_PRINT((ndo, ", length %u", length));
+        ND_PRINT(", length %u", length);

         return;
 
 trunc:
         return;
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

 }
 
 void
 }
 
 void


@@ -307,8 +358,9 @@ arp_print(netdissect_options *ndo,
        const struct arp_pkthdr *ap;
        u_short pro, hrd, op, linkaddr;
 
        const struct arp_pkthdr *ap;
        u_short pro, hrd, op, linkaddr;
 

+       ndo->ndo_protocol = "arp";

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

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

 
        hrd = HRD(ap);
        pro = PRO(ap);
 
        hrd = HRD(ap);
        pro = PRO(ap);


@@ -332,14 +384,14 @@ arp_print(netdissect_options *ndo,
             break;
        }
 
             break;
        }
 

-       if (!ND_TTEST2(*ar_tpa(ap), PROTO_LEN(ap))) {
-               ND_PRINT((ndo, "%s", tstr));
+       if (!ND_TTEST_LEN(TPA(ap), PROTO_LEN(ap))) {
+               nd_print_trunc(ndo);

                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
        }
 
         if (!ndo->ndo_eflag) {
                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
        }
 
         if (!ndo->ndo_eflag) {

-            ND_PRINT((ndo, "ARP, "));
+            ND_PRINT("ARP, ");

         }
 
         /* print hardware type/len and proto type/len */
         }
 
         /* print hardware type/len and proto type/len */


@@ -347,11 +399,11 @@ arp_print(netdissect_options *ndo,
            PROTO_LEN(ap) != 4 ||
             HRD_LEN(ap) == 0 ||
             ndo->ndo_vflag) {
            PROTO_LEN(ap) != 4 ||
             HRD_LEN(ap) == 0 ||
             ndo->ndo_vflag) {

-            ND_PRINT((ndo, "%s (len %u), %s (len %u)",
+            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),
                       tok2str(arphrd_values, "Unknown Hardware (%u)", hrd),
                       HRD_LEN(ap),
                       tok2str(ethertype_values, "Unknown Protocol (0x%04x)", pro),

-                      PROTO_LEN(ap)));
+                      PROTO_LEN(ap));

 
             /* don't know know about the address formats */
             if (!ndo->ndo_vflag) {
 
             /* don't know know about the address formats */
             if (!ndo->ndo_vflag) {


@@ -360,48 +412,50 @@ arp_print(netdissect_options *ndo,
        }
 
         /* print operation */
        }
 
         /* print operation */

-        ND_PRINT((ndo, "%s%s ",
+        ND_PRINT("%s%s ",

                ndo->ndo_vflag ? ", " : "",
                ndo->ndo_vflag ? ", " : "",

-               tok2str(arpop_values, "Unknown (%u)", op)));
+               tok2str(arpop_values, "Unknown (%u)", op));

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

-               ND_PRINT((ndo, "who-has %s", ipaddr_string(ndo, TPA(ap))));
-               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 %s", ipaddr_string(ndo, 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)",
+                                 linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)));
+               ND_PRINT(" tell ");
+               spaddr_print_ip(ndo, ap, pro);

                break;
 
        case ARPOP_REPLY:
                break;
 
        case ARPOP_REPLY:

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

                break;
 
        case ARPOP_REVREQUEST:
                break;
 
        case ARPOP_REVREQUEST:

-               ND_PRINT((ndo, "who-is %s tell %s",
+               ND_PRINT("who-is %s tell %s",

                          linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)),
                          linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)),

-                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));
+                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));

                break;
 
        case ARPOP_REVREPLY:
                break;
 
        case ARPOP_REVREPLY:

-               ND_PRINT((ndo, "%s at %s",
-                         linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)),
-                         ipaddr_string(ndo, TPA(ap))));
+               ND_PRINT("%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:

-               ND_PRINT((ndo, "who-is %s tell %s",
+               ND_PRINT("who-is %s tell %s",

                          linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)),
                          linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)),

-                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));
+                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));

                break;
 
        case ARPOP_INVREPLY:
                break;
 
        case ARPOP_INVREPLY:

-               ND_PRINT((ndo,"%s at %s",
-                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)),
-                         ipaddr_string(ndo, SPA(ap))));
+               ND_PRINT("%s at ",
+                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
+               spaddr_print_ip(ndo, ap, pro);

                break;
 
        default:
                break;
 
        default:


@@ -410,16 +464,9 @@ arp_print(netdissect_options *ndo,
        }
 
  out:
        }
 
  out:

-        ND_PRINT((ndo, ", length %u", length));
+        ND_PRINT(", length %u", length);

 
        return;
 trunc:
 
        return;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

 }
 }

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