X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/54db98a0e7e5ced4f4fd8565e241ab2bbbf91842..refs/pull/433/head:/print-arp.c?ds=sidebyside diff --git a/print-arp.c b/print-arp.c index cee79469..76f39fe0 100644 --- a/print-arp.c +++ b/print-arp.c @@ -19,18 +19,13 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.61 2003-01-25 23:27:09 guy Exp $ (LBL)"; -#endif - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include #include #include "interface.h" @@ -39,6 +34,8 @@ static const char rcsid[] = #include "ethertype.h" #include "extract.h" /* must come after interface.h */ +static const char tstr[] = "[|ARP]"; + /* * Address Resolution Protocol. * @@ -49,24 +46,27 @@ static const char rcsid[] = * 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 { + 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_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: */ +#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 valif for ATM ARP */ + /* * The remaining fields are variable in size, * according to the sizes above. @@ -86,8 +86,8 @@ struct arp_pkthdr { #define ARP_HDRLEN 8 #define HRD(ap) EXTRACT_16BITS(&(ap)->ar_hrd) -#define HLN(ap) ((ap)->ar_hln) -#define PLN(ap) ((ap)->ar_pln) +#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 SHA(ap) (ar_sha(ap)) @@ -95,6 +95,29 @@ struct arp_pkthdr { #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" }, + { 0, NULL } +}; + /* * ATM Address Resolution Protocol. * @@ -104,20 +127,18 @@ struct arp_pkthdr { * 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 { + 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 */ +#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 */ /* * The remaining fields are variable in size, * according to the sizes above. @@ -132,19 +153,19 @@ struct atmarp_pkthdr { #endif #define ATMHRD(ap) EXTRACT_16BITS(&(ap)->aar_hrd) -#define ATMSHLN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK) +#define ATMSHRD_LEN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK) #define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK) -#define ATMSPLN(ap) ((ap)->aar_spln) +#define ATMSPROTO_LEN(ap) ((ap)->aar_spln) #define ATMOP(ap) EXTRACT_16BITS(&(ap)->aar_op) #define ATMPRO(ap) EXTRACT_16BITS(&(ap)->aar_pro) -#define ATMTHLN(ap) ((ap)->aar_thtl & ATMARP_LEN_MASK) +#define ATMTHRD_LEN(ap) ((ap)->aar_thtl & ATMARP_LEN_MASK) #define ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK) -#define ATMTPLN(ap) ((ap)->aar_tpln) +#define ATMTPROTO_LEN(ap) ((ap)->aar_tpln) #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_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)) }; @@ -158,173 +179,236 @@ struct atmarp_pkthdr { static u_char ezero[6]; static void -atmarp_addr_print(const u_char *ha, u_int ha_len, const u_char *srca, +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) - (void)printf(""); + ND_PRINT((ndo, "")); else { - (void)printf("%s", linkaddr_string(ha, ha_len)); + ND_PRINT((ndo, "%s", linkaddr_string(ndo, ha, LINKADDR_ATM, ha_len))); if (srca_len != 0) - (void)printf(",%s", linkaddr_string(srca, srca_len)); + ND_PRINT((ndo, ",%s", + linkaddr_string(ndo, srca, LINKADDR_ATM, srca_len))); } } 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; - TCHECK(*ap); + ND_TCHECK(*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); + if (!ND_TTEST2(*aar_tpa(ap), ATMTPROTO_LEN(ap))) { + ND_PRINT((ndo, "%s", tstr)); + ND_DEFAULTPRINT((const u_char *)ap, length); return; } + if (!ndo->ndo_eflag) { + ND_PRINT((ndo, "ARP, ")); + } + 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((ndo, "%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 know about the address formats */ + if (!ndo->ndo_vflag) { + goto out; + } } - if (pro == ETHERTYPE_TRAIL) - (void)printf("trailer-"); + + /* print operation */ + ND_PRINT((ndo, "%s%s ", + ndo->ndo_vflag ? ", " : "", + tok2str(arpop_values, "Unknown (%u)", op))); + 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((ndo, "who-has %s", ipaddr_string(ndo, ATMTPA(ap)))); + if (ATMTHRD_LEN(ap) != 0) { + ND_PRINT((ndo, " (")); + atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap), ATMTSA(ap), ATMTSLN(ap)); - (void)printf(")"); + ND_PRINT((ndo, ")")); } - (void)printf(" tell %s", ipaddr_string(ATMSPA(ap))); + ND_PRINT((ndo, "tell %s", ipaddr_string(ndo, ATMSPA(ap)))); break; case ARPOP_REPLY: - (void)printf("arp reply %s", ipaddr_string(ATMSPA(ap))); - (void)printf(" is-at "); - atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap), ATMSSA(ap), - ATMSSLN(ap)); + ND_PRINT((ndo, "%s is-at ", ipaddr_string(ndo, ATMSPA(ap)))); + atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap), + ATMSSLN(ap)); break; case ARPOP_INVREQUEST: - (void)printf("invarp who-is "); - atmarp_addr_print(ATMTHA(ap), ATMTHLN(ap), ATMTSA(ap), + ND_PRINT((ndo, "who-is ")); + atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap), ATMTSA(ap), ATMTSLN(ap)); - (void)printf(" tell "); - atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap), ATMSSA(ap), + ND_PRINT((ndo, " tell ")); + atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap), ATMSSLN(ap)); break; case ARPOP_INVREPLY: - (void)printf("invarp reply "); - atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap), ATMSSA(ap), + atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap), ATMSSLN(ap)); - (void)printf(" at %s", ipaddr_string(ATMSPA(ap))); + ND_PRINT((ndo, "at %s", ipaddr_string(ndo, ATMSPA(ap)))); break; - case ATMARPOP_NAK: - (void)printf("nak reply for %s", - ipaddr_string(ATMSPA(ap))); + case ARPOP_NAK: + ND_PRINT((ndo, "for %s", ipaddr_string(ndo, ATMSPA(ap)))); break; default: - (void)printf("atmarp-#%d", op); - default_print((const u_char *)ap, caplen); + ND_DEFAULTPRINT((const u_char *)ap, caplen); return; } - return; + + out: + ND_PRINT((ndo, ", length %u", length)); + return; + trunc: - (void)printf("[|atmarp]"); + ND_PRINT((ndo, "%s", tstr)); } 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; - u_short pro, hrd, op; + u_short pro, hrd, op, linkaddr; ap = (const struct arp_pkthdr *)bp; - TCHECK(*ap); + ND_TCHECK(*ap); + hrd = HRD(ap); - if (hrd == ARPHRD_ATM2225) { - atmarp_print(bp, length, caplen); - return; - } pro = PRO(ap); op = OP(ap); - if (!TTEST2(*ar_tpa(ap), PLN(ap))) { - (void)printf("truncated-arp"); - default_print((const u_char *)ap, length); - return; + + /* 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 */ + + switch(hrd) { + case ARPHRD_ATM2225: + atmarp_print(ndo, bp, length, caplen); + return; + case ARPHRD_FRELAY: + linkaddr = LINKADDR_FRELAY; + break; + default: + linkaddr = LINKADDR_ETHER; + break; } - 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)); + if (!ND_TTEST2(*ar_tpa(ap), PROTO_LEN(ap))) { + ND_PRINT((ndo, "%s", tstr)); + ND_DEFAULTPRINT((const u_char *)ap, length); return; } - if (pro == ETHERTYPE_TRAIL) - (void)printf("trailer-"); + + if (!ndo->ndo_eflag) { + ND_PRINT((ndo, "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((ndo, "%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 know about the address formats */ + if (!ndo->ndo_vflag) { + goto out; + } + } + + /* print operation */ + ND_PRINT((ndo, "%s%s ", + ndo->ndo_vflag ? ", " : "", + tok2str(arpop_values, "Unknown (%u)", op))); + 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((ndo, "who-has %s", ipaddr_string(ndo, TPA(ap)))); + if (memcmp((const char *)ezero, (const char *)THA(ap), HRD_LEN(ap)) != 0) + ND_PRINT((ndo, " (%s)", + linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)))); + ND_PRINT((ndo, " tell %s", ipaddr_string(ndo, SPA(ap)))); break; case ARPOP_REPLY: - (void)printf("arp reply %s", ipaddr_string(SPA(ap))); - (void)printf(" is-at %s", linkaddr_string(SHA(ap), HLN(ap))); + ND_PRINT((ndo, "%s is-at %s", + ipaddr_string(ndo, SPA(ap)), + linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)))); break; case ARPOP_REVREQUEST: - (void)printf("rarp who-is %s tell %s", - linkaddr_string(THA(ap), HLN(ap)), - linkaddr_string(SHA(ap), HLN(ap))); + ND_PRINT((ndo, "who-is %s tell %s", + linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)), + linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)))); break; case ARPOP_REVREPLY: - (void)printf("rarp reply %s at %s", - linkaddr_string(THA(ap), HLN(ap)), - ipaddr_string(TPA(ap))); + ND_PRINT((ndo, "%s at %s", + linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)), + ipaddr_string(ndo, TPA(ap)))); break; case ARPOP_INVREQUEST: - (void)printf("invarp who-is %s tell %s", - linkaddr_string(THA(ap), HLN(ap)), - linkaddr_string(SHA(ap), HLN(ap))); + ND_PRINT((ndo, "who-is %s tell %s", + linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)), + linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)))); break; case ARPOP_INVREPLY: - (void)printf("invarp reply %s at %s", - linkaddr_string(THA(ap), HLN(ap)), - ipaddr_string(TPA(ap))); + ND_PRINT((ndo,"%s at %s", + linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)), + ipaddr_string(ndo, SPA(ap)))); break; default: - (void)printf("arp-#%d", op); - default_print((const u_char *)ap, caplen); + ND_DEFAULTPRINT((const u_char *)ap, caplen); return; } - if (hrd != ARPHRD_ETHER) - printf(" hardware #%d", hrd); + + out: + ND_PRINT((ndo, ", length %u", length)); + return; trunc: - (void)printf("[|arp]"); + ND_PRINT((ndo, "%s", tstr)); } + +/* + * Local Variables: + * c-style: bsd + * End: + */ +