const u_char *tptr;
if (caplen < CDP_HEADER_LEN) {
- ND_PRINT((ndo, "%s", tstr));
+ ND_PRINT("%s", tstr);
return;
}
tptr = pptr; /* temporary pointer */
ND_TCHECK_LEN(tptr, CDP_HEADER_LEN);
- ND_PRINT((ndo, "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", EXTRACT_U_1((tptr + CDP_HEADER_VERSION_OFFSET)),
+ EXTRACT_U_1(tptr + CDP_HEADER_TTL_OFFSET));
if (ndo->ndo_vflag)
- ND_PRINT((ndo, ", checksum: 0x%04x (unverified), length %u", EXTRACT_BE_U_2(tptr + CDP_HEADER_CHECKSUM_OFFSET), length));
+ ND_PRINT(", checksum: 0x%04x (unverified), length %u", EXTRACT_BE_U_2(tptr + CDP_HEADER_CHECKSUM_OFFSET), length);
tptr += CDP_HEADER_LEN;
while (tptr < (pptr+length)) {
len = EXTRACT_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((ndo, "\n\t%s (0x%02x), TLV length: %u byte%s (too short)",
+ ND_PRINT("\n\t%s (0x%02x), TLV length: %u byte%s (too short)",
tok2str(cdp_tlv_values,"unknown field type", type),
type,
len,
- PLURAL_SUFFIX(len))); /* plural */
+ PLURAL_SUFFIX(len)); /* plural */
else
- ND_PRINT((ndo, ", %s TLV length %u too short",
+ ND_PRINT(", %s TLV length %u too short",
tok2str(cdp_tlv_values,"unknown field type", type),
- len));
+ len);
break;
}
tptr += CDP_TLV_HEADER_LEN;
if (ndo->ndo_vflag || type == 1) { /* in non-verbose mode just print Device-ID */
if (ndo->ndo_vflag)
- ND_PRINT((ndo, "\n\t%s (0x%02x), value length: %u byte%s: ",
+ ND_PRINT("\n\t%s (0x%02x), value length: %u byte%s: ",
tok2str(cdp_tlv_values,"unknown field type", type),
type,
len,
- PLURAL_SUFFIX(len))); /* plural */
+ PLURAL_SUFFIX(len)); /* plural */
switch (type) {
case 0x01: /* Device-ID */
if (!ndo->ndo_vflag)
- ND_PRINT((ndo, ", Device-ID "));
- ND_PRINT((ndo, "'"));
+ ND_PRINT(", Device-ID ");
+ ND_PRINT("'");
(void)fn_printn(ndo, tptr, len, NULL);
- ND_PRINT((ndo, "'"));
+ ND_PRINT("'");
break;
case 0x02: /* Address */
if (cdp_print_addr(ndo, tptr, len) < 0)
goto trunc;
break;
case 0x03: /* Port-ID */
- ND_PRINT((ndo, "'"));
+ ND_PRINT("'");
(void)fn_printn(ndo, tptr, len, NULL);
- ND_PRINT((ndo, "'"));
+ ND_PRINT("'");
break;
case 0x04: /* Capabilities */
if (len < 4)
goto trunc;
- ND_PRINT((ndo, "(0x%08x): %s",
+ ND_PRINT("(0x%08x): %s",
EXTRACT_BE_U_4(tptr),
- bittok2str(cdp_capability_values, "none", EXTRACT_BE_U_4(tptr))));
+ bittok2str(cdp_capability_values, "none", EXTRACT_BE_U_4(tptr)));
break;
case 0x05: /* Version */
- ND_PRINT((ndo, "\n\t "));
+ 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
get a nice indentation */
- ND_PRINT((ndo, "\n\t "));
+ ND_PRINT("\n\t ");
else
fn_print_char(ndo, j);
}
break;
case 0x06: /* Platform */
- ND_PRINT((ndo, "'"));
+ ND_PRINT("'");
(void)fn_printn(ndo, tptr, len, NULL);
- ND_PRINT((ndo, "'"));
+ ND_PRINT("'");
break;
case 0x07: /* Prefixes */
if (cdp_print_prefixes(ndo, tptr, len) < 0)
case 0x08: /* Protocol Hello Option - not documented */
break;
case 0x09: /* VTP Mgmt Domain - CDPv2 */
- ND_PRINT((ndo, "'"));
+ ND_PRINT("'");
(void)fn_printn(ndo, tptr, len, NULL);
- ND_PRINT((ndo, "'"));
+ ND_PRINT("'");
break;
case 0x0a: /* Native VLAN ID - CDPv2 */
if (len < 2)
goto trunc;
- ND_PRINT((ndo, "%d", EXTRACT_BE_U_2(tptr)));
+ ND_PRINT("%d", EXTRACT_BE_U_2(tptr));
break;
case 0x0b: /* Duplex - CDPv2 */
if (len < 1)
goto trunc;
- ND_PRINT((ndo, "%s", EXTRACT_U_1(tptr) ? "full": "half"));
+ ND_PRINT("%s", EXTRACT_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
case 0x0e: /* ATA-186 VoIP VLAN request - incomplete doc. */
if (len < 3)
goto trunc;
- ND_PRINT((ndo, "app %d, vlan %d", EXTRACT_U_1((tptr)), EXTRACT_BE_U_2(tptr + 1)));
+ ND_PRINT("app %d, vlan %d", EXTRACT_U_1((tptr)), EXTRACT_BE_U_2(tptr + 1));
break;
case 0x10: /* ATA-186 VoIP VLAN assignment - incomplete doc. */
- ND_PRINT((ndo, "%1.2fW", cdp_get_number(tptr, len) / 1000.0));
+ ND_PRINT("%1.2fW", cdp_get_number(tptr, len) / 1000.0);
break;
case 0x11: /* MTU - not documented */
if (len < 4)
goto trunc;
- ND_PRINT((ndo, "%u bytes", EXTRACT_BE_U_4(tptr)));
+ ND_PRINT("%u bytes", EXTRACT_BE_U_4(tptr));
break;
case 0x12: /* AVVID trust bitmap - not documented */
if (len < 1)
goto trunc;
- ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
+ ND_PRINT("0x%02x", EXTRACT_U_1(tptr));
break;
case 0x13: /* AVVID untrusted port CoS - not documented */
if (len < 1)
goto trunc;
- ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
+ ND_PRINT("0x%02x", EXTRACT_U_1(tptr));
break;
case 0x14: /* System Name - not documented */
- ND_PRINT((ndo, "'"));
+ ND_PRINT("'");
(void)fn_printn(ndo, tptr, len, NULL);
- ND_PRINT((ndo, "'"));
+ ND_PRINT("'");
break;
case 0x16: /* System Object ID - not documented */
if (cdp_print_addr(ndo, tptr, len) < 0)
case 0x17: /* Physical Location - not documented */
if (len < 1)
goto trunc;
- ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
+ ND_PRINT("0x%02x", EXTRACT_U_1(tptr));
if (len > 1) {
- ND_PRINT((ndo, "/"));
+ ND_PRINT("/");
(void)fn_printn(ndo, tptr + 1, len - 1, NULL);
}
break;
tptr = tptr+len;
}
if (ndo->ndo_vflag < 1)
- ND_PRINT((ndo, ", length %u", caplen));
+ ND_PRINT(", length %u", caplen);
return;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ ND_PRINT("%s", tstr);
}
/*
ND_TCHECK_4(p);
if (p + 4 > endp)
goto trunc;
- ND_PRINT((ndo, "IPv4 (%u) %s", num, ipaddr_string(ndo, p)));
+ ND_PRINT("IPv4 (%u) %s", num, ipaddr_string(ndo, p));
p += 4;
}
else if (pt == PT_IEEE_802_2 && pl == 8 &&
if (p + al > endp)
goto trunc;
- ND_PRINT((ndo, "IPv6 (%u) %s", num, ip6addr_string(ndo, p)));
+ ND_PRINT("IPv6 (%u) %s", num, ip6addr_string(ndo, p));
p += al;
}
else {
ND_TCHECK_LEN(p, pl);
if (p + pl > endp)
goto trunc;
- ND_PRINT((ndo, "pt=0x%02x, pl=%d, pb=", EXTRACT_U_1((p - 2)), pl));
+ ND_PRINT("pt=0x%02x, pl=%d, pb=", EXTRACT_U_1((p - 2)), pl);
while (pl-- > 0) {
- ND_PRINT((ndo, " %02x", EXTRACT_U_1(p)));
+ ND_PRINT(" %02x", EXTRACT_U_1(p));
p++;
}
ND_TCHECK_2(p);
if (p + 2 > endp)
goto trunc;
- ND_PRINT((ndo, ", al=%d, a=", al));
+ ND_PRINT(", al=%d, a=", al);
p += 2;
ND_TCHECK_LEN(p, al);
if (p + al > endp)
goto trunc;
while (al-- > 0) {
- ND_PRINT((ndo, " %02x", EXTRACT_U_1(p)));
+ ND_PRINT(" %02x", EXTRACT_U_1(p));
p++;
}
}
num--;
if (num)
- ND_PRINT((ndo, " "));
+ ND_PRINT(" ");
}
return 0;
if (l % 5)
goto trunc;
- ND_PRINT((ndo, " IPv4 Prefixes (%d):", l / 5));
+ ND_PRINT(" IPv4 Prefixes (%d):", l / 5);
while (l > 0) {
- ND_PRINT((ndo, " %u.%u.%u.%u/%u",
+ 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)));
+ EXTRACT_U_1(p + 3), EXTRACT_U_1(p + 4));
l -= 5;
p += 5;
}
projects / tcpdump / blobdiff