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 eff97c469074d215360ea8666b1389d521e6f348..7409099fad587b0b711c13b3d14b085d6f9ea2b9 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -31,7 +31,6 @@
 
 #include "netdissect.h"
 #include "addrtoname.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"

-#include "ether.h"

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


@@ -48,7 +47,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 +55,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 +72,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 +128,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))


@@ -181,7 +180,7 @@ static int
 isnonzero(const u_char *a, size_t len)
 {
        while (len > 0) {
 isnonzero(const u_char *a, size_t len)
 {
        while (len > 0) {

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

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


@@ -189,6 +188,30 @@ 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((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
+spaddr_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, SPA(ap))));
+}
+

 static void
 atmarp_addr_print(netdissect_options *ndo,
                  const u_char *ha, u_int ha_len, const u_char *srca,
 static void
 atmarp_addr_print(netdissect_options *ndo,
                  const u_char *ha, u_int ha_len, const u_char *srca,


@@ -204,6 +227,30 @@ atmarp_addr_print(netdissect_options *ndo,
        }
 }
 
        }
 }
 

+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)
 static void
 atmarp_print(netdissect_options *ndo,
             const u_char *bp, u_int length, u_int caplen)


@@ -218,7 +265,7 @@ atmarp_print(netdissect_options *ndo,
        pro = ATMPRO(ap);
        op = ATMOP(ap);
 
        pro = ATMPRO(ap);
        op = ATMOP(ap);
 

-       if (!ND_TTEST2(*aar_tpa(ap), ATMTPROTO_LEN(ap))) {
+       if (!ND_TTEST_LEN(aar_tpa(ap), ATMTPROTO_LEN(ap))) {

                ND_PRINT((ndo, "%s", tstr));
                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
                ND_PRINT((ndo, "%s", tstr));
                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;


@@ -252,18 +299,21 @@ atmarp_print(netdissect_options *ndo,
        switch (op) {
 
        case ARPOP_REQUEST:
        switch (op) {
 
        case ARPOP_REQUEST:

-               ND_PRINT((ndo, "who-has %s", ipaddr_string(ndo, ATMTPA(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, ")"));
                }
                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 %s", ipaddr_string(ndo, ATMSPA(ap))));
+               ND_PRINT((ndo, " 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((ndo, " is-at "));

                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 +330,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((ndo, "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((ndo, "for "));
+               atmarp_spaddr_print(ndo, ap, pro);

                break;
 
        default:
                break;
 
        default:


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

-       if (!ND_TTEST2(*ar_tpa(ap), PROTO_LEN(ap))) {
+       if (!ND_TTEST_LEN(TPA(ap), PROTO_LEN(ap))) {

                ND_PRINT((ndo, "%s", tstr));
                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
                ND_PRINT((ndo, "%s", tstr));
                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;


@@ -367,16 +419,18 @@ arp_print(netdissect_options *ndo,
        switch (op) {
 
        case ARPOP_REQUEST:
        switch (op) {
 
        case ARPOP_REQUEST:

-               ND_PRINT((ndo, "who-has %s", ipaddr_string(ndo, TPA(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))));
                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((ndo, " 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)),
+               spaddr_print_ip(ndo, ap, pro);
+               ND_PRINT((ndo, " is-at %s",

                           linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));
                break;
 
                           linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));
                break;
 


@@ -387,9 +441,9 @@ arp_print(netdissect_options *ndo,
                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((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:


@@ -399,9 +453,9 @@ arp_print(netdissect_options *ndo,
                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((ndo,"%s at ",
+                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));
+               spaddr_print_ip(ndo, ap, pro);

                break;
 
        default:
                break;
 
        default: