nd_uint16_t htype, ptype;
nd_uint8_t halen, palen;
nd_uint16_t op;
- uint8_t hsaddr[6];
+ uint8_t hsaddr[MAC_ADDR_LEN];
uint8_t psaddr[4];
- uint8_t hdaddr[6];
+ uint8_t hdaddr[MAC_ADDR_LEN];
uint8_t pdaddr[4];
};
/*
* Print LLAP packets received on a physical LocalTalk interface.
*/
-u_int
+void
ltalk_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
u_int hdrlen;
- ndo->ndo_protocol = "ltalk_if";
+ ndo->ndo_protocol = "ltalk";
hdrlen = llap_print(ndo, p, h->len);
if (hdrlen == 0) {
/* Cut short by the snapshot length. */
- return (h->caplen);
+ ndo->ndo_ll_hdr_len += h->caplen;
+ return;
}
- return (hdrlen);
+ ndo->ndo_ll_hdr_len += hdrlen;
}
/*
return (length);
}
if (!ND_TTEST_LEN(bp, sizeof(*lp))) {
- ND_PRINT(" [|llap]");
+ nd_print_trunc(ndo);
return (0); /* cut short by the snapshot length */
}
lp = (const struct LAP *)bp;
bp += sizeof(*lp);
length -= sizeof(*lp);
hdrlen = sizeof(*lp);
- switch (EXTRACT_U_1(lp->type)) {
+ switch (GET_U_1(lp->type)) {
case lapShortDDP:
if (length < ddpSSize) {
}
sdp = (const struct atShortDDP *)bp;
ND_PRINT("%s.%s",
- ataddr_string(ndo, 0, EXTRACT_U_1(lp->src)), ddpskt_string(ndo, EXTRACT_U_1(sdp->srcSkt)));
+ ataddr_string(ndo, 0, GET_U_1(lp->src)),
+ ddpskt_string(ndo, GET_U_1(sdp->srcSkt)));
ND_PRINT(" > %s.%s:",
- ataddr_string(ndo, 0, EXTRACT_U_1(lp->dst)), ddpskt_string(ndo, EXTRACT_U_1(sdp->dstSkt)));
+ ataddr_string(ndo, 0, GET_U_1(lp->dst)),
+ ddpskt_string(ndo, GET_U_1(sdp->dstSkt)));
bp += ddpSSize;
length -= ddpSSize;
hdrlen += ddpSSize;
- ddp_print(ndo, bp, length, EXTRACT_U_1(sdp->type), 0, EXTRACT_U_1(lp->src), EXTRACT_U_1(sdp->srcSkt));
+ ddp_print(ndo, bp, length, GET_U_1(sdp->type), 0,
+ GET_U_1(lp->src), GET_U_1(sdp->srcSkt));
break;
case lapDDP:
return (0); /* cut short by the snapshot length */
}
dp = (const struct atDDP *)bp;
- snet = EXTRACT_BE_U_2(dp->srcNet);
- ND_PRINT("%s.%s", ataddr_string(ndo, snet, EXTRACT_U_1(dp->srcNode)),
- ddpskt_string(ndo, EXTRACT_U_1(dp->srcSkt)));
+ snet = GET_BE_U_2(dp->srcNet);
+ ND_PRINT("%s.%s",
+ ataddr_string(ndo, snet, GET_U_1(dp->srcNode)),
+ ddpskt_string(ndo, GET_U_1(dp->srcSkt)));
ND_PRINT(" > %s.%s:",
- ataddr_string(ndo, EXTRACT_BE_U_2(dp->dstNet), EXTRACT_U_1(dp->dstNode)),
- ddpskt_string(ndo, EXTRACT_U_1(dp->dstSkt)));
+ ataddr_string(ndo, GET_BE_U_2(dp->dstNet), GET_U_1(dp->dstNode)),
+ ddpskt_string(ndo, GET_U_1(dp->dstSkt)));
bp += ddpSize;
length -= ddpSize;
hdrlen += ddpSize;
- ddp_print(ndo, bp, length, EXTRACT_U_1(dp->type), snet, EXTRACT_U_1(dp->srcNode), EXTRACT_U_1(dp->srcSkt));
+ ddp_print(ndo, bp, length, GET_U_1(dp->type), snet,
+ GET_U_1(dp->srcNode), GET_U_1(dp->srcSkt));
break;
#ifdef notdef
default:
ND_PRINT("%u > %u at-lap#%u %u",
- EXTRACT_U_1(lp->src), EXTRACT_U_1(lp->dst), EXTRACT_U_1(lp->type), length);
+ GET_U_1(lp->src), GET_U_1(lp->dst), GET_U_1(lp->type),
+ length);
break;
}
return (hdrlen);
return;
}
dp = (const struct atDDP *)bp;
- snet = EXTRACT_BE_U_2(dp->srcNet);
- ND_PRINT("%s.%s", ataddr_string(ndo, snet, EXTRACT_U_1(dp->srcNode)),
- ddpskt_string(ndo, EXTRACT_U_1(dp->srcSkt)));
+ snet = GET_BE_U_2(dp->srcNet);
+ ND_PRINT("%s.%s", ataddr_string(ndo, snet, GET_U_1(dp->srcNode)),
+ ddpskt_string(ndo, GET_U_1(dp->srcSkt)));
ND_PRINT(" > %s.%s: ",
- ataddr_string(ndo, EXTRACT_BE_U_2(dp->dstNet), EXTRACT_U_1(dp->dstNode)),
- ddpskt_string(ndo, EXTRACT_U_1(dp->dstSkt)));
+ ataddr_string(ndo, GET_BE_U_2(dp->dstNet), GET_U_1(dp->dstNode)),
+ ddpskt_string(ndo, GET_U_1(dp->dstSkt)));
bp += ddpSize;
length -= ddpSize;
- ddp_print(ndo, bp, length, EXTRACT_U_1(dp->type), snet, EXTRACT_U_1(dp->srcNode), EXTRACT_U_1(dp->srcSkt));
+ ddp_print(ndo, bp, length, GET_U_1(dp->type), snet,
+ GET_U_1(dp->srcNode), GET_U_1(dp->srcSkt));
}
/* XXX should probably pass in the snap header and do checks like arp_print() */
ap = (const struct aarp *)bp;
if (!ND_TTEST_SIZE(ap)) {
/* Just bail if we don't have the whole chunk. */
- ND_PRINT(" [|aarp]");
+ nd_print_trunc(ndo);
return;
}
if (length < sizeof(*ap)) {
ND_PRINT(" [|aarp %u]", length);
return;
}
- if (EXTRACT_BE_U_2(ap->htype) == 1 &&
- EXTRACT_BE_U_2(ap->ptype) == ETHERTYPE_ATALK &&
- EXTRACT_U_1(ap->halen) == 6 && EXTRACT_U_1(ap->palen) == 4 )
- switch (EXTRACT_BE_U_2(ap->op)) {
+ if (GET_BE_U_2(ap->htype) == 1 &&
+ GET_BE_U_2(ap->ptype) == ETHERTYPE_ATALK &&
+ GET_U_1(ap->halen) == MAC_ADDR_LEN && GET_U_1(ap->palen) == 4)
+ switch (GET_BE_U_2(ap->op)) {
case 1: /* request */
ND_PRINT("who-has %s tell %s", AT(pdaddr), AT(psaddr));
return;
case 2: /* response */
- ND_PRINT("reply %s is-at %s", AT(psaddr), etheraddr_string(ndo, ap->hsaddr));
+ ND_PRINT("reply %s is-at %s", AT(psaddr), GET_ETHERADDR_STRING(ap->hsaddr));
return;
case 3: /* probe (oy!) */
return;
}
ND_PRINT("len %u op %u htype %u ptype %#x halen %u palen %u",
- length, EXTRACT_BE_U_2(ap->op), EXTRACT_BE_U_2(ap->htype),
- EXTRACT_BE_U_2(ap->ptype), EXTRACT_U_1(ap->halen), EXTRACT_U_1(ap->palen));
+ length, GET_BE_U_2(ap->op), GET_BE_U_2(ap->htype),
+ GET_BE_U_2(ap->ptype), GET_U_1(ap->halen), GET_U_1(ap->palen));
}
/*
return;
}
length -= sizeof(*ap);
- control = EXTRACT_U_1(ap->control);
+ control = GET_U_1(ap->control);
switch (control & 0xc0) {
case atpReqCode:
ND_PRINT(" atp-req%s %u",
control & atpXO? " " : "*",
- EXTRACT_BE_U_2(ap->transID));
+ GET_BE_U_2(ap->transID));
- atp_bitmap_print(ndo, EXTRACT_U_1(ap->bitmap));
+ atp_bitmap_print(ndo, GET_U_1(ap->bitmap));
if (length != 0)
ND_PRINT(" [len=%u]", length);
case atpRspCode:
ND_PRINT(" atp-resp%s%u:%u (%u)",
control & atpEOM? "*" : " ",
- EXTRACT_BE_U_2(ap->transID), EXTRACT_U_1(ap->bitmap), length);
+ GET_BE_U_2(ap->transID), GET_U_1(ap->bitmap),
+ length);
switch (control & (atpXO|atpSTS)) {
case atpXO:
ND_PRINT(" [XO]");
break;
case atpRelCode:
- ND_PRINT(" atp-rel %u", EXTRACT_BE_U_2(ap->transID));
+ ND_PRINT(" atp-rel %u", GET_BE_U_2(ap->transID));
- atp_bitmap_print(ndo, EXTRACT_U_1(ap->bitmap));
+ atp_bitmap_print(ndo, GET_U_1(ap->bitmap));
/* length should be zero */
if (length)
default:
ND_PRINT(" atp-0x%x %u (%u)", control,
- EXTRACT_BE_U_2(ap->transID), length);
+ GET_BE_U_2(ap->transID), length);
break;
}
- data = EXTRACT_BE_U_4(ap->userData);
+ data = GET_BE_U_4(ap->userData);
if (data != 0)
ND_PRINT(" 0x%x", data);
}
nd_print_trunc(ndo);
return;
}
- control = EXTRACT_U_1(np->control);
+ control = GET_U_1(np->control);
switch (i = (control & 0xf0)) {
case nbpBrRq:
case nbpLkUp:
- ND_PRINT(i == nbpLkUp? " nbp-lkup %u:":" nbp-brRq %u:", EXTRACT_U_1(np->id));
+ ND_PRINT(i == nbpLkUp? " nbp-lkup %u:":" nbp-brRq %u:",
+ GET_U_1(np->id));
if ((const u_char *)(tp + 1) > ep) {
nd_print_trunc(ndo);
return;
*/
if ((control & 0xf) != 1)
ND_PRINT(" [ntup=%u]", control & 0xf);
- if (EXTRACT_U_1(tp->enumerator))
- ND_PRINT(" [enum=%u]", EXTRACT_U_1(tp->enumerator));
- if (EXTRACT_BE_U_2(tp->net) != snet ||
- EXTRACT_U_1(tp->node) != snode ||
- EXTRACT_U_1(tp->skt) != skt)
+ if (GET_U_1(tp->enumerator))
+ ND_PRINT(" [enum=%u]", GET_U_1(tp->enumerator));
+ if (GET_BE_U_2(tp->net) != snet ||
+ GET_U_1(tp->node) != snode ||
+ GET_U_1(tp->skt) != skt)
ND_PRINT(" [addr=%s.%u]",
- ataddr_string(ndo, EXTRACT_BE_U_2(tp->net),
- EXTRACT_U_1(tp->node)),
- EXTRACT_U_1(tp->skt));
+ ataddr_string(ndo, GET_BE_U_2(tp->net),
+ GET_U_1(tp->node)),
+ GET_U_1(tp->skt));
break;
case nbpLkUpReply:
- ND_PRINT(" nbp-reply %u:", EXTRACT_U_1(np->id));
+ ND_PRINT(" nbp-reply %u:", GET_U_1(np->id));
/* print each of the tuples in the reply */
for (i = control & 0xf; i != 0 && tp; i--)
break;
default:
- ND_PRINT(" nbp-0x%x %u (%u)", control, EXTRACT_U_1(np->id), length);
+ ND_PRINT(" nbp-0x%x %u (%u)", control, GET_U_1(np->id),
+ length);
break;
}
}
nd_print_trunc(ndo);
return (0);
}
- length = EXTRACT_U_1(cp);
+ length = GET_U_1(cp);
cp++;
/* Spec says string can be at most 32 bytes long */
nd_print_trunc(ndo);
return (0);
}
- fn_print_char(ndo, EXTRACT_U_1(cp));
+ fn_print_char(ndo, GET_U_1(cp));
cp++;
length--;
}
tpn = nbp_name_print(ndo, tp, ep);
/* if the enumerator isn't 1, print it */
- if (EXTRACT_U_1(tp->enumerator) != 1)
- ND_PRINT("(%u)", EXTRACT_U_1(tp->enumerator));
+ if (GET_U_1(tp->enumerator) != 1)
+ ND_PRINT("(%u)", GET_U_1(tp->enumerator));
/* if the socket doesn't match the src socket, print it */
- if (EXTRACT_U_1(tp->skt) != skt)
- ND_PRINT(" %u", EXTRACT_U_1(tp->skt));
+ if (GET_U_1(tp->skt) != skt)
+ ND_PRINT(" %u", GET_U_1(tp->skt));
/* if the address doesn't match the src address, it's an anomaly */
- if (EXTRACT_BE_U_2(tp->net) != snet ||
- EXTRACT_U_1(tp->node) != snode)
+ if (GET_BE_U_2(tp->net) != snet ||
+ GET_U_1(tp->node) != snode)
ND_PRINT(" [addr=%s]",
- ataddr_string(ndo, EXTRACT_BE_U_2(tp->net), EXTRACT_U_1(tp->node)));
+ ataddr_string(ndo, GET_BE_U_2(tp->net), GET_U_1(tp->node)));
return (tpn);
}
FILE *fp;
/*
- * if this is the first call, see if there's an AppleTalk
- * number to name map file.
+ * Are we doing address to name resolution?
*/
- if (first && (first = 0, !ndo->ndo_nflag)
- && (fp = fopen("/etc/atalk.names", "r"))) {
- char line[256];
- u_int i1, i2;
-
- while (fgets(line, sizeof(line), fp)) {
- if (line[0] == '\n' || line[0] == 0 || line[0] == '#')
- continue;
- if (sscanf(line, "%u.%u %256s", &i1, &i2, nambuf) == 3)
- /* got a hostname. */
- i2 |= (i1 << 8);
- else if (sscanf(line, "%u %256s", &i1, nambuf) == 2)
- /* got a net name */
- i2 = (i1 << 8) | 255;
- else
- continue;
-
- for (tp = &hnametable[i2 & (HASHNAMESIZE-1)];
- tp->nxt; tp = tp->nxt)
- ;
- tp->addr = i2;
- tp->nxt = newhnamemem(ndo);
- tp->name = strdup(nambuf);
- if (tp->name == NULL)
- (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
- "ataddr_string: strdup(nambuf)");
+ if (!ndo->ndo_nflag) {
+ /*
+ * Yes. Have we tried to open and read an AppleTalk
+ * number to name map file?
+ */
+ if (!first) {
+ /*
+ * No; try to do so.
+ */
+ first = 0;
+ fp = fopen("/etc/atalk.names", "r");
+ if (fp != NULL) {
+ char line[256];
+ u_int i1, i2;
+
+ while (fgets(line, sizeof(line), fp)) {
+ if (line[0] == '\n' || line[0] == 0 ||
+ line[0] == '#')
+ continue;
+ if (sscanf(line, "%u.%u %256s", &i1,
+ &i2, nambuf) == 3)
+ /* got a hostname. */
+ i2 |= (i1 << 8);
+ else if (sscanf(line, "%u %256s", &i1,
+ nambuf) == 2)
+ /* got a net name */
+ i2 = (i1 << 8) | 255;
+ else
+ continue;
+
+ for (tp = &hnametable[i2 & (HASHNAMESIZE-1)];
+ tp->nxt; tp = tp->nxt)
+ ;
+ tp->addr = i2;
+ tp->nxt = newhnamemem(ndo);
+ tp->name = strdup(nambuf);
+ if (tp->name == NULL)
+ (*ndo->ndo_error)(ndo,
+ S_ERR_ND_MEM_ALLOC,
+ "%s: strdup(nambuf)", __func__);
+ }
+ fclose(fp);
+ }
}
- fclose(fp);
}
+ /*
+ * Now try to look up the address in the table.
+ */
for (tp = &hnametable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
if (tp->addr == i)
return (tp->name);
if (tp2->addr == i) {
tp->addr = (atnet << 8) | athost;
tp->nxt = newhnamemem(ndo);
- (void)nd_snprintf(nambuf, sizeof(nambuf), "%s.%u",
+ (void)snprintf(nambuf, sizeof(nambuf), "%s.%u",
tp2->name, athost);
tp->name = strdup(nambuf);
if (tp->name == NULL)
(*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
- "ataddr_string: strdup(nambuf)");
+ "%s: strdup(nambuf)", __func__);
return (tp->name);
}
tp->addr = (atnet << 8) | athost;
tp->nxt = newhnamemem(ndo);
if (athost != 255)
- (void)nd_snprintf(nambuf, sizeof(nambuf), "%u.%u", atnet, athost);
+ (void)snprintf(nambuf, sizeof(nambuf), "%u.%u", atnet, athost);
else
- (void)nd_snprintf(nambuf, sizeof(nambuf), "%u", atnet);
+ (void)snprintf(nambuf, sizeof(nambuf), "%u", atnet);
tp->name = strdup(nambuf);
if (tp->name == NULL)
(*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
- "ataddr_string: strdup(nambuf)");
+ "%s: strdup(nambuf)", __func__);
return (tp->name);
}
static char buf[8];
if (ndo->ndo_nflag) {
- (void)nd_snprintf(buf, sizeof(buf), "%u", skt);
+ (void)snprintf(buf, sizeof(buf), "%u", skt);
return (buf);
}
return (tok2str(skt2str, "%u", skt));
projects / tcpdump / blobdiff