/* \summary: AppleTalk printer */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include <stdio.h>
#include <string.h>
#include "extract.h"
#include "appletalk.h"
-static const char tstr[] = "[|atalk]";
static const struct tok type2str[] = {
{ ddpRTMP, "rtmp" },
static const struct atNBPtuple *nbp_name_print(netdissect_options *, const struct atNBPtuple *,
const u_char *);
static const char *ataddr_string(netdissect_options *, u_short, u_char);
-static void ddp_print(netdissect_options *, const u_char *, u_int, int, u_short, u_char, u_char);
-static const char *ddpskt_string(netdissect_options *, int);
+static void ddp_print(netdissect_options *, const u_char *, u_int, u_int, u_short, u_char, u_char);
+static const char *ddpskt_string(netdissect_options *, u_int);
/*
* Print LLAP packets received on a physical LocalTalk interface.
{
u_int hdrlen;
+ ndo->ndo_protocol = "ltalk_if";
hdrlen = llap_print(ndo, p, h->len);
if (hdrlen == 0) {
/* Cut short by the snapshot length. */
u_short snet;
u_int hdrlen;
+ ndo->ndo_protocol = "llap";
if (length < sizeof(*lp)) {
- ND_PRINT((ndo, " [|llap %u]", length));
+ ND_PRINT(" [|llap %u]", length);
return (length);
}
if (!ND_TTEST_LEN(bp, sizeof(*lp))) {
- ND_PRINT((ndo, " [|llap]"));
+ nd_print_trunc(ndo);
return (0); /* cut short by the snapshot length */
}
lp = (const struct LAP *)bp;
case lapShortDDP:
if (length < ddpSSize) {
- ND_PRINT((ndo, " [|sddp %u]", length));
+ ND_PRINT(" [|sddp %u]", length);
return (length);
}
if (!ND_TTEST_LEN(bp, ddpSSize)) {
- ND_PRINT((ndo, " [|sddp]"));
+ ND_PRINT(" [|sddp]");
return (0); /* cut short by the snapshot length */
}
sdp = (const struct atShortDDP *)bp;
- ND_PRINT((ndo, "%s.%s",
- ataddr_string(ndo, 0, EXTRACT_U_1(lp->src)), ddpskt_string(ndo, EXTRACT_U_1(sdp->srcSkt))));
- ND_PRINT((ndo, " > %s.%s:",
- ataddr_string(ndo, 0, EXTRACT_U_1(lp->dst)), ddpskt_string(ndo, EXTRACT_U_1(sdp->dstSkt))));
+ ND_PRINT("%s.%s",
+ ataddr_string(ndo, 0, EXTRACT_U_1(lp->src)), ddpskt_string(ndo, EXTRACT_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)));
bp += ddpSSize;
length -= ddpSSize;
hdrlen += ddpSSize;
case lapDDP:
if (length < ddpSize) {
- ND_PRINT((ndo, " [|ddp %u]", length));
+ ND_PRINT(" [|ddp %u]", length);
return (length);
}
if (!ND_TTEST_LEN(bp, ddpSize)) {
- ND_PRINT((ndo, " [|ddp]"));
+ ND_PRINT(" [|ddp]");
return (0); /* cut short by the snapshot length */
}
dp = (const struct atDDP *)bp;
snet = EXTRACT_BE_U_2(dp->srcNet);
- ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, EXTRACT_U_1(dp->srcNode)),
- ddpskt_string(ndo, EXTRACT_U_1(dp->srcSkt))));
- ND_PRINT((ndo, " > %s.%s:",
+ ND_PRINT("%s.%s", ataddr_string(ndo, snet, EXTRACT_U_1(dp->srcNode)),
+ ddpskt_string(ndo, EXTRACT_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))));
+ ddpskt_string(ndo, EXTRACT_U_1(dp->dstSkt)));
bp += ddpSize;
length -= ddpSize;
hdrlen += ddpSize;
#endif
default:
- ND_PRINT((ndo, "%u > %u at-lap#%u %u",
- EXTRACT_U_1(lp->src), EXTRACT_U_1(lp->dst), EXTRACT_U_1(lp->type), length));
+ ND_PRINT("%u > %u at-lap#%u %u",
+ EXTRACT_U_1(lp->src), EXTRACT_U_1(lp->dst), EXTRACT_U_1(lp->type), length);
break;
}
return (hdrlen);
const struct atDDP *dp;
u_short snet;
+ ndo->ndo_protocol = "atalk";
if(!ndo->ndo_eflag)
- ND_PRINT((ndo, "AT "));
+ ND_PRINT("AT ");
if (length < ddpSize) {
- ND_PRINT((ndo, " [|ddp %u]", length));
+ ND_PRINT(" [|ddp %u]", length);
return;
}
if (!ND_TTEST_LEN(bp, ddpSize)) {
- ND_PRINT((ndo, " [|ddp]"));
+ ND_PRINT(" [|ddp]");
return;
}
dp = (const struct atDDP *)bp;
snet = EXTRACT_BE_U_2(dp->srcNet);
- ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, EXTRACT_U_1(dp->srcNode)),
- ddpskt_string(ndo, EXTRACT_U_1(dp->srcSkt))));
- ND_PRINT((ndo, " > %s.%s: ",
+ ND_PRINT("%s.%s", ataddr_string(ndo, snet, EXTRACT_U_1(dp->srcNode)),
+ ddpskt_string(ndo, EXTRACT_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))));
+ ddpskt_string(ndo, EXTRACT_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));
#define AT(member) ataddr_string(ndo, (ap->member[1]<<8)|ap->member[2],ap->member[3])
- ND_PRINT((ndo, "aarp "));
+ ndo->ndo_protocol = "aarp";
+ ND_PRINT("aarp ");
ap = (const struct aarp *)bp;
- if (!ND_TTEST(*ap)) {
+ if (!ND_TTEST_SIZE(ap)) {
/* Just bail if we don't have the whole chunk. */
- ND_PRINT((ndo, " [|aarp]"));
+ nd_print_trunc(ndo);
return;
}
if (length < sizeof(*ap)) {
- ND_PRINT((ndo, " [|aarp %u]", length));
+ ND_PRINT(" [|aarp %u]", length);
return;
}
if (EXTRACT_BE_U_2(ap->htype) == 1 &&
switch (EXTRACT_BE_U_2(ap->op)) {
case 1: /* request */
- ND_PRINT((ndo, "who-has %s tell %s", AT(pdaddr), AT(psaddr)));
+ ND_PRINT("who-has %s tell %s", AT(pdaddr), AT(psaddr));
return;
case 2: /* response */
- ND_PRINT((ndo, "reply %s is-at %s", AT(psaddr), etheraddr_string(ndo, ap->hsaddr)));
+ ND_PRINT("reply %s is-at %s", AT(psaddr), etheraddr_string(ndo, ap->hsaddr));
return;
case 3: /* probe (oy!) */
- ND_PRINT((ndo, "probe %s tell %s", AT(pdaddr), AT(psaddr)));
+ ND_PRINT("probe %s tell %s", AT(pdaddr), AT(psaddr));
return;
}
- ND_PRINT((ndo, "len %u op %u htype %u ptype %#x halen %u palen %u",
+ 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)));
+ EXTRACT_BE_U_2(ap->ptype), EXTRACT_U_1(ap->halen), EXTRACT_U_1(ap->palen));
}
/*
*/
static void
ddp_print(netdissect_options *ndo,
- const u_char *bp, u_int length, int t,
+ const u_char *bp, u_int length, u_int t,
u_short snet, u_char snode, u_char skt)
{
break;
default:
- ND_PRINT((ndo, " at-%s %d", tok2str(type2str, NULL, t), length));
+ ND_PRINT(" at-%s %u", tok2str(type2str, NULL, t), length);
break;
}
}
if ((const u_char *)(ap + 1) > ndo->ndo_snapend) {
/* Just bail if we don't have the whole chunk. */
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
return;
}
if (length < sizeof(*ap)) {
- ND_PRINT((ndo, " [|atp %u]", length));
+ ND_PRINT(" [|atp %u]", length);
return;
}
length -= sizeof(*ap);
switch (control & 0xc0) {
case atpReqCode:
- ND_PRINT((ndo, " atp-req%s %u",
+ ND_PRINT(" atp-req%s %u",
control & atpXO? " " : "*",
- EXTRACT_BE_U_2(ap->transID)));
+ EXTRACT_BE_U_2(ap->transID));
atp_bitmap_print(ndo, EXTRACT_U_1(ap->bitmap));
if (length != 0)
- ND_PRINT((ndo, " [len=%u]", length));
+ ND_PRINT(" [len=%u]", length);
switch (control & (atpEOM|atpSTS)) {
case atpEOM:
- ND_PRINT((ndo, " [EOM]"));
+ ND_PRINT(" [EOM]");
break;
case atpSTS:
- ND_PRINT((ndo, " [STS]"));
+ ND_PRINT(" [STS]");
break;
case atpEOM|atpSTS:
- ND_PRINT((ndo, " [EOM,STS]"));
+ ND_PRINT(" [EOM,STS]");
break;
}
break;
case atpRspCode:
- ND_PRINT((ndo, " atp-resp%s%d:%u (%u)",
+ ND_PRINT(" atp-resp%s%u:%u (%u)",
control & atpEOM? "*" : " ",
- EXTRACT_BE_U_2(ap->transID), EXTRACT_U_1(ap->bitmap), length));
+ EXTRACT_BE_U_2(ap->transID), EXTRACT_U_1(ap->bitmap), length);
switch (control & (atpXO|atpSTS)) {
case atpXO:
- ND_PRINT((ndo, " [XO]"));
+ ND_PRINT(" [XO]");
break;
case atpSTS:
- ND_PRINT((ndo, " [STS]"));
+ ND_PRINT(" [STS]");
break;
case atpXO|atpSTS:
- ND_PRINT((ndo, " [XO,STS]"));
+ ND_PRINT(" [XO,STS]");
break;
}
break;
case atpRelCode:
- ND_PRINT((ndo, " atp-rel %u", EXTRACT_BE_U_2(ap->transID)));
+ ND_PRINT(" atp-rel %u", EXTRACT_BE_U_2(ap->transID));
atp_bitmap_print(ndo, EXTRACT_U_1(ap->bitmap));
/* length should be zero */
if (length)
- ND_PRINT((ndo, " [len=%u]", length));
+ ND_PRINT(" [len=%u]", length);
/* there shouldn't be any control flags */
if (control & (atpXO|atpEOM|atpSTS)) {
char c = '[';
if (control & atpXO) {
- ND_PRINT((ndo, "%cXO", c));
+ ND_PRINT("%cXO", c);
c = ',';
}
if (control & atpEOM) {
- ND_PRINT((ndo, "%cEOM", c));
+ ND_PRINT("%cEOM", c);
c = ',';
}
if (control & atpSTS) {
- ND_PRINT((ndo, "%cSTS", c));
+ ND_PRINT("%cSTS", c);
}
- ND_PRINT((ndo, "]"));
+ ND_PRINT("]");
}
break;
default:
- ND_PRINT((ndo, " atp-0x%x %d (%u)", control,
- EXTRACT_BE_U_2(ap->transID), length));
+ ND_PRINT(" atp-0x%x %u (%u)", control,
+ EXTRACT_BE_U_2(ap->transID), length);
break;
}
data = EXTRACT_BE_U_4(ap->userData);
if (data != 0)
- ND_PRINT((ndo, " 0x%x", data));
+ ND_PRINT(" 0x%x", data);
}
static void
atp_bitmap_print(netdissect_options *ndo,
u_char bm)
{
- int i;
+ u_int i;
/*
* The '& 0xff' below is needed for compilers that want to sign
char c = '<';
for (i = 0; bm; ++i) {
if (bm & 1) {
- ND_PRINT((ndo, "%c%d", c, i));
+ ND_PRINT("%c%u", c, i);
c = ',';
}
bm >>= 1;
}
- ND_PRINT((ndo, ">"));
+ ND_PRINT(">");
} else {
for (i = 0; bm; ++i)
bm >>= 1;
if (i > 1)
- ND_PRINT((ndo, "<0-%d>", i - 1));
+ ND_PRINT("<0-%u>", i - 1);
else
- ND_PRINT((ndo, "<0>"));
+ ND_PRINT("<0>");
}
}
const struct atNBPtuple *tp =
(const struct atNBPtuple *)((const u_char *)np + nbpHeaderSize);
uint8_t control;
- int i;
+ u_int i;
const u_char *ep;
if (length < nbpHeaderSize) {
- ND_PRINT((ndo, " truncated-nbp %u", length));
+ ND_PRINT(" truncated-nbp %u", length);
return;
}
length -= nbpHeaderSize;
if (length < 8) {
/* must be room for at least one tuple */
- ND_PRINT((ndo, " truncated-nbp %u", length + nbpHeaderSize));
+ ND_PRINT(" truncated-nbp %u", length + nbpHeaderSize);
return;
}
/* ep points to end of available data */
ep = ndo->ndo_snapend;
if ((const u_char *)tp > ep) {
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
return;
}
control = EXTRACT_U_1(np->control);
case nbpBrRq:
case nbpLkUp:
- ND_PRINT((ndo, i == nbpLkUp? " nbp-lkup %u:":" nbp-brRq %u:", EXTRACT_U_1(np->id)));
+ ND_PRINT(i == nbpLkUp? " nbp-lkup %u:":" nbp-brRq %u:", EXTRACT_U_1(np->id));
if ((const u_char *)(tp + 1) > ep) {
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
return;
}
(void)nbp_name_print(ndo, tp, ep);
* address and the enumerator should be zero.
*/
if ((control & 0xf) != 1)
- ND_PRINT((ndo, " [ntup=%u]", control & 0xf));
+ ND_PRINT(" [ntup=%u]", control & 0xf);
if (EXTRACT_U_1(tp->enumerator))
- ND_PRINT((ndo, " [enum=%u]", 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)
- ND_PRINT((ndo, " [addr=%s.%d]",
+ ND_PRINT(" [addr=%s.%u]",
ataddr_string(ndo, EXTRACT_BE_U_2(tp->net),
EXTRACT_U_1(tp->node)),
- EXTRACT_U_1(tp->skt)));
+ EXTRACT_U_1(tp->skt));
break;
case nbpLkUpReply:
- ND_PRINT((ndo, " nbp-reply %u:", EXTRACT_U_1(np->id)));
+ ND_PRINT(" nbp-reply %u:", EXTRACT_U_1(np->id));
/* print each of the tuples in the reply */
- for (i = control & 0xf; --i >= 0 && tp; )
+ for (i = control & 0xf; i != 0 && tp; i--)
tp = nbp_tuple_print(ndo, tp, ep, snet, snode, skt);
break;
default:
- ND_PRINT((ndo, " nbp-0x%x %u (%u)", control, EXTRACT_U_1(np->id), length));
+ ND_PRINT(" nbp-0x%x %u (%u)", control, EXTRACT_U_1(np->id), length);
break;
}
}
/* print a counted string */
-static const char *
+static const u_char *
print_cstring(netdissect_options *ndo,
- const char *cp, const u_char *ep)
+ const u_char *cp, const u_char *ep)
{
u_int length;
- if (cp >= (const char *)ep) {
- ND_PRINT((ndo, "%s", tstr));
+ if (cp >= ep) {
+ nd_print_trunc(ndo);
return (0);
}
length = EXTRACT_U_1(cp);
/* Spec says string can be at most 32 bytes long */
if (length > 32) {
- ND_PRINT((ndo, "[len=%u]", length));
+ ND_PRINT("[len=%u]", length);
return (0);
}
while (length != 0) {
- if (cp >= (const char *)ep) {
- ND_PRINT((ndo, "%s", tstr));
+ if (cp >= ep) {
+ nd_print_trunc(ndo);
return (0);
}
- ND_PRINT((ndo, "%c", EXTRACT_U_1(cp)));
+ fn_print_char(ndo, EXTRACT_U_1(cp));
cp++;
length--;
}
const struct atNBPtuple *tpn;
if ((const u_char *)(tp + 1) > ep) {
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
return 0;
}
tpn = nbp_name_print(ndo, tp, ep);
/* if the enumerator isn't 1, print it */
if (EXTRACT_U_1(tp->enumerator) != 1)
- ND_PRINT((ndo, "(%u)", EXTRACT_U_1(tp->enumerator)));
+ ND_PRINT("(%u)", EXTRACT_U_1(tp->enumerator));
/* if the socket doesn't match the src socket, print it */
if (EXTRACT_U_1(tp->skt) != skt)
- ND_PRINT((ndo, " %u", EXTRACT_U_1(tp->skt)));
+ ND_PRINT(" %u", EXTRACT_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)
- ND_PRINT((ndo, " [addr=%s]",
- ataddr_string(ndo, EXTRACT_BE_U_2(tp->net), EXTRACT_U_1(tp->node))));
+ ND_PRINT(" [addr=%s]",
+ ataddr_string(ndo, EXTRACT_BE_U_2(tp->net), EXTRACT_U_1(tp->node)));
return (tpn);
}
nbp_name_print(netdissect_options *ndo,
const struct atNBPtuple *tp, const u_char *ep)
{
- const char *cp = (const char *)tp + nbpTupleSize;
+ const u_char *cp = (const u_char *)tp + nbpTupleSize;
- ND_PRINT((ndo, " "));
+ ND_PRINT(" ");
/* Object */
- ND_PRINT((ndo, "\""));
+ ND_PRINT("\"");
if ((cp = print_cstring(ndo, cp, ep)) != NULL) {
/* Type */
- ND_PRINT((ndo, ":"));
+ ND_PRINT(":");
if ((cp = print_cstring(ndo, cp, ep)) != NULL) {
/* Zone */
- ND_PRINT((ndo, "@"));
+ ND_PRINT("@");
if ((cp = print_cstring(ndo, cp, ep)) != NULL)
- ND_PRINT((ndo, "\""));
+ ND_PRINT("\"");
}
}
return ((const struct atNBPtuple *)cp);
#define HASHNAMESIZE 4096
struct hnamemem {
- int addr;
+ u_int addr;
char *name;
struct hnamemem *nxt;
};
u_short atnet, u_char athost)
{
struct hnamemem *tp, *tp2;
- int i = (atnet << 8) | athost;
+ u_int i = (atnet << 8) | athost;
char nambuf[256+1];
static int first = 1;
FILE *fp;
if (first && (first = 0, !ndo->ndo_nflag)
&& (fp = fopen("/etc/atalk.names", "r"))) {
char line[256];
- int i1, i2;
+ u_int i1, i2;
while (fgets(line, sizeof(line), fp)) {
if (line[0] == '\n' || line[0] == 0 || line[0] == '#')
continue;
- if (sscanf(line, "%d.%d %256s", &i1, &i2, nambuf) == 3)
+ if (sscanf(line, "%u.%u %256s", &i1, &i2, nambuf) == 3)
/* got a hostname. */
i2 |= (i1 << 8);
- else if (sscanf(line, "%d %256s", &i1, nambuf) == 2)
+ else if (sscanf(line, "%u %256s", &i1, nambuf) == 2)
/* got a net name */
i2 = (i1 << 8) | 255;
else
tp->nxt = newhnamemem(ndo);
tp->name = strdup(nambuf);
if (tp->name == NULL)
- (*ndo->ndo_error)(ndo,
- "ataddr_string: strdup(nambuf)");
+ (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+ "ataddr_string: strdup(nambuf)");
}
fclose(fp);
}
if (tp2->addr == i) {
tp->addr = (atnet << 8) | athost;
tp->nxt = newhnamemem(ndo);
- (void)snprintf(nambuf, sizeof(nambuf), "%s.%d",
+ (void)nd_snprintf(nambuf, sizeof(nambuf), "%s.%u",
tp2->name, athost);
tp->name = strdup(nambuf);
if (tp->name == NULL)
- (*ndo->ndo_error)(ndo,
- "ataddr_string: strdup(nambuf)");
+ (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+ "ataddr_string: strdup(nambuf)");
return (tp->name);
}
tp->addr = (atnet << 8) | athost;
tp->nxt = newhnamemem(ndo);
if (athost != 255)
- (void)snprintf(nambuf, sizeof(nambuf), "%d.%d", atnet, athost);
+ (void)nd_snprintf(nambuf, sizeof(nambuf), "%u.%u", atnet, athost);
else
- (void)snprintf(nambuf, sizeof(nambuf), "%d", atnet);
+ (void)nd_snprintf(nambuf, sizeof(nambuf), "%u", atnet);
tp->name = strdup(nambuf);
if (tp->name == NULL)
- (*ndo->ndo_error)(ndo, "ataddr_string: strdup(nambuf)");
+ (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+ "ataddr_string: strdup(nambuf)");
return (tp->name);
}
static const char *
ddpskt_string(netdissect_options *ndo,
- int skt)
+ u_int skt)
{
static char buf[8];
if (ndo->ndo_nflag) {
- (void)snprintf(buf, sizeof(buf), "%d", skt);
+ (void)nd_snprintf(buf, sizeof(buf), "%u", skt);
return (buf);
}
- return (tok2str(skt2str, "%d", skt));
+ return (tok2str(skt2str, "%u", skt));
}
projects / tcpdump / blobdiff