/* \summary: Address Resolution Protocol (ARP) printer */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "netdissect-stdinc.h"
-#include <string.h>
-
+#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
#include "addrtoname.h"
#include "ethertype.h"
#include "extract.h"
-static const char tstr[] = "[|ARP]";
/*
* Address Resolution Protocol.
#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 */
#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 */
+#define ARPOP_NAK 10 /* NAK - only valid for ATM ARP */
/*
* The remaining fields are variable in size,
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))
{ ARPHRD_STRIP, "Strip" },
{ ARPHRD_IEEE1394, "IEEE 1394" },
{ ARPHRD_ATM2225, "ATM" },
+ { ARPHRD_INFINIBAND, "InfiniBand" },
{ 0, NULL }
};
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))
#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)
+ while (len != 0) {
+ if (GET_U_1(a) != 0)
return (1);
a++;
len--;
else if (PROTO_LEN(ap) != 4)
ND_PRINT("<wrong len>");
else
- ND_PRINT("%s", ipaddr_string(ndo, TPA(ap)));
+ ND_PRINT("%s", GET_IPADDR_STRING(TPA(ap)));
}
static void
else if (PROTO_LEN(ap) != 4)
ND_PRINT("<wrong len>");
else
- ND_PRINT("%s", ipaddr_string(ndo, SPA(ap)));
+ ND_PRINT("%s", GET_IPADDR_STRING(SPA(ap)));
}
static void
if (ha_len == 0)
ND_PRINT("<No address>");
else {
- ND_PRINT("%s", linkaddr_string(ndo, ha, LINKADDR_ATM, ha_len));
+ ND_PRINT("%s", GET_LINKADDR_STRING(ha, LINKADDR_ATM, ha_len));
if (srca_len != 0)
ND_PRINT(",%s",
- linkaddr_string(ndo, srca, LINKADDR_ATM, srca_len));
+ GET_LINKADDR_STRING(srca, LINKADDR_ATM, srca_len));
}
}
else if (ATMTPROTO_LEN(ap) != 4)
ND_PRINT("<wrong tplen>");
else
- ND_PRINT("%s", ipaddr_string(ndo, ATMTPA(ap)));
+ ND_PRINT("%s", GET_IPADDR_STRING(ATMTPA(ap)));
}
static void
else if (ATMSPROTO_LEN(ap) != 4)
ND_PRINT("<wrong splen>");
else
- ND_PRINT("%s", ipaddr_string(ndo, ATMSPA(ap)));
+ ND_PRINT("%s", GET_IPADDR_STRING(ATMSPA(ap)));
}
static void
pro = ATMPRO(ap);
op = ATMOP(ap);
- if (!ND_TTEST_LEN(aar_tpa(ap), ATMTPROTO_LEN(ap))) {
- ND_PRINT("%s", tstr);
- ND_DEFAULTPRINT((const u_char *)ap, length);
- return;
- }
+ ND_TCHECK_LEN(ATMTPA(ap), ATMTPROTO_LEN(ap));
if (!ndo->ndo_eflag) {
ND_PRINT("ARP, ");
ATMSPROTO_LEN(ap),
ATMTPROTO_LEN(ap));
- /* don't know know about the address formats */
+ /* don't know about the address formats */
if (!ndo->ndo_vflag) {
goto out;
}
out:
ND_PRINT(", length %u", length);
- return;
-
-trunc:
- ND_PRINT("%s", tstr);
}
void
/* 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 */
+ and set the linkaddr type for GET_LINKADDR_STRING() accordingly */
switch(hrd) {
case ARPHRD_ATM2225:
linkaddr = LINKADDR_FRELAY;
break;
default:
- linkaddr = LINKADDR_ETHER;
+ linkaddr = LINKADDR_MAC48;
break;
}
- if (!ND_TTEST_LEN(TPA(ap), PROTO_LEN(ap))) {
- ND_PRINT("%s", tstr);
- ND_DEFAULTPRINT((const u_char *)ap, length);
- return;
- }
+ ND_TCHECK_LEN(TPA(ap), PROTO_LEN(ap));
if (!ndo->ndo_eflag) {
ND_PRINT("ARP, ");
tok2str(ethertype_values, "Unknown Protocol (0x%04x)", pro),
PROTO_LEN(ap));
- /* don't know know about the address formats */
+ /* don't know about the address formats */
if (!ndo->ndo_vflag) {
goto out;
}
case ARPOP_REQUEST:
ND_PRINT("who-has ");
tpaddr_print_ip(ndo, ap, pro);
- if (isnonzero((const u_char *)THA(ap), HRD_LEN(ap)))
+ if (isnonzero(ndo, (const u_char *)THA(ap), HRD_LEN(ap)))
ND_PRINT(" (%s)",
- linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)));
+ GET_LINKADDR_STRING(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(" is-at %s",
- linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
+ GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap)));
break;
case ARPOP_REVREQUEST:
- 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)));
+ /*
+ * 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:
ND_PRINT("%s at ",
- linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)));
+ GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)));
tpaddr_print_ip(ndo, ap, pro);
break;
case ARPOP_INVREQUEST:
- 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)));
+ /*
+ * 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:
ND_PRINT("%s at ",
- linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
+ GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap)));
spaddr_print_ip(ndo, ap, pro);
break;
out:
ND_PRINT(", length %u", length);
-
- return;
-trunc:
- ND_PRINT("%s", tstr);
}
projects / tcpdump / blobdiff