*
* Reference documentation:
- * http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
+ * https://web.archive.org/web/20000914194913/http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.pdf
*/
/* \summary: Cisco Discovery Protocol (CDP) printer */
#include "extract.h"
#include "nlpid.h"
-static const char tstr[] = "[|cdp]";
#define CDP_HEADER_LEN 4
#define CDP_HEADER_VERSION_OFFSET 0
static int cdp_print_addr(netdissect_options *, const u_char *, u_int);
static int cdp_print_prefixes(netdissect_options *, const u_char *, u_int);
-static unsigned int cdp_get_number(const u_char *, u_int);
+static unsigned int cdp_get_number(netdissect_options *, const u_char *, u_int);
void
cdp_print(netdissect_options *ndo,
const u_char *pptr, u_int length, u_int caplen)
{
- u_int type, len, i, j;
+ u_int type, len, i;
const u_char *tptr;
ndo->ndo_protocol = "cdp";
if (caplen < CDP_HEADER_LEN) {
- ND_PRINT("%s", tstr);
+ nd_print_trunc(ndo);
return;
}
tptr = pptr; /* temporary pointer */
ND_TCHECK_LEN(tptr, CDP_HEADER_LEN);
- ND_PRINT("CDPv%u, ttl: %us", EXTRACT_U_1((tptr + CDP_HEADER_VERSION_OFFSET)),
- EXTRACT_U_1(tptr + CDP_HEADER_TTL_OFFSET));
+ ND_PRINT("CDPv%u, ttl: %us",
+ GET_U_1((tptr + CDP_HEADER_VERSION_OFFSET)),
+ GET_U_1(tptr + CDP_HEADER_TTL_OFFSET));
if (ndo->ndo_vflag)
- ND_PRINT(", checksum: 0x%04x (unverified), length %u", EXTRACT_BE_U_2(tptr + CDP_HEADER_CHECKSUM_OFFSET), length);
+ ND_PRINT(", checksum: 0x%04x (unverified), length %u",
+ GET_BE_U_2(tptr + CDP_HEADER_CHECKSUM_OFFSET),
+ length);
tptr += CDP_HEADER_LEN;
while (tptr < (pptr+length)) {
ND_TCHECK_LEN(tptr, CDP_TLV_HEADER_LEN); /* read out Type and Length */
- type = EXTRACT_BE_U_2(tptr + CDP_TLV_TYPE_OFFSET);
- len = EXTRACT_BE_U_2(tptr + CDP_TLV_LEN_OFFSET); /* object length includes the 4 bytes header length */
+ type = GET_BE_U_2(tptr + CDP_TLV_TYPE_OFFSET);
+ len = GET_BE_U_2(tptr + CDP_TLV_LEN_OFFSET); /* object length includes the 4 bytes header length */
if (len < CDP_TLV_HEADER_LEN) {
if (ndo->ndo_vflag)
ND_PRINT("\n\t%s (0x%02x), TLV length: %u byte%s (too short)",
if (!ndo->ndo_vflag)
ND_PRINT(", Device-ID ");
ND_PRINT("'");
- (void)fn_printn(ndo, tptr, len, NULL);
+ (void)nd_printn(ndo, tptr, len, NULL);
ND_PRINT("'");
break;
case 0x02: /* Address */
break;
case 0x03: /* Port-ID */
ND_PRINT("'");
- (void)fn_printn(ndo, tptr, len, NULL);
+ (void)nd_printn(ndo, tptr, len, NULL);
ND_PRINT("'");
break;
case 0x04: /* Capabilities */
if (len < 4)
goto trunc;
ND_PRINT("(0x%08x): %s",
- EXTRACT_BE_U_4(tptr),
- bittok2str(cdp_capability_values, "none", EXTRACT_BE_U_4(tptr)));
+ GET_BE_U_4(tptr),
+ bittok2str(cdp_capability_values, "none", GET_BE_U_4(tptr)));
break;
case 0x05: /* Version */
ND_PRINT("\n\t ");
for (i=0;i<len;i++) {
- j = EXTRACT_U_1(tptr + i);
- if (j == '\n') /* lets rework the version string to
+ u_char c;
+
+ c = GET_U_1(tptr + i);
+ if (c == '\n') /* lets rework the version string to
get a nice indentation */
ND_PRINT("\n\t ");
else
- fn_print_char(ndo, j);
+ fn_print_char(ndo, c);
}
break;
case 0x06: /* Platform */
ND_PRINT("'");
- (void)fn_printn(ndo, tptr, len, NULL);
+ (void)nd_printn(ndo, tptr, len, NULL);
ND_PRINT("'");
break;
case 0x07: /* Prefixes */
break;
case 0x09: /* VTP Mgmt Domain - CDPv2 */
ND_PRINT("'");
- (void)fn_printn(ndo, tptr, len, NULL);
+ (void)nd_printn(ndo, tptr, len, NULL);
ND_PRINT("'");
break;
case 0x0a: /* Native VLAN ID - CDPv2 */
if (len < 2)
goto trunc;
- ND_PRINT("%u", EXTRACT_BE_U_2(tptr));
+ ND_PRINT("%u", GET_BE_U_2(tptr));
break;
case 0x0b: /* Duplex - CDPv2 */
if (len < 1)
goto trunc;
- ND_PRINT("%s", EXTRACT_U_1(tptr) ? "full": "half");
+ ND_PRINT("%s", GET_U_1(tptr) ? "full": "half");
break;
- /* http://www.cisco.com/c/en/us/td/docs/voice_ip_comm/cata/186/2_12_m/english/release/notes/186rn21m.html
+ /* https://www.cisco.com/c/en/us/td/docs/voice_ip_comm/cata/186/2_12_m/english/release/notes/186rn21m.html
* plus more details from other sources
*
* There are apparently versions of the request with both
case 0x0e: /* ATA-186 VoIP VLAN assignment - incomplete doc. */
if (len < 3)
goto trunc;
- ND_PRINT("app %u, vlan %u", EXTRACT_U_1(tptr), EXTRACT_BE_U_2(tptr + 1));
+ ND_PRINT("app %u, vlan %u", GET_U_1(tptr),
+ GET_BE_U_2(tptr + 1));
break;
case 0x0f: /* ATA-186 VoIP VLAN request - incomplete doc. */
if (len < 2)
goto trunc;
if (len == 2)
- ND_PRINT("unknown 0x%04x", EXTRACT_BE_U_2(tptr));
+ ND_PRINT("unknown 0x%04x", GET_BE_U_2(tptr));
else
- ND_PRINT("app %u, vlan %u", EXTRACT_U_1(tptr), EXTRACT_BE_U_2(tptr + 1));
+ ND_PRINT("app %u, vlan %u", GET_U_1(tptr),
+ GET_BE_U_2(tptr + 1));
break;
case 0x10: /* Power - not documented */
- ND_PRINT("%1.2fW", cdp_get_number(tptr, len) / 1000.0);
+ ND_PRINT("%1.2fW", cdp_get_number(ndo, tptr, len) / 1000.0);
break;
case 0x11: /* MTU - not documented */
if (len < 4)
goto trunc;
- ND_PRINT("%u bytes", EXTRACT_BE_U_4(tptr));
+ ND_PRINT("%u bytes", GET_BE_U_4(tptr));
break;
case 0x12: /* AVVID trust bitmap - not documented */
if (len < 1)
goto trunc;
- ND_PRINT("0x%02x", EXTRACT_U_1(tptr));
+ ND_PRINT("0x%02x", GET_U_1(tptr));
break;
case 0x13: /* AVVID untrusted port CoS - not documented */
if (len < 1)
goto trunc;
- ND_PRINT("0x%02x", EXTRACT_U_1(tptr));
+ ND_PRINT("0x%02x", GET_U_1(tptr));
break;
case 0x14: /* System Name - not documented */
ND_PRINT("'");
- (void)fn_printn(ndo, tptr, len, NULL);
+ (void)nd_printn(ndo, tptr, len, NULL);
ND_PRINT("'");
break;
case 0x16: /* System Object ID - not documented */
case 0x17: /* Physical Location - not documented */
if (len < 1)
goto trunc;
- ND_PRINT("0x%02x", EXTRACT_U_1(tptr));
+ ND_PRINT("0x%02x", GET_U_1(tptr));
if (len > 1) {
ND_PRINT("/");
- (void)fn_printn(ndo, tptr + 1, len - 1, NULL);
+ (void)nd_printn(ndo, tptr + 1, len - 1, NULL);
}
break;
default:
return;
trunc:
- ND_PRINT("%s", tstr);
+ nd_print_trunc(ndo);
}
/*
ND_TCHECK_4(p);
if (p + 4 > endp)
goto trunc;
- num = EXTRACT_BE_U_4(p);
+ num = GET_BE_U_4(p);
p += 4;
while (p < endp && num != 0) {
ND_TCHECK_2(p);
if (p + 2 > endp)
goto trunc;
- pt = EXTRACT_U_1(p); /* type of "protocol" field */
- pl = EXTRACT_U_1(p + 1); /* length of "protocol" field */
+ pt = GET_U_1(p); /* type of "protocol" field */
+ pl = GET_U_1(p + 1); /* length of "protocol" field */
p += 2;
ND_TCHECK_2(p + pl);
if (p + pl + 2 > endp)
goto trunc;
- al = EXTRACT_BE_U_2(p + pl); /* address length */
+ al = GET_BE_U_2(p + pl); /* address length */
- if (pt == PT_NLPID && pl == 1 && EXTRACT_U_1(p) == NLPID_IP &&
+ if (pt == PT_NLPID && pl == 1 && GET_U_1(p) == NLPID_IP &&
al == 4) {
/*
* IPv4: protocol type = NLPID, protocol length = 1
*/
p += 3;
- ND_TCHECK_4(p);
if (p + 4 > endp)
goto trunc;
- ND_PRINT("IPv4 (%u) %s", num, ipaddr_string(ndo, p));
+ ND_PRINT("IPv4 (%u) %s", num, GET_IPADDR_STRING(p));
p += 4;
}
else if (pt == PT_IEEE_802_2 && pl == 8 &&
if (p + al > endp)
goto trunc;
- ND_PRINT("IPv6 (%u) %s", num, ip6addr_string(ndo, p));
+ ND_PRINT("IPv6 (%u) %s", num, GET_IP6ADDR_STRING(p));
p += al;
}
else {
ND_TCHECK_LEN(p, pl);
if (p + pl > endp)
goto trunc;
- ND_PRINT("pt=0x%02x, pl=%u, pb=", EXTRACT_U_1((p - 2)), pl);
- while (pl-- > 0) {
- ND_PRINT(" %02x", EXTRACT_U_1(p));
+ ND_PRINT("pt=0x%02x, pl=%u, pb=", GET_U_1((p - 2)),
+ pl);
+ while (pl != 0) {
+ ND_PRINT(" %02x", GET_U_1(p));
p++;
+ pl--;
}
ND_TCHECK_2(p);
if (p + 2 > endp)
ND_TCHECK_LEN(p, al);
if (p + al > endp)
goto trunc;
- while (al-- > 0) {
- ND_PRINT(" %02x", EXTRACT_U_1(p));
+ while (al != 0) {
+ ND_PRINT(" %02x", GET_U_1(p));
p++;
+ al--;
}
}
num--;
while (l > 0) {
ND_PRINT(" %u.%u.%u.%u/%u",
- EXTRACT_U_1(p), EXTRACT_U_1(p + 1), EXTRACT_U_1(p + 2),
- EXTRACT_U_1(p + 3), EXTRACT_U_1(p + 4));
+ GET_U_1(p), GET_U_1(p + 1), GET_U_1(p + 2),
+ GET_U_1(p + 3), GET_U_1(p + 4));
l -= 5;
p += 5;
}
/* read in a <n>-byte number, MSB first
* (of course this can handle max sizeof(int))
*/
-static unsigned int cdp_get_number(const u_char * p, u_int l)
+static unsigned int
+cdp_get_number(netdissect_options *ndo, const u_char * p, u_int l)
{
unsigned int res=0;
while( l>0 )
{
- res = (res<<8) + EXTRACT_U_1(p);
+ res = (res<<8) + GET_U_1(p);
p++; l--;
}
return res;
projects / tcpdump / blobdiff