From 55b12ee1997869e5aed19e4145ad34c6d874a423 Mon Sep 17 00:00:00 2001 From: bms Date: Wed, 31 Mar 2004 14:57:24 +0000 Subject: Merge of tcpdump 3.8.3 from tcpdump.org, with the following caveats: print-atm.c no longer performs special handling for FORE headers; these can no doubt be re-added at a later date. print-fr.c is effectively a no-op. print-llc.c has had the default_print_unaligned() call removed as tcpdump no longer defines this function, however the prototype is still present. Suggest we roll in a diff to use print_unknown_data(). --- contrib/tcpdump/print-arp.c | 195 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 180 insertions(+), 15 deletions(-) (limited to 'contrib/tcpdump/print-arp.c') diff --git a/contrib/tcpdump/print-arp.c b/contrib/tcpdump/print-arp.c index a3aec16..e56df75 100644 --- a/contrib/tcpdump/print-arp.c +++ b/contrib/tcpdump/print-arp.c @@ -22,18 +22,15 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.51.4.2 2002/07/10 07:09:53 guy Exp $ (LBL)"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.61.2.2 2003/11/16 08:51:10 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include - -#include +#include #include #include @@ -90,18 +87,169 @@ struct arp_pkthdr { #define ARP_HDRLEN 8 -#define HRD(ap) ((ap)->ar_hrd) +#define HRD(ap) EXTRACT_16BITS(&(ap)->ar_hrd) #define HLN(ap) ((ap)->ar_hln) #define PLN(ap) ((ap)->ar_pln) -#define OP(ap) ((ap)->ar_op) -#define PRO(ap) ((ap)->ar_pro) +#define OP(ap) EXTRACT_16BITS(&(ap)->ar_op) +#define PRO(ap) EXTRACT_16BITS(&(ap)->ar_pro) #define SHA(ap) (ar_sha(ap)) #define SPA(ap) (ar_spa(ap)) #define THA(ap) (ar_tha(ap)) #define TPA(ap) (ar_tpa(ap)) +/* + * ATM Address Resolution Protocol. + * + * See RFC 2225 for protocol description. ATMARP packets are similar + * to ARP packets, except that there are no length fields for the + * protocol address - instead, there are type/length fields for + * 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 */ +/* + * 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 */ +#endif + +#define ATMHRD(ap) EXTRACT_16BITS(&(ap)->aar_hrd) +#define ATMSHLN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK) +#define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK) +#define ATMSPLN(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 ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK) +#define ATMTPLN(ap) ((ap)->aar_tpln) +#define aar_sha(ap) ((const u_char *)((ap)+1)) +#define aar_ssa(ap) (aar_sha(ap) + ATMSHLN(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_tpa(ap) (aar_tsa(ap) + ATMTSLN(ap)) +}; + +#define ATMSHA(ap) (aar_sha(ap)) +#define ATMSSA(ap) (aar_ssa(ap)) +#define ATMSPA(ap) (aar_spa(ap)) +#define ATMTHA(ap) (aar_tha(ap)) +#define ATMTSA(ap) (aar_tsa(ap)) +#define ATMTPA(ap) (aar_tpa(ap)) + static u_char ezero[6]; +static void +atmarp_addr_print(const u_char *ha, u_int ha_len, const u_char *srca, + u_int srca_len) +{ + if (ha_len == 0) + (void)printf(""); + else { + (void)printf("%s", linkaddr_string(ha, ha_len)); + if (srca_len != 0) + (void)printf(",%s", linkaddr_string(srca, srca_len)); + } +} + +static void +atmarp_print(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); + + 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); + return; + } + + 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; + } + if (pro == ETHERTYPE_TRAIL) + (void)printf("trailer-"); + 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), + ATMTSA(ap), ATMTSLN(ap)); + (void)printf(")"); + } + (void)printf(" tell %s", ipaddr_string(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)); + break; + + case ARPOP_INVREQUEST: + (void)printf("invarp who-is "); + atmarp_addr_print(ATMTHA(ap), ATMTHLN(ap), ATMTSA(ap), + ATMTSLN(ap)); + (void)printf(" tell "); + atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap), ATMSSA(ap), + ATMSSLN(ap)); + break; + + case ARPOP_INVREPLY: + (void)printf("invarp reply "); + atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap), ATMSSA(ap), + ATMSSLN(ap)); + (void)printf(" at %s", ipaddr_string(ATMSPA(ap))); + break; + + case ATMARPOP_NAK: + (void)printf("nak reply for %s", + ipaddr_string(ATMSPA(ap))); + break; + + default: + (void)printf("atmarp-#%d", op); + default_print((const u_char *)ap, caplen); + return; + } + return; +trunc: + (void)printf("[|atmarp]"); +} + void arp_print(const u_char *bp, u_int length, u_int caplen) { @@ -110,17 +258,22 @@ arp_print(const u_char *bp, u_int length, u_int caplen) ap = (const struct arp_pkthdr *)bp; TCHECK(*ap); - if ((const u_char *)(ar_tpa(ap) + PLN(ap)) > snapend) { + 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; } - pro = EXTRACT_16BITS(&PRO(ap)); - hrd = EXTRACT_16BITS(&HRD(ap)); - op = EXTRACT_16BITS(&OP(ap)); - - if (pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) { + 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)); return; @@ -154,6 +307,18 @@ arp_print(const u_char *bp, u_int length, u_int caplen) ipaddr_string(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))); + break; + + case ARPOP_INVREPLY: + (void)printf("invarp reply %s at %s", + linkaddr_string(THA(ap), HLN(ap)), + ipaddr_string(TPA(ap))); + break; + default: (void)printf("arp-#%d", op); default_print((const u_char *)ap, caplen); -- cgit v1.1