/* \summary: IEEE 802.2 LLC printer */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include "netdissect.h"
#include "addrtoname.h"
int hdrlen;
int is_u;
+ ndo->ndo_protocol = "llc";
if (caplen < 3) {
- ND_PRINT((ndo, "[|llc]"));
+ nd_print_trunc(ndo);
ND_DEFAULTPRINT((const u_char *)p, caplen);
return (caplen);
}
if (length < 3) {
- ND_PRINT((ndo, "[|llc]"));
+ nd_print_trunc(ndo);
ND_DEFAULTPRINT((const u_char *)p, caplen);
return (length);
}
- dsap_field = *p;
- ssap_field = *(p + 1);
+ dsap_field = GET_U_1(p);
+ ssap_field = GET_U_1(p + 1);
/*
* OK, what type of LLC frame is this? The length
* have a two-byte control field, and U frames have
* a one-byte control field.
*/
- control = *(p + 2);
+ control = GET_U_1(p + 2);
if ((control & LLC_U_FMT) == LLC_U_FMT) {
/*
* U frame.
* 2 bytes...
*/
if (caplen < 4) {
- ND_PRINT((ndo, "[|llc]"));
+ nd_print_trunc(ndo);
ND_DEFAULTPRINT((const u_char *)p, caplen);
return (caplen);
}
if (length < 4) {
- ND_PRINT((ndo, "[|llc]"));
+ nd_print_trunc(ndo);
ND_DEFAULTPRINT((const u_char *)p, caplen);
return (length);
}
/*
* ...and is little-endian.
*/
- control = EXTRACT_LE_16BITS(p + 2);
+ control = GET_LE_U_2(p + 2);
is_u = 0;
hdrlen = 4; /* DSAP, SSAP, 2-byte control field */
}
/*
* This is an Ethernet_802.3 IPX frame; it has an
* 802.3 header (i.e., an Ethernet header where the
- * type/length field is <= ETHERMTU, i.e. it's a length
- * field, not a type field), but has no 802.2 header -
- * the IPX packet starts right after the Ethernet header,
- * with a signature of two bytes of 0xFF (which is
- * LLCSAP_GLOBAL).
+ * type/length field is <= MAX_ETHERNET_LENGTH_VAL,
+ * i.e. it's a length field, not a type field), but
+ * has no 802.2 header - the IPX packet starts right
+ * after the Ethernet header, with a signature of two
+ * bytes of 0xFF (which is LLCSAP_GLOBAL).
*
* (It might also have been an Ethernet_802.3 IPX at
* one time, but got bridged onto another network,
*/
if (ndo->ndo_eflag)
- ND_PRINT((ndo, "IPX 802.3: "));
+ ND_PRINT("IPX 802.3: ");
ipx_print(ndo, p, length);
return (0); /* no LLC header */
ssap = ssap_field & ~LLC_GSAP;
if (ndo->ndo_eflag) {
- ND_PRINT((ndo, "LLC, dsap %s (0x%02x) %s, ssap %s (0x%02x) %s",
+ ND_PRINT("LLC, dsap %s (0x%02x) %s, ssap %s (0x%02x) %s",
tok2str(llc_values, "Unknown", dsap),
dsap,
tok2str(llc_ig_flag_values, "Unknown", dsap_field & LLC_IG),
tok2str(llc_values, "Unknown", ssap),
ssap,
- tok2str(llc_flag_values, "Unknown", ssap_field & LLC_GSAP)));
+ tok2str(llc_flag_values, "Unknown", ssap_field & LLC_GSAP));
if (is_u) {
- ND_PRINT((ndo, ", ctrl 0x%02x: ", control));
+ ND_PRINT(", ctrl 0x%02x: ", control);
} else {
- ND_PRINT((ndo, ", ctrl 0x%04x: ", control));
+ ND_PRINT(", ctrl 0x%04x: ", control);
}
}
* destination SAPs being the IPX SAP.
*/
if (ndo->ndo_eflag)
- ND_PRINT((ndo, "IPX 802.2: "));
+ ND_PRINT("IPX 802.2: ");
ipx_print(ndo, p, length);
return (hdrlen);
if (!ndo->ndo_eflag) {
if (ssap == dsap) {
if (src == NULL || dst == NULL)
- ND_PRINT((ndo, "%s ", tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
+ ND_PRINT("%s ", tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
else
- ND_PRINT((ndo, "%s > %s %s ",
+ ND_PRINT("%s > %s %s ",
(src->addr_string)(ndo, src->addr),
(dst->addr_string)(ndo, dst->addr),
- tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
+ tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
} else {
if (src == NULL || dst == NULL)
- ND_PRINT((ndo, "%s > %s ",
+ ND_PRINT("%s > %s ",
tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),
- tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
+ tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
else
- ND_PRINT((ndo, "%s %s > %s %s ",
+ ND_PRINT("%s %s > %s %s ",
(src->addr_string)(ndo, src->addr),
tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),
(dst->addr_string)(ndo, dst->addr),
- tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
+ tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
}
}
if (is_u) {
- ND_PRINT((ndo, "Unnumbered, %s, Flags [%s], length %u",
+ ND_PRINT("Unnumbered, %s, Flags [%s], length %u",
tok2str(llc_cmd_values, "%02x", LLC_U_CMD(control)),
tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_U_POLL)),
- length + hdrlen));
+ length + hdrlen);
if ((control & ~LLC_U_POLL) == LLC_XID) {
if (length == 0) {
return (hdrlen);
}
if (caplen < 1) {
- ND_PRINT((ndo, "[|llc]"));
+ nd_print_trunc(ndo);
if (caplen > 0)
ND_DEFAULTPRINT((const u_char *)p, caplen);
return (hdrlen);
}
- if (*p == LLC_XID_FI) {
+ if (GET_U_1(p) == LLC_XID_FI) {
if (caplen < 3 || length < 3) {
- ND_PRINT((ndo, "[|llc]"));
+ nd_print_trunc(ndo);
if (caplen > 0)
ND_DEFAULTPRINT((const u_char *)p, caplen);
} else
- ND_PRINT((ndo, ": %02x %02x", p[1], p[2]));
+ ND_PRINT(": %02x %02x",
+ GET_U_1(p + 1),
+ GET_U_1(p + 2));
return (hdrlen);
}
}
} else {
if ((control & LLC_S_FMT) == LLC_S_FMT) {
- ND_PRINT((ndo, "Supervisory, %s, rcv seq %u, Flags [%s], length %u",
+ ND_PRINT("Supervisory, %s, rcv seq %u, Flags [%s], length %u",
tok2str(llc_supervisory_values,"?",LLC_S_CMD(control)),
LLC_IS_NR(control),
tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),
- length + hdrlen));
+ length + hdrlen);
return (hdrlen); /* no payload to print */
} else {
- ND_PRINT((ndo, "Information, send seq %u, rcv seq %u, Flags [%s], length %u",
+ ND_PRINT("Information, send seq %u, rcv seq %u, Flags [%s], length %u",
LLC_I_NS(control),
LLC_IS_NR(control),
tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),
- length + hdrlen));
+ length + hdrlen);
}
}
return (-hdrlen);
u_int bridge_pad)
{
uint32_t orgcode;
- register u_short et;
- register int ret;
+ u_short et;
+ int ret;
- ND_TCHECK2(*p, 5);
+ ndo->ndo_protocol = "snap";
+ ND_TCHECK_5(p);
if (caplen < 5 || length < 5)
goto trunc;
- orgcode = EXTRACT_24BITS(p);
- et = EXTRACT_16BITS(p + 3);
+ orgcode = GET_BE_U_3(p);
+ et = GET_BE_U_2(p + 3);
if (ndo->ndo_eflag) {
/*
* are any, so just print the SNAP header, not the MAC
* addresses.
*/
- ND_PRINT((ndo, "oui %s (0x%06x), %s %s (0x%04x), length %u: ",
+ ND_PRINT("oui %s (0x%06x), %s %s (0x%04x), length %u: ",
tok2str(oui_values, "Unknown", orgcode),
orgcode,
(orgcode == 0x000000 ? "ethertype" : "pid"),
tok2str(oui_to_struct_tok(orgcode), "Unknown", et),
- et, length - 5));
+ et, length - 5);
}
p += 5;
length -= 5;
/*
* Skip the padding.
*/
- ND_TCHECK2(*p, bridge_pad);
+ ND_TCHECK_LEN(p, bridge_pad);
caplen -= bridge_pad;
length -= bridge_pad;
p += bridge_pad;
* Skip the padding, but not the Access
* Control field.
*/
- ND_TCHECK2(*p, bridge_pad);
+ ND_TCHECK_LEN(p, bridge_pad);
caplen -= bridge_pad;
length -= bridge_pad;
p += bridge_pad;
/*
* Skip the padding.
*/
- ND_TCHECK2(*p, bridge_pad + 1);
+ ND_TCHECK_LEN(p, bridge_pad + 1);
caplen -= bridge_pad + 1;
length -= bridge_pad + 1;
p += bridge_pad + 1;
* we have any.
*/
if (src != NULL && dst != NULL) {
- ND_PRINT((ndo, "%s > %s ",
+ ND_PRINT("%s > %s ",
(src->addr_string)(ndo, src->addr),
- (dst->addr_string)(ndo, dst->addr)));
+ (dst->addr_string)(ndo, dst->addr));
}
/*
* Print the SNAP header, but if the OUI is 000000, don't
* ethertype.
*/
if (orgcode == 0x000000) {
- ND_PRINT((ndo, "SNAP, ethertype %s (0x%04x), length %u: ",
+ ND_PRINT("SNAP, ethertype %s (0x%04x), length %u: ",
tok2str(ethertype_values, "Unknown", et),
- et, length));
+ et, length);
} else {
- ND_PRINT((ndo, "SNAP, oui %s (0x%06x), pid %s (0x%04x), length %u: ",
+ ND_PRINT("SNAP, oui %s (0x%06x), pid %s (0x%04x), length %u: ",
tok2str(oui_values, "Unknown", orgcode),
orgcode,
tok2str(oui_to_struct_tok(orgcode), "Unknown", et),
- et, length));
+ et, length);
}
}
return (0);
trunc:
- ND_PRINT((ndo, "[|snap]"));
+ nd_print_trunc(ndo);
return (1);
}
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
projects / tcpdump / blobdiff