]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-arp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
IPoIB: Add the output with -e for a capture test
[tcpdump] / print-arp.c
diff --git a/print-arp.c b/print-arp.c
index df53106e42f9bb0866752371e5ba707825a8368f..add9652c8b1e7cbb38d68ff9aaeb7994e103760c 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -22,10 +22,10 @@
 /* \summary: Address Resolution Protocol (ARP) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <string.h>
 
@@ -34,7 +34,6 @@
 #include "ethertype.h"
 #include "extract.h"
 
-static const char tstr[] = "[|ARP]";
 
 /*
  * Address Resolution Protocol.
@@ -55,6 +54,7 @@ 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_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 */
@@ -78,18 +78,18 @@ struct  arp_pkthdr {
        nd_byte         ar_tpa[];       /* target protocol address */
 #endif
 #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 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 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 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))
@@ -115,6 +115,7 @@ static const struct tok arphrd_values[] = {
     { ARPHRD_STRIP, "Strip" },
     { ARPHRD_IEEE1394, "IEEE 1394" },
     { ARPHRD_ATM2225, "ATM" },
+    { ARPHRD_INFINIBAND, "InfiniBand" },
     { 0, NULL }
 };
 
@@ -152,15 +153,15 @@ struct  atmarp_pkthdr {
        nd_byte         aar_tpa[];      /* target protocol address */
 #endif
 
-#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 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_ssa(ap)    (aar_sha(ap) + ATMSHRD_LEN(ap))
 #define aar_spa(ap)    (aar_ssa(ap) + ATMSSLN(ap))
@@ -177,10 +178,10 @@ struct  atmarp_pkthdr {
 #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) {
-               if (EXTRACT_U_1(a) != 0)
+               if (GET_U_1(a) != 0)
                        return (1);
                a++;
                len--;
@@ -193,11 +194,11 @@ 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>"));
+               ND_PRINT("<wrong proto type>");
        else if (PROTO_LEN(ap) != 4)
-               ND_PRINT((ndo, "<wrong len>"));
+               ND_PRINT("<wrong len>");
        else
-               ND_PRINT((ndo, "%s", ipaddr_string(ndo, TPA(ap))));
+               ND_PRINT("%s", ipaddr_string(ndo, TPA(ap)));
 }
 
 static void
@@ -205,11 +206,11 @@ 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>"));
+               ND_PRINT("<wrong proto type>");
        else if (PROTO_LEN(ap) != 4)
-               ND_PRINT((ndo, "<wrong len>"));
+               ND_PRINT("<wrong len>");
        else
-               ND_PRINT((ndo, "%s", ipaddr_string(ndo, SPA(ap))));
+               ND_PRINT("%s", ipaddr_string(ndo, SPA(ap)));
 }
 
 static void
@@ -218,12 +219,12 @@ atmarp_addr_print(netdissect_options *ndo,
     u_int srca_len)
 {
        if (ha_len == 0)
-               ND_PRINT((ndo, "<No address>"));
+               ND_PRINT("<No address>");
        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)
-                       ND_PRINT((ndo, ",%s",
-                                 linkaddr_string(ndo, srca, LINKADDR_ATM, srca_len)));
+                       ND_PRINT(",%s",
+                                 linkaddr_string(ndo, srca, LINKADDR_ATM, srca_len));
        }
 }
 
@@ -232,11 +233,11 @@ 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>"));
+               ND_PRINT("<wrong proto type>");
        else if (ATMTPROTO_LEN(ap) != 4)
-               ND_PRINT((ndo, "<wrong tplen>"));
+               ND_PRINT("<wrong tplen>");
        else
-               ND_PRINT((ndo, "%s", ipaddr_string(ndo, ATMTPA(ap))));
+               ND_PRINT("%s", ipaddr_string(ndo, ATMTPA(ap)));
 }
 
 static void
@@ -244,11 +245,11 @@ 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>"));
+               ND_PRINT("<wrong proto type>");
        else if (ATMSPROTO_LEN(ap) != 4)
-               ND_PRINT((ndo, "<wrong splen>"));
+               ND_PRINT("<wrong splen>");
        else
-               ND_PRINT((ndo, "%s", ipaddr_string(ndo, ATMSPA(ap))));
+               ND_PRINT("%s", ipaddr_string(ndo, ATMSPA(ap)));
 }
 
 static void
@@ -266,24 +267,24 @@ atmarp_print(netdissect_options *ndo,
        op = ATMOP(ap);
 
        if (!ND_TTEST_LEN(aar_tpa(ap), ATMTPROTO_LEN(ap))) {
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                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) {
-                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),
-                          ATMTPROTO_LEN(ap)));
+                          ATMTPROTO_LEN(ap));
 
                 /* don't know know about the address formats */
                 if (!ndo->ndo_vflag) {
@@ -292,37 +293,37 @@ atmarp_print(netdissect_options *ndo,
        }
 
         /* print operation */
-        ND_PRINT((ndo, "%s%s ",
+        ND_PRINT("%s%s ",
                ndo->ndo_vflag ? ", " : "",
-               tok2str(arpop_values, "Unknown (%u)", op)));
+               tok2str(arpop_values, "Unknown (%u)", op));
 
        switch (op) {
 
        case ARPOP_REQUEST:
-               ND_PRINT((ndo, "who-has "));
+               ND_PRINT("who-has ");
                atmarp_tpaddr_print(ndo, ap, pro);
                if (ATMTHRD_LEN(ap) != 0) {
-                       ND_PRINT((ndo, " ("));
+                       ND_PRINT(" (");
                        atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap),
                            ATMTSA(ap), ATMTSLN(ap));
-                       ND_PRINT((ndo, ")"));
+                       ND_PRINT(")");
                }
-               ND_PRINT((ndo, " tell "));
+               ND_PRINT(" tell ");
                atmarp_spaddr_print(ndo, ap, pro);
                break;
 
        case ARPOP_REPLY:
                atmarp_spaddr_print(ndo, ap, pro);
-               ND_PRINT((ndo, " is-at "));
+               ND_PRINT(" is-at ");
                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));
-               ND_PRINT((ndo, " tell "));
+               ND_PRINT(" tell ");
                atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
                    ATMSSLN(ap));
                break;
@@ -330,12 +331,12 @@ atmarp_print(netdissect_options *ndo,
        case ARPOP_INVREPLY:
                atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
                    ATMSSLN(ap));
-               ND_PRINT((ndo, "at "));
+               ND_PRINT("at ");
                atmarp_spaddr_print(ndo, ap, pro);
                break;
 
        case ARPOP_NAK:
-               ND_PRINT((ndo, "for "));
+               ND_PRINT("for ");
                atmarp_spaddr_print(ndo, ap, pro);
                break;
 
@@ -345,11 +346,11 @@ atmarp_print(netdissect_options *ndo,
        }
 
  out:
-        ND_PRINT((ndo, ", length %u", length));
+        ND_PRINT(", length %u", length);
         return;
 
 trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);
 }
 
 void
@@ -359,6 +360,7 @@ arp_print(netdissect_options *ndo,
        const struct arp_pkthdr *ap;
        u_short pro, hrd, op, linkaddr;
 
+       ndo->ndo_protocol = "arp";
        ap = (const struct arp_pkthdr *)bp;
        ND_TCHECK_SIZE(ap);
 
@@ -385,13 +387,13 @@ arp_print(netdissect_options *ndo,
        }
 
        if (!ND_TTEST_LEN(TPA(ap), PROTO_LEN(ap))) {
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                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 */
@@ -399,11 +401,11 @@ arp_print(netdissect_options *ndo,
            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),
-                      PROTO_LEN(ap)));
+                      PROTO_LEN(ap));
 
             /* don't know know about the address formats */
             if (!ndo->ndo_vflag) {
@@ -412,49 +414,49 @@ arp_print(netdissect_options *ndo,
        }
 
         /* print operation */
-        ND_PRINT((ndo, "%s%s ",
+        ND_PRINT("%s%s ",
                ndo->ndo_vflag ? ", " : "",
-               tok2str(arpop_values, "Unknown (%u)", op)));
+               tok2str(arpop_values, "Unknown (%u)", op));
 
        switch (op) {
 
        case ARPOP_REQUEST:
-               ND_PRINT((ndo, "who-has "));
+               ND_PRINT("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 "));
+               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:
                spaddr_print_ip(ndo, ap, pro);
-               ND_PRINT((ndo, " is-at %s",
-                          linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));
+               ND_PRINT(" is-at %s",
+                          linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
                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, SHA(ap), linkaddr, HRD_LEN(ap))));
+                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
                break;
 
        case ARPOP_REVREPLY:
-               ND_PRINT((ndo, "%s at ",
-                         linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap))));
+               ND_PRINT("%s at ",
+                         linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)));
                tpaddr_print_ip(ndo, ap, pro);
                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, SHA(ap), linkaddr, HRD_LEN(ap))));
+                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
                break;
 
        case ARPOP_INVREPLY:
-               ND_PRINT((ndo,"%s at ",
-                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))));
+               ND_PRINT("%s at ",
+                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
                spaddr_print_ip(ndo, ap, pro);
                break;
 
@@ -464,16 +466,9 @@ arp_print(netdissect_options *ndo,
        }
 
  out:
-        ND_PRINT((ndo, ", length %u", length));
+        ND_PRINT(", length %u", length);
 
        return;
 trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);
 }
-
-/*
- * Local Variables:
- * c-style: bsd
- * End:
- */
-
[mirror] the TCPdump network dissector