X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3824a6c0417a551961d1a1bf4f94f10eff736afc..5663cdab5ec8730ade9938c1ace64a4859d9ef7b:/print-atalk.c?ds=sidebyside diff --git a/print-atalk.c b/print-atalk.c index 09518dd7..0f46fa3e 100644 --- a/print-atalk.c +++ b/print-atalk.c @@ -21,7 +21,6 @@ * Format and print AppleTalk packets. */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -31,7 +30,6 @@ #include #include #include -#include #include "interface.h" #include "addrtoname.h" @@ -39,11 +37,9 @@ #include "extract.h" /* must come after interface.h */ #include "appletalk.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.79 2003-11-15 00:39:16 guy Exp $ (LBL)"; -#endif -static struct tok type2str[] = { +static const char tstr[] = "[|atalk]"; + +static const struct tok type2str[] = { { ddpRTMP, "rtmp" }, { ddpRTMPrequest, "rtmpReq" }, { ddpECHO, "echo" }, @@ -63,8 +59,6 @@ struct aarp { u_int8_t pdaddr[4]; }; -static char tstr[] = "[|atalk]"; - static void atp_print(const struct atATP *, u_int); static void atp_bitmap_print(u_char); static void nbp_print(const struct atNBP *, u_int, u_short, u_char, u_char); @@ -99,14 +93,10 @@ llap_print(register const u_char *bp, u_int length) u_short snet; u_int hdrlen; - /* - * Our packet is on a 4-byte boundary, as we're either called - * directly from a top-level link-layer printer (ltalk_if_print) - * or from the UDP printer. The LLAP+DDP header is a multiple - * of 4 bytes in length, so the DDP payload is also on a 4-byte - * boundary, and we don't need to align it before calling - * "ddp_print()". - */ + if (length < sizeof(*lp)) { + (void)printf(" [|llap %u]", length); + return (length); + } lp = (const struct LAP *)bp; bp += sizeof(*lp); length -= sizeof(*lp); @@ -115,7 +105,7 @@ llap_print(register const u_char *bp, u_int length) case lapShortDDP: if (length < ddpSSize) { - (void)printf(" [|sddp %d]", length); + (void)printf(" [|sddp %u]", length); return (length); } sdp = (const struct atShortDDP *)bp; @@ -131,7 +121,7 @@ llap_print(register const u_char *bp, u_int length) case lapDDP: if (length < ddpSize) { - (void)printf(" [|ddp %d]", length); + (void)printf(" [|ddp %u]", length); return (length); } dp = (const struct atDDP *)bp; @@ -154,7 +144,7 @@ llap_print(register const u_char *bp, u_int length) #endif default: - printf("%d > %d at-lap#%d %d", + printf("%d > %d at-lap#%d %u", lp->src, lp->dst, lp->type, length); break; } @@ -172,15 +162,18 @@ atalk_print(register const u_char *bp, u_int length) register const struct atDDP *dp; u_short snet; + if(!eflag) + printf("AT "); + if (length < ddpSize) { - (void)printf(" [|ddp %d]", length); + (void)printf(" [|ddp %u]", length); return; } dp = (const struct atDDP *)bp; snet = EXTRACT_16BITS(&dp->srcNet); printf("%s.%s", ataddr_string(snet, dp->srcNode), ddpskt_string(dp->srcSkt)); - printf(" > %s.%s:", + printf(" > %s.%s: ", ataddr_string(EXTRACT_16BITS(&dp->dstNet), dp->dstNode), ddpskt_string(dp->dstSkt)); bp += ddpSize; @@ -210,7 +203,7 @@ aarp_print(register const u_char *bp, u_int length) case 2: /* response */ (void)printf("reply %s is-at %s", - AT(pdaddr), etheraddr_string(ap->hdaddr)); + AT(psaddr), etheraddr_string(ap->hsaddr)); return; case 3: /* probe (oy!) */ @@ -241,6 +234,10 @@ ddp_print(register const u_char *bp, register u_int length, register int t, atp_print((const struct atATP *)bp, length); break; + case ddpEIGRP: + eigrp_print(gndo, bp, length); + break; + default: (void)printf(" at-%s %d", tok2str(type2str, NULL, t), length); break; @@ -258,6 +255,10 @@ atp_print(register const struct atATP *ap, u_int length) fputs(tstr, stdout); return; } + if (length < sizeof(*ap)) { + (void)printf(" [|atp %u]", length); + return; + } length -= sizeof(*ap); switch (ap->control & 0xc0) { @@ -269,7 +270,7 @@ atp_print(register const struct atATP *ap, u_int length) atp_bitmap_print(ap->bitmap); if (length != 0) - (void)printf(" [len=%d]", length); + (void)printf(" [len=%u]", length); switch (ap->control & (atpEOM|atpSTS)) { case atpEOM: @@ -285,7 +286,7 @@ atp_print(register const struct atATP *ap, u_int length) break; case atpRspCode: - (void)printf(" atp-resp%s%d:%d (%d)", + (void)printf(" atp-resp%s%d:%d (%u)", ap->control & atpEOM? "*" : " ", EXTRACT_16BITS(&ap->transID), ap->bitmap, length); switch (ap->control & (atpXO|atpSTS)) { @@ -308,7 +309,7 @@ atp_print(register const struct atATP *ap, u_int length) /* length should be zero */ if (length) - (void)printf(" [len=%d]", length); + (void)printf(" [len=%u]", length); /* there shouldn't be any control flags */ if (ap->control & (atpXO|atpEOM|atpSTS)) { @@ -330,7 +331,7 @@ atp_print(register const struct atATP *ap, u_int length) break; default: - (void)printf(" atp-0x%x %d (%d)", ap->control, + (void)printf(" atp-0x%x %d (%u)", ap->control, EXTRACT_16BITS(&ap->transID), length); break; } @@ -380,14 +381,14 @@ nbp_print(register const struct atNBP *np, u_int length, register u_short snet, const u_char *ep; if (length < nbpHeaderSize) { - (void)printf(" truncated-nbp %d", length); + (void)printf(" truncated-nbp %u", length); return; } length -= nbpHeaderSize; if (length < 8) { /* must be room for at least one tuple */ - (void)printf(" truncated-nbp %d", length + nbpHeaderSize); + (void)printf(" truncated-nbp %u", length + nbpHeaderSize); return; } /* ep points to end of available data */ @@ -432,7 +433,7 @@ nbp_print(register const struct atNBP *np, u_int length, register u_short snet, break; default: - (void)printf(" nbp-0x%x %d (%d)", np->control, np->id, + (void)printf(" nbp-0x%x %d (%u)", np->control, np->id, length); break; } @@ -533,7 +534,7 @@ ataddr_string(u_short atnet, u_char athost) { register struct hnamemem *tp, *tp2; register int i = (atnet << 8) | athost; - char nambuf[MAXHOSTNAMELEN + 20]; + char nambuf[256+1]; static int first = 1; FILE *fp; @@ -544,26 +545,24 @@ ataddr_string(u_short atnet, u_char athost) if (first && (first = 0, !nflag) && (fp = fopen("/etc/atalk.names", "r"))) { char line[256]; - int i1, i2, i3; + int i1, i2; while (fgets(line, sizeof(line), fp)) { if (line[0] == '\n' || line[0] == 0 || line[0] == '#') continue; - if (sscanf(line, "%d.%d.%d %256s", &i1, &i2, &i3, - nambuf) == 4) + if (sscanf(line, "%d.%d %256s", &i1, &i2, nambuf) == 3) /* got a hostname. */ - i3 |= ((i1 << 8) | i2) << 8; - else if (sscanf(line, "%d.%d %256s", &i1, &i2, - nambuf) == 3) + i2 |= (i1 << 8); + else if (sscanf(line, "%d %256s", &i1, nambuf) == 2) /* got a net name */ - i3 = (((i1 << 8) | i2) << 8) | 255; + i2 = (i1 << 8) | 255; else continue; - for (tp = &hnametable[i3 & (HASHNAMESIZE-1)]; + for (tp = &hnametable[i2 & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt) ; - tp->addr = i3; + tp->addr = i2; tp->nxt = newhnamemem(); tp->name = strdup(nambuf); } @@ -589,17 +588,15 @@ ataddr_string(u_short atnet, u_char athost) tp->addr = (atnet << 8) | athost; tp->nxt = newhnamemem(); if (athost != 255) - (void)snprintf(nambuf, sizeof(nambuf), "%d.%d.%d", - atnet >> 8, atnet & 0xff, athost); + (void)snprintf(nambuf, sizeof(nambuf), "%d.%d", atnet, athost); else - (void)snprintf(nambuf, sizeof(nambuf), "%d.%d", atnet >> 8, - atnet & 0xff); + (void)snprintf(nambuf, sizeof(nambuf), "%d", atnet); tp->name = strdup(nambuf); return (tp->name); } -static struct tok skt2str[] = { +static const struct tok skt2str[] = { { rtmpSkt, "rtmp" }, /* routing table maintenance */ { nbpSkt, "nis" }, /* name info socket */ { echoSkt, "echo" }, /* AppleTalk echo protocol */