The Tcpdump Group git mirrors - tcpdump/blobdiff

index f2235d289e205d261431151abd3b8af1150da3cb..9ce2dfd1298a6e9f5cc11148962bd5c83058a2d9 100644 (file)

--- a/print-isoclns.c

+++ b/print-isoclns.c

@@ -375,6 +375,7 @@ static const struct tok isis_router_capability_sr_flags[] = {

#define ISIS_SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE 20 /* rfc4205 */

#define ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR 21 /* rfc4205 */

#define ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS 22 /* rfc4124 */

#define ISIS_SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE 20 /* rfc4205 */

#define ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR 21 /* rfc4205 */

#define ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS 22 /* rfc4124 */

+#define ISIS_SUBTLV_EXT_IS_REACH_LAN_ADJ_SEGMENT_ID 32 /* rfc8667 */

#define ISIS_SUBTLV_SPB_METRIC 29 /* rfc6329 */

@@ -393,6 +394,7 @@ static const struct tok isis_ext_is_reach_subtlv_values[] = {

{ ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR, "Interface Switching Capability" },

{ ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS_OLD, "Bandwidth Constraints (old)" },

{ ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS, "Bandwidth Constraints" },

{ ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR, "Interface Switching Capability" },

{ ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS_OLD, "Bandwidth Constraints (old)" },

{ ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS, "Bandwidth Constraints" },

+ { ISIS_SUBTLV_EXT_IS_REACH_LAN_ADJ_SEGMENT_ID, "LAN Adjacency Segment Identifier" },

{ ISIS_SUBTLV_SPB_METRIC, "SPB Metric" },

{ 250, "Reserved for cisco specific extensions" },

{ 251, "Reserved for cisco specific extensions" },

{ ISIS_SUBTLV_SPB_METRIC, "SPB Metric" },

{ 250, "Reserved for cisco specific extensions" },

{ 251, "Reserved for cisco specific extensions" },

@@ -448,6 +450,16 @@ static const struct tok isis_subtlv_link_attribute_values[] = {

{ 0, NULL }

};

{ 0, NULL }

};

+static const struct tok isis_lan_adj_sid_flag_values[] = {

+ { 0x80, "Address family IPv6" },

+ { 0x40, "Backup" },

+ { 0x20, "Value" },

+ { 0x10, "Local significance" },

+ { 0x08, "Set of adjacencies" },

+ { 0x04, "Persistent" },

+ { 0, NULL }

+};

#define ISIS_SUBTLV_AUTH_SIMPLE 1

#define ISIS_SUBTLV_AUTH_GENERIC 3 /* rfc 5310 */

#define ISIS_SUBTLV_AUTH_MD5 54

#define ISIS_SUBTLV_AUTH_SIMPLE 1

#define ISIS_SUBTLV_AUTH_GENERIC 3 /* rfc 5310 */

#define ISIS_SUBTLV_AUTH_MD5 54

@@ -723,7 +735,6 @@ void

isoclns_print(netdissect_options *ndo, const u_char *p, u_int length)

{

ndo->ndo_protocol = "isoclns";

isoclns_print(netdissect_options *ndo, const u_char *p, u_int length)

{

ndo->ndo_protocol = "isoclns";

- ND_TCHECK_1(p); /* enough bytes on the wire ? */

if (ndo->ndo_eflag)

ND_PRINT("OSI NLPID %s (0x%02x): ",

if (ndo->ndo_eflag)

ND_PRINT("OSI NLPID %s (0x%02x): ",

@@ -774,9 +785,6 @@ isoclns_print(netdissect_options *ndo, const u_char *p, u_int length)

print_unknown_data(ndo, p, "\n\t", length);

break;

}

print_unknown_data(ndo, p, "\n\t", length);

break;

}

- return;

-trunc:

- nd_print_trunc(ndo);

}

#define CLNP_PDU_ER 1

}

#define CLNP_PDU_ER 1

@@ -872,7 +880,6 @@ clnp_print(netdissect_options *ndo,

ND_PRINT("li < size of fixed part of CLNP header and addresses");

return (0);

}

ND_PRINT("li < size of fixed part of CLNP header and addresses");

return (0);

}

- ND_TCHECK_1(pptr);

dest_address_length = GET_U_1(pptr);

pptr += 1;

li_remaining -= 1;

dest_address_length = GET_U_1(pptr);

pptr += 1;

li_remaining -= 1;

@@ -889,7 +896,6 @@ clnp_print(netdissect_options *ndo,

ND_PRINT("li < size of fixed part of CLNP header and addresses");

return (0);

}

ND_PRINT("li < size of fixed part of CLNP header and addresses");

return (0);

}

- ND_TCHECK_1(pptr);

source_address_length = GET_U_1(pptr);

pptr += 1;

li_remaining -= 1;

source_address_length = GET_U_1(pptr);

pptr += 1;

li_remaining -= 1;

@@ -958,7 +964,6 @@ clnp_print(netdissect_options *ndo,

ND_PRINT(", bad opts/li");

return (0);

}

ND_PRINT(", bad opts/li");

return (0);

}

- ND_TCHECK_2(pptr);

op = GET_U_1(pptr);

opli = GET_U_1(pptr + 1);

pptr += 2;

op = GET_U_1(pptr);

opli = GET_U_1(pptr + 1);

pptr += 2;

@@ -1017,8 +1022,6 @@ clnp_print(netdissect_options *ndo,

}

if (source_address_length > 0) {

source_address=(tptr+1);

}

if (source_address_length > 0) {

source_address=(tptr+1);

- ND_TCHECK_LEN(source_address,

- source_address_length);

ND_PRINT("\n\t NSAP address (length %u): %s",

source_address_length,

GET_ISONSAP_STRING(source_address, source_address_length));

ND_PRINT("\n\t NSAP address (length %u): %s",

source_address_length,

GET_ISONSAP_STRING(source_address, source_address_length));

@@ -1097,7 +1100,6 @@ clnp_print(netdissect_options *ndo,

case CLNP_PDU_ER: /* fall through */

case CLNP_PDU_ERP:

case CLNP_PDU_ER: /* fall through */

case CLNP_PDU_ERP:

- ND_TCHECK_1(pptr);

if (GET_U_1(pptr) == NLPID_CLNP) {

ND_PRINT("\n\t-----original packet-----\n\t");

/* FIXME recursion protection */

if (GET_U_1(pptr) == NLPID_CLNP) {

ND_PRINT("\n\t-----original packet-----\n\t");

/* FIXME recursion protection */

@@ -1123,9 +1125,9 @@ clnp_print(netdissect_options *ndo,

default:

/* dump the PDU specific data */

default:

/* dump the PDU specific data */

- if (length-(pptr-optr) > 0) {

+ if (length > ND_BYTES_BETWEEN(pptr, optr)) {

ND_PRINT("\n\t undecoded non-header data, length %u", length-li);

- print_unknown_data(ndo, pptr, "\n\t ", length - (int)(pptr - optr));

+ print_unknown_data(ndo, pptr, "\n\t ", length - ND_BYTES_BETWEEN(pptr, optr));

}

@@ -1296,7 +1298,7 @@ esis_print(netdissect_options *ndo,

pptr += netal;

li -= netal;

pptr += netal;

li -= netal;

- if (snpal == 6)

+ if (snpal == MAC_ADDR_LEN)

ND_PRINT("\n\t SNPA (length: %u): %s",

snpal,

GET_ETHERADDR_STRING(snpa));

ND_PRINT("\n\t SNPA (length: %u): %s",

snpal,

GET_ETHERADDR_STRING(snpa));

@@ -1370,8 +1372,12 @@ esis_print(netdissect_options *ndo,

default:

if (ndo->ndo_vflag <= 1) {

default:

if (ndo->ndo_vflag <= 1) {

- if (pptr < ndo->ndo_snapend)

- print_unknown_data(ndo, pptr, "\n\t ", (int)(ndo->ndo_snapend - pptr));

+ /*

+ * If there's at least one byte to print, print

+ * it/them.

+ */

+ if (ND_TTEST_LEN(pptr, 1))

+ print_unknown_data(ndo, pptr, "\n\t ", ND_BYTES_AVAILABLE_AFTER(pptr));

}

return;

}

return;

}

@@ -1385,7 +1391,6 @@ esis_print(netdissect_options *ndo,

ND_PRINT(", bad opts/li");

return;

}

ND_PRINT(", bad opts/li");

return;

}

- ND_TCHECK_2(pptr);

op = GET_U_1(pptr);

opli = GET_U_1(pptr + 1);

pptr += 2;

op = GET_U_1(pptr);

opli = GET_U_1(pptr + 1);

pptr += 2;

@@ -1414,7 +1419,6 @@ esis_print(netdissect_options *ndo,

case ESIS_OPTION_PROTOCOLS:

while (opli>0) {

case ESIS_OPTION_PROTOCOLS:

while (opli>0) {

- ND_TCHECK_1(tptr);

ND_PRINT("%s (0x%02x)",

tok2str(nlpid_values,

"unknown",

ND_PRINT("%s (0x%02x)",

tok2str(nlpid_values,

"unknown",

@@ -1461,8 +1465,7 @@ isis_print_mcid(netdissect_options *ndo,

ND_TCHECK_SIZE(mcid);

ND_PRINT("ID: %u, Name: ", GET_U_1(mcid->format_id));

ND_TCHECK_SIZE(mcid);

ND_PRINT("ID: %u, Name: ", GET_U_1(mcid->format_id));

- if (nd_printzp(ndo, mcid->name, 32, ndo->ndo_snapend))

- goto trunc;

+ nd_printjnp(ndo, mcid->name, sizeof(mcid->name));

ND_PRINT("\n\t Lvl: %u", GET_BE_U_2(mcid->revision_lvl));

@@ -1486,7 +1489,6 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo,

while (len > 2)

{

while (len > 2)

{

- ND_TCHECK_2(tptr);

stlv_type = GET_U_1(tptr);

stlv_len = GET_U_1(tptr + 1);

stlv_type = GET_U_1(tptr);

stlv_len = GET_U_1(tptr + 1);

@@ -1619,7 +1621,6 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo,

while (len > 2)

{

while (len > 2)

{

- ND_TCHECK_2(tptr);

stlv_type = GET_U_1(tptr);

stlv_len = GET_U_1(tptr + 1);

tptr += 2;

stlv_type = GET_U_1(tptr);

stlv_len = GET_U_1(tptr + 1);

tptr += 2;

@@ -1712,7 +1713,6 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo,

stlv_len -= 8;

while (stlv_len >= 4) {

stlv_len -= 8;

while (stlv_len >= 4) {

- ND_TCHECK_4(tptr);

ND_PRINT("\n\t T: %u, R: %u, RES: %u, ISID: %u",

(GET_BE_U_4(tptr) >> 31),

(GET_BE_U_4(tptr) >> 30) & 0x01,

ND_PRINT("\n\t T: %u, R: %u, RES: %u, ISID: %u",

(GET_BE_U_4(tptr) >> 31),

(GET_BE_U_4(tptr) >> 30) & 0x01,

@@ -1802,7 +1802,7 @@ isis_print_metric_block(netdissect_options *ndo,

static int

isis_print_tlv_ip_reach(netdissect_options *ndo,

static int

isis_print_tlv_ip_reach(netdissect_options *ndo,

- const uint8_t *cp, const char *ident, u_int length)

+ const uint8_t *cp, const char *indent, u_int length)

{

int prefix_len;

const struct isis_tlv_ip_reach *tlv_ip_reach;

{

int prefix_len;

const struct isis_tlv_ip_reach *tlv_ip_reach;

@@ -1823,12 +1823,12 @@ isis_print_tlv_ip_reach(netdissect_options *ndo,

if (prefix_len == -1)

ND_PRINT("%sIPv4 prefix: %s mask %s",

if (prefix_len == -1)

ND_PRINT("%sIPv4 prefix: %s mask %s",

- ident,

+ indent,

GET_IPADDR_STRING(tlv_ip_reach->prefix),

GET_IPADDR_STRING(tlv_ip_reach->mask));

else

ND_PRINT("%sIPv4 prefix: %15s/%u",

GET_IPADDR_STRING(tlv_ip_reach->prefix),

GET_IPADDR_STRING(tlv_ip_reach->mask));

else

ND_PRINT("%sIPv4 prefix: %15s/%u",

- ident,

+ indent,

GET_IPADDR_STRING(tlv_ip_reach->prefix),

prefix_len);

GET_IPADDR_STRING(tlv_ip_reach->prefix),

prefix_len);

@@ -1839,19 +1839,19 @@ isis_print_tlv_ip_reach(netdissect_options *ndo,

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_delay))

ND_PRINT("%s Delay Metric: %u, %s",

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_delay))

ND_PRINT("%s Delay Metric: %u, %s",

- ident,

+ indent,

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_delay),

ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_delay) ? "External" : "Internal");

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_expense))

ND_PRINT("%s Expense Metric: %u, %s",

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_delay),

ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_delay) ? "External" : "Internal");

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_expense))

ND_PRINT("%s Expense Metric: %u, %s",

- ident,

+ indent,

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_expense),

ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_expense) ? "External" : "Internal");

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_error))

ND_PRINT("%s Error Metric: %u, %s",

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_expense),

ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_expense) ? "External" : "Internal");

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_error))

ND_PRINT("%s Error Metric: %u, %s",

- ident,

+ indent,

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_error),

ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_error) ? "External" : "Internal");

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_error),

ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_error) ? "External" : "Internal");

@@ -1871,11 +1871,11 @@ trunc:

static int

isis_print_ip_reach_subtlv(netdissect_options *ndo,

const uint8_t *tptr, u_int subt, u_int subl,

static int

isis_print_ip_reach_subtlv(netdissect_options *ndo,

const uint8_t *tptr, u_int subt, u_int subl,

- const char *ident)

+ const char *indent)

{

/* first lets see if we know the subTLVs name*/

ND_PRINT("%s%s subTLV #%u, length: %u",

{

/* first lets see if we know the subTLVs name*/

ND_PRINT("%s%s subTLV #%u, length: %u",

- ident, tok2str(isis_ext_ip_reach_subtlv_values, "unknown", subt),

+ indent, tok2str(isis_ext_ip_reach_subtlv_values, "unknown", subt),

subt, subl);

ND_TCHECK_LEN(tptr, subl);

subt, subl);

ND_TCHECK_LEN(tptr, subl);

@@ -1909,10 +1909,14 @@ isis_print_ip_reach_subtlv(netdissect_options *ndo,

algo = GET_U_1(tptr+1);

if (flags & ISIS_PREFIX_SID_FLAG_V) {

algo = GET_U_1(tptr+1);

if (flags & ISIS_PREFIX_SID_FLAG_V) {

+ if (subl < 5)

+ goto trunc;

sid = GET_BE_U_3(tptr+2);

tptr+=5;

subl-=5;

} else {

sid = GET_BE_U_3(tptr+2);

tptr+=5;

subl-=5;

} else {

+ if (subl < 6)

+ goto trunc;

sid = GET_BE_U_4(tptr+2);

tptr+=6;

subl-=6;

sid = GET_BE_U_4(tptr+2);

tptr+=6;

subl-=6;

@@ -1944,10 +1948,10 @@ trunc:

static int

isis_print_ext_is_reach(netdissect_options *ndo,

static int

isis_print_ext_is_reach(netdissect_options *ndo,

- const uint8_t *tptr, const char *ident, u_int tlv_type,

+ const uint8_t *tptr, const char *indent, u_int tlv_type,

u_int tlv_remaining)

{

u_int tlv_remaining)

{

- char ident_buffer[20];

+ char indent_buffer[20];

u_int subtlv_type,subtlv_len,subtlv_sum_len;

int proc_bytes = 0; /* how many bytes did we process ? */

u_int te_class,priority_level,gmpls_switch_cap;

u_int subtlv_type,subtlv_len,subtlv_sum_len;

int proc_bytes = 0; /* how many bytes did we process ? */

u_int te_class,priority_level,gmpls_switch_cap;

@@ -1960,7 +1964,7 @@ isis_print_ext_is_reach(netdissect_options *ndo,

if (tlv_remaining < NODE_ID_LEN)

return(0);

if (tlv_remaining < NODE_ID_LEN)

return(0);

- ND_PRINT("%sIS Neighbor: %s", ident, isis_print_id(ndo, tptr, NODE_ID_LEN));

+ ND_PRINT("%sIS Neighbor: %s", indent, isis_print_id(ndo, tptr, NODE_ID_LEN));

tptr+=NODE_ID_LEN;

tlv_remaining-=NODE_ID_LEN;

proc_bytes+=NODE_ID_LEN;

tptr+=NODE_ID_LEN;

tlv_remaining-=NODE_ID_LEN;

proc_bytes+=NODE_ID_LEN;

@@ -1986,17 +1990,17 @@ isis_print_ext_is_reach(netdissect_options *ndo,

if (subtlv_sum_len) {

ND_PRINT(" (%u)", subtlv_sum_len);

/* prepend the indent string */

if (subtlv_sum_len) {

ND_PRINT(" (%u)", subtlv_sum_len);

/* prepend the indent string */

- snprintf(ident_buffer, sizeof(ident_buffer), "%s ",ident);

- ident = ident_buffer;

+ snprintf(indent_buffer, sizeof(indent_buffer), "%s ", indent);

+ indent = indent_buffer;

while (subtlv_sum_len != 0) {

ND_TCHECK_2(tptr);

if (tlv_remaining < 2) {

while (subtlv_sum_len != 0) {

ND_TCHECK_2(tptr);

if (tlv_remaining < 2) {

- ND_PRINT("%sRemaining data in TLV shorter than a subTLV header",ident);

+ ND_PRINT("%sRemaining data in TLV shorter than a subTLV header", indent);

proc_bytes += tlv_remaining;

break;

}

if (subtlv_sum_len < 2) {

proc_bytes += tlv_remaining;

break;

}

if (subtlv_sum_len < 2) {

- ND_PRINT("%sRemaining data in subTLVs shorter than a subTLV header",ident);

+ ND_PRINT("%sRemaining data in subTLVs shorter than a subTLV header", indent);

proc_bytes += subtlv_sum_len;

break;

}

proc_bytes += subtlv_sum_len;

break;

}

@@ -2007,7 +2011,7 @@ isis_print_ext_is_reach(netdissect_options *ndo,

subtlv_sum_len -= 2;

proc_bytes += 2;

ND_PRINT("%s%s subTLV #%u, length: %u",

subtlv_sum_len -= 2;

proc_bytes += 2;

ND_PRINT("%s%s subTLV #%u, length: %u",

- ident, tok2str(isis_ext_is_reach_subtlv_values, "unknown", subtlv_type),

+ indent, tok2str(isis_ext_is_reach_subtlv_values, "unknown", subtlv_type),

subtlv_type, subtlv_len);

if (subtlv_sum_len < subtlv_len) {

subtlv_type, subtlv_len);

if (subtlv_sum_len < subtlv_len) {

@@ -2051,7 +2055,7 @@ isis_print_ext_is_reach(netdissect_options *ndo,

for (te_class = 0; te_class < 8; te_class++) {

bw.i = GET_BE_U_4(tptr);

ND_PRINT("%s TE-Class %u: %.3f Mbps",

for (te_class = 0; te_class < 8; te_class++) {

bw.i = GET_BE_U_4(tptr);

ND_PRINT("%s TE-Class %u: %.3f Mbps",

- ident,

+ indent,

te_class,

bw.f * 8 / 1000000);

tptr += 4;

te_class,

bw.f * 8 / 1000000);

tptr += 4;

@@ -2066,7 +2070,7 @@ isis_print_ext_is_reach(netdissect_options *ndo,

if (subtlv_len == 0)

break;

ND_PRINT("%sBandwidth Constraints Model ID: %s (%u)",

if (subtlv_len == 0)

break;

ND_PRINT("%sBandwidth Constraints Model ID: %s (%u)",

- ident,

+ indent,

tok2str(diffserv_te_bc_values, "unknown", GET_U_1(tptr)),

GET_U_1(tptr));

tptr++;

tok2str(diffserv_te_bc_values, "unknown", GET_U_1(tptr)),

GET_U_1(tptr));

tptr++;

@@ -2079,7 +2083,7 @@ isis_print_ext_is_reach(netdissect_options *ndo,

break;

bw.i = GET_BE_U_4(tptr);

ND_PRINT("%s Bandwidth constraint CT%u: %.3f Mbps",

break;

bw.i = GET_BE_U_4(tptr);

ND_PRINT("%s Bandwidth constraint CT%u: %.3f Mbps",

- ident,

+ indent,

te_class,

bw.f * 8 / 1000000);

tptr += 4;

te_class,

bw.f * 8 / 1000000);

tptr += 4;

@@ -2127,7 +2131,7 @@ isis_print_ext_is_reach(netdissect_options *ndo,

if (subtlv_len >= 36) {

gmpls_switch_cap = GET_U_1(tptr);

ND_PRINT("%s Interface Switching Capability:%s",

if (subtlv_len >= 36) {

gmpls_switch_cap = GET_U_1(tptr);

ND_PRINT("%s Interface Switching Capability:%s",

- ident,

+ indent,

tok2str(gmpls_switch_cap_values, "Unknown", gmpls_switch_cap));

ND_PRINT(", LSP Encoding: %s",

tok2str(gmpls_encoding_values, "Unknown", GET_U_1((tptr + 1))));

tok2str(gmpls_switch_cap_values, "Unknown", gmpls_switch_cap));

ND_PRINT(", LSP Encoding: %s",

tok2str(gmpls_encoding_values, "Unknown", GET_U_1((tptr + 1))));

@@ -2135,11 +2139,11 @@ isis_print_ext_is_reach(netdissect_options *ndo,

subtlv_len -= 4;

subtlv_sum_len -= 4;

proc_bytes += 4;

subtlv_len -= 4;

subtlv_sum_len -= 4;

proc_bytes += 4;

- ND_PRINT("%s Max LSP Bandwidth:", ident);

+ ND_PRINT("%s Max LSP Bandwidth:", indent);

for (priority_level = 0; priority_level < 8; priority_level++) {

bw.i = GET_BE_U_4(tptr);

ND_PRINT("%s priority level %u: %.3f Mbps",

for (priority_level = 0; priority_level < 8; priority_level++) {

bw.i = GET_BE_U_4(tptr);

ND_PRINT("%s priority level %u: %.3f Mbps",

- ident,

+ indent,

priority_level,

bw.f * 8 / 1000000);

tptr += 4;

priority_level,

bw.f * 8 / 1000000);

tptr += 4;

@@ -2155,16 +2159,16 @@ isis_print_ext_is_reach(netdissect_options *ndo,

if (subtlv_len < 6)

break;

bw.i = GET_BE_U_4(tptr);

if (subtlv_len < 6)

break;

bw.i = GET_BE_U_4(tptr);

- ND_PRINT("%s Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000);

- ND_PRINT("%s Interface MTU: %u", ident,

+ ND_PRINT("%s Min LSP Bandwidth: %.3f Mbps", indent, bw.f * 8 / 1000000);

+ ND_PRINT("%s Interface MTU: %u", indent,

GET_BE_U_2(tptr + 4));

break;

case GMPLS_TSC:

if (subtlv_len < 8)

break;

bw.i = GET_BE_U_4(tptr);

GET_BE_U_2(tptr + 4));

break;

case GMPLS_TSC:

if (subtlv_len < 8)

break;

bw.i = GET_BE_U_4(tptr);

- ND_PRINT("%s Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000);

- ND_PRINT("%s Indication %s", ident,

+ ND_PRINT("%s Min LSP Bandwidth: %.3f Mbps", indent, bw.f * 8 / 1000000);

+ ND_PRINT("%s Indication %s", indent,

tok2str(gmpls_switch_cap_tsc_indication_values, "Unknown (%u)", GET_U_1((tptr + 4))));

break;

default:

tok2str(gmpls_switch_cap_tsc_indication_values, "Unknown (%u)", GET_U_1((tptr + 4))));

break;

default:

@@ -2177,6 +2181,41 @@ isis_print_ext_is_reach(netdissect_options *ndo,

}

break;

}

break;

+ case ISIS_SUBTLV_EXT_IS_REACH_LAN_ADJ_SEGMENT_ID:

+ if (subtlv_len >= 8) {

+ ND_PRINT("%s Flags: [%s]", indent,

+ bittok2str(isis_lan_adj_sid_flag_values,

+ "none",

+ GET_U_1(tptr)));

+ int vflag = (GET_U_1(tptr) & 0x20) ? 1:0;

+ int lflag = (GET_U_1(tptr) & 0x10) ? 1:0;

+ tptr++;

+ subtlv_len--;

+ subtlv_sum_len--;

+ proc_bytes++;

+ ND_PRINT("%s Weight: %u", indent, GET_U_1(tptr));

+ tptr++;

+ subtlv_len--;

+ subtlv_sum_len--;

+ proc_bytes++;

+ if(subtlv_len>=SYSTEM_ID_LEN) {

+ ND_TCHECK_LEN(tptr, SYSTEM_ID_LEN);

+ ND_PRINT("%s Neighbor System-ID: %s", indent,

+ isis_print_id(ndo, tptr, SYSTEM_ID_LEN));

+ }

+ /* RFC 8667 section 2.2.2 */

+ /* if V-flag is set to 1 and L-flag is set to 1 ==> 3 octet label */

+ /* if V-flag is set to 0 and L-flag is set to 0 ==> 4 octet index */

+ if (vflag && lflag) {

+ ND_PRINT("%s Label: %u",

+ indent, GET_BE_U_3(tptr+SYSTEM_ID_LEN));

+ } else if ((!vflag) && (!lflag)) {

+ ND_PRINT("%s Index: %u",

+ indent, GET_BE_U_4(tptr+SYSTEM_ID_LEN));

+ } else

+ nd_print_invalid(ndo);

+ }

+ break;

default:

if (!print_unknown_data(ndo, tptr, "\n\t\t ", subtlv_len))

return(0);

default:

if (!print_unknown_data(ndo, tptr, "\n\t\t ", subtlv_len))

return(0);

@@ -2202,14 +2241,13 @@ trunc:

static uint8_t

isis_print_mtid(netdissect_options *ndo,

static uint8_t

isis_print_mtid(netdissect_options *ndo,

- const uint8_t *tptr, const char *ident, u_int tlv_remaining)

+ const uint8_t *tptr, const char *indent, u_int tlv_remaining)

{

if (tlv_remaining < 2)

goto trunc;

{

if (tlv_remaining < 2)

goto trunc;

- ND_TCHECK_2(tptr);

ND_PRINT("%s%s",

- ident,

+ indent,

tok2str(isis_mt_values,

"Reserved for IETF Consensus",

ISIS_MASK_MTID(GET_BE_U_2(tptr))));

tok2str(isis_mt_values,

"Reserved for IETF Consensus",

ISIS_MASK_MTID(GET_BE_U_2(tptr))));

@@ -2232,36 +2270,33 @@ trunc:

static u_int

isis_print_extd_ip_reach(netdissect_options *ndo,

static u_int

isis_print_extd_ip_reach(netdissect_options *ndo,

- const uint8_t *tptr, const char *ident, uint16_t afi)

+ const uint8_t *tptr, const char *indent, uint16_t afi)

{

- char ident_buffer[20];

+ char indent_buffer[20];

uint8_t prefix[sizeof(nd_ipv6)]; /* shared copy buffer for IPv4 and IPv6 prefixes */

u_int metric, status_byte, bit_length, byte_length, sublen, processed, subtlvtype, subtlvlen;

uint8_t prefix[sizeof(nd_ipv6)]; /* shared copy buffer for IPv4 and IPv6 prefixes */

u_int metric, status_byte, bit_length, byte_length, sublen, processed, subtlvtype, subtlvlen;

- ND_TCHECK_4(tptr);

metric = GET_BE_U_4(tptr);

processed=4;

tptr+=4;

if (afi == AF_INET) {

metric = GET_BE_U_4(tptr);

processed=4;

tptr+=4;

if (afi == AF_INET) {

- ND_TCHECK_1(tptr);

status_byte=GET_U_1(tptr);

tptr++;

bit_length = status_byte&0x3f;

if (bit_length > 32) {

ND_PRINT("%sIPv4 prefix: bad bit length %u",

status_byte=GET_U_1(tptr);

tptr++;

bit_length = status_byte&0x3f;

if (bit_length > 32) {

ND_PRINT("%sIPv4 prefix: bad bit length %u",

- ident,

+ indent,

bit_length);

return (0);

}

processed++;

} else if (afi == AF_INET6) {

bit_length);

return (0);

}

processed++;

} else if (afi == AF_INET6) {

- ND_TCHECK_2(tptr);

status_byte=GET_U_1(tptr);

bit_length=GET_U_1(tptr + 1);

if (bit_length > 128) {

ND_PRINT("%sIPv6 prefix: bad bit length %u",

status_byte=GET_U_1(tptr);

bit_length=GET_U_1(tptr + 1);

if (bit_length > 128) {

ND_PRINT("%sIPv6 prefix: bad bit length %u",

- ident,

+ indent,

bit_length);

return (0);

}

bit_length);

return (0);

}

@@ -2272,20 +2307,19 @@ isis_print_extd_ip_reach(netdissect_options *ndo,

byte_length = (bit_length + 7) / 8; /* prefix has variable length encoding */

- ND_TCHECK_LEN(tptr, byte_length);

memset(prefix, 0, sizeof(prefix)); /* clear the copy buffer */

- memcpy(prefix,tptr,byte_length); /* copy as much as is stored in the TLV */

+ GET_CPY_BYTES(prefix,tptr,byte_length); /* copy as much as is stored in the TLV */

tptr+=byte_length;

processed+=byte_length;

if (afi == AF_INET)

ND_PRINT("%sIPv4 prefix: %15s/%u",

tptr+=byte_length;

processed+=byte_length;

if (afi == AF_INET)

ND_PRINT("%sIPv4 prefix: %15s/%u",

- ident,

+ indent,

ipaddr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IPADDR_STRING() */

bit_length);

else if (afi == AF_INET6)

ND_PRINT("%sIPv6 prefix: %s/%u",

ipaddr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IPADDR_STRING() */

bit_length);

else if (afi == AF_INET6)

ND_PRINT("%sIPv6 prefix: %s/%u",

- ident,

+ indent,

ip6addr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */

bit_length);

ip6addr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */

bit_length);

@@ -2307,28 +2341,24 @@ isis_print_extd_ip_reach(netdissect_options *ndo,

than one subTLV - therefore the first byte must reflect

the aggregate bytecount of the subTLVs for this prefix

than one subTLV - therefore the first byte must reflect

the aggregate bytecount of the subTLVs for this prefix

- ND_TCHECK_1(tptr);

sublen=GET_U_1(tptr);

tptr++;

processed+=sublen+1;

ND_PRINT(" (%u)", sublen); /* print out subTLV length */

while (sublen>0) {

sublen=GET_U_1(tptr);

tptr++;

processed+=sublen+1;

ND_PRINT(" (%u)", sublen); /* print out subTLV length */

while (sublen>0) {

- ND_TCHECK_2(tptr);

subtlvtype=GET_U_1(tptr);

subtlvlen=GET_U_1(tptr + 1);

tptr+=2;

/* prepend the indent string */

subtlvtype=GET_U_1(tptr);

subtlvlen=GET_U_1(tptr + 1);

tptr+=2;

/* prepend the indent string */

- snprintf(ident_buffer, sizeof(ident_buffer), "%s ",ident);

- if (!isis_print_ip_reach_subtlv(ndo, tptr, subtlvtype, subtlvlen, ident_buffer))

+ snprintf(indent_buffer, sizeof(indent_buffer), "%s ", indent);

+ if (!isis_print_ip_reach_subtlv(ndo, tptr, subtlvtype, subtlvlen, indent_buffer))

return(0);

tptr+=subtlvlen;

sublen-=(subtlvlen+2);

}

return (processed);

return(0);

tptr+=subtlvlen;

sublen-=(subtlvlen+2);

}

return (processed);

-trunc:

- return 0;

}

static void

}

static void

@@ -2337,7 +2367,6 @@ isis_print_router_cap_subtlv(netdissect_options *ndo, const uint8_t *tptr, uint8

uint8_t subt, subl;

while (tlen >= 2) {

uint8_t subt, subl;

while (tlen >= 2) {

- ND_TCHECK_LEN(tptr, 2);

subt = GET_U_1(tptr);

subl = GET_U_1(tptr+1);

tlen -= 2;

subt = GET_U_1(tptr);

subl = GET_U_1(tptr+1);

tlen -= 2;

@@ -2851,13 +2880,11 @@ isis_print(netdissect_options *ndo,

switch (tlv_type) {

case ISIS_TLV_AREA_ADDR:

while (tlen != 0) {

switch (tlv_type) {

case ISIS_TLV_AREA_ADDR:

while (tlen != 0) {

- ND_TCHECK_1(tptr);

alen = GET_U_1(tptr);

tptr++;

tlen--;

if (tlen < alen)

goto tlv_trunc;

alen = GET_U_1(tptr);

tptr++;

tlen--;

if (tlen < alen)

goto tlv_trunc;

- ND_TCHECK_LEN(tptr, alen);

ND_PRINT("\n\t Area address (length: %u): %s",

alen,

GET_ISONSAP_STRING(tptr, alen));

ND_PRINT("\n\t Area address (length: %u): %s",

alen,

GET_ISONSAP_STRING(tptr, alen));

@@ -2950,7 +2977,6 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_IS_REACH:

if (tlen < 1)

goto tlv_trunc;

case ISIS_TLV_IS_REACH:

if (tlen < 1)

goto tlv_trunc;

- ND_TCHECK_1(tptr); /* check if there is one byte left to read out the virtual flag */

ND_PRINT("\n\t %s",

tok2str(isis_is_reach_virtual_values,

"bogus virtual flag 0x%02x",

ND_PRINT("\n\t %s",

tok2str(isis_is_reach_virtual_values,

"bogus virtual flag 0x%02x",

@@ -3069,8 +3095,6 @@ isis_print(netdissect_options *ndo,

while (tlen != 0) {

if (tlen < sizeof(nd_ipv6))

goto tlv_trunc;

while (tlen != 0) {

if (tlen < sizeof(nd_ipv6))

goto tlv_trunc;

- ND_TCHECK_LEN(tptr, sizeof(nd_ipv6));

ND_PRINT("\n\t IPv6 interface address: %s",

GET_IP6ADDR_STRING(tptr));

ND_PRINT("\n\t IPv6 interface address: %s",

GET_IP6ADDR_STRING(tptr));

@@ -3081,7 +3105,6 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_AUTH:

if (tlen < 1)

goto tlv_trunc;

case ISIS_TLV_AUTH:

if (tlen < 1)

goto tlv_trunc;

- ND_TCHECK_1(tptr);

auth_type = GET_U_1(tptr);

tptr++;

tlen--;

auth_type = GET_U_1(tptr);

tptr++;

tlen--;

@@ -3093,12 +3116,10 @@ isis_print(netdissect_options *ndo,

switch (auth_type) {

case ISIS_SUBTLV_AUTH_SIMPLE:

switch (auth_type) {

case ISIS_SUBTLV_AUTH_SIMPLE:

- if (nd_printzp(ndo, tptr, tlen, ndo->ndo_snapend))

- goto trunc;

+ nd_printjnp(ndo, tptr, tlen);

break;

case ISIS_SUBTLV_AUTH_MD5:

for(i=0;i<tlen;i++) {

break;

case ISIS_SUBTLV_AUTH_MD5:

for(i=0;i<tlen;i++) {

- ND_TCHECK_1(tptr + i);

ND_PRINT("%02x", GET_U_1(tptr + i));

}

if (tlen != ISIS_SUBTLV_AUTH_MD5_LEN)

ND_PRINT("%02x", GET_U_1(tptr + i));

}

if (tlen != ISIS_SUBTLV_AUTH_MD5_LEN)

@@ -3113,13 +3134,11 @@ isis_print(netdissect_options *ndo,

case ISIS_SUBTLV_AUTH_GENERIC:

if (tlen < 2)

goto tlv_trunc;

case ISIS_SUBTLV_AUTH_GENERIC:

if (tlen < 2)

goto tlv_trunc;

- ND_TCHECK_2(tptr);

key_id = GET_BE_U_2(tptr);

ND_PRINT("%u, password: ", key_id);

tptr += 2;

tlen -= 2;

for(i=0;i<tlen;i++) {

key_id = GET_BE_U_2(tptr);

ND_PRINT("%u, password: ", key_id);

tptr += 2;

tlen -= 2;

for(i=0;i<tlen;i++) {

- ND_TCHECK_1(tptr + i);

ND_PRINT("%02x", GET_U_1(tptr + i));

}

break;

ND_PRINT("%02x", GET_U_1(tptr + i));

}

break;

@@ -3134,14 +3153,12 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_PTP_ADJ:

tlv_ptp_adj = (const struct isis_tlv_ptp_adj *)tptr;

if(tlen>=1) {

case ISIS_TLV_PTP_ADJ:

tlv_ptp_adj = (const struct isis_tlv_ptp_adj *)tptr;

if(tlen>=1) {

- ND_TCHECK_1(tptr);

ND_PRINT("\n\t Adjacency State: %s (%u)",

tok2str(isis_ptp_adjancey_values, "unknown", GET_U_1(tptr)),

GET_U_1(tptr));

tlen--;

}

if(tlen>sizeof(tlv_ptp_adj->extd_local_circuit_id)) {

ND_PRINT("\n\t Adjacency State: %s (%u)",

tok2str(isis_ptp_adjancey_values, "unknown", GET_U_1(tptr)),

GET_U_1(tptr));

tlen--;

}

if(tlen>sizeof(tlv_ptp_adj->extd_local_circuit_id)) {

- ND_TCHECK_4(tlv_ptp_adj->extd_local_circuit_id);

ND_PRINT("\n\t Extended Local circuit-ID: 0x%08x",

GET_BE_U_4(tlv_ptp_adj->extd_local_circuit_id));

tlen-=sizeof(tlv_ptp_adj->extd_local_circuit_id);

ND_PRINT("\n\t Extended Local circuit-ID: 0x%08x",

GET_BE_U_4(tlv_ptp_adj->extd_local_circuit_id));

tlen-=sizeof(tlv_ptp_adj->extd_local_circuit_id);

@@ -3153,7 +3170,6 @@ isis_print(netdissect_options *ndo,

tlen-=SYSTEM_ID_LEN;

}

if(tlen>=sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)) {

tlen-=SYSTEM_ID_LEN;

}

if(tlen>=sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)) {

- ND_TCHECK_4(tlv_ptp_adj->neighbor_extd_local_circuit_id);

ND_PRINT("\n\t Neighbor Extended Local circuit-ID: 0x%08x",

GET_BE_U_4(tlv_ptp_adj->neighbor_extd_local_circuit_id));

}

ND_PRINT("\n\t Neighbor Extended Local circuit-ID: 0x%08x",

GET_BE_U_4(tlv_ptp_adj->neighbor_extd_local_circuit_id));

}

@@ -3162,7 +3178,6 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_PROTOCOLS:

ND_PRINT("\n\t NLPID(s): ");

while (tlen != 0) {

case ISIS_TLV_PROTOCOLS:

ND_PRINT("\n\t NLPID(s): ");

while (tlen != 0) {

- ND_TCHECK_1(tptr);

ND_PRINT("%s (0x%02x)",

tok2str(nlpid_values,

"unknown",

ND_PRINT("%s (0x%02x)",

tok2str(nlpid_values,

"unknown",

@@ -3179,7 +3194,6 @@ isis_print(netdissect_options *ndo,

{

if (tlen < 2)

goto tlv_trunc;

{

if (tlen < 2)

goto tlv_trunc;

- ND_TCHECK_2(tptr);

ND_PRINT("\n\t RES: %u, MTID(s): %u",

(GET_BE_U_2(tptr) >> 12),

ND_PRINT("\n\t RES: %u, MTID(s): %u",

(GET_BE_U_2(tptr) >> 12),

@@ -3197,7 +3211,6 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_MT_CAPABILITY:

if (tlen < 2)

goto tlv_trunc;

case ISIS_TLV_MT_CAPABILITY:

if (tlen < 2)

goto tlv_trunc;

- ND_TCHECK_2(tptr);

ND_PRINT("\n\t O: %u, RES: %u, MTID(s): %u",

(GET_BE_U_2(tptr) >> 15) & 0x01,

ND_PRINT("\n\t O: %u, RES: %u, MTID(s): %u",

(GET_BE_U_2(tptr) >> 15) & 0x01,

@@ -3215,7 +3228,6 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_TE_ROUTER_ID:

if (tlen < sizeof(nd_ipv4))

goto tlv_trunc;

case ISIS_TLV_TE_ROUTER_ID:

if (tlen < sizeof(nd_ipv4))

goto tlv_trunc;

- ND_TCHECK_LEN(pptr, sizeof(nd_ipv4));

ND_PRINT("\n\t Traffic Engineering Router ID: %s", GET_IPADDR_STRING(pptr));

break;

ND_PRINT("\n\t Traffic Engineering Router ID: %s", GET_IPADDR_STRING(pptr));

break;

@@ -3223,7 +3235,6 @@ isis_print(netdissect_options *ndo,

while (tlen != 0) {

if (tlen < sizeof(nd_ipv4))

goto tlv_trunc;

while (tlen != 0) {

if (tlen < sizeof(nd_ipv4))

goto tlv_trunc;

- ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));

ND_PRINT("\n\t IPv4 interface address: %s", GET_IPADDR_STRING(tptr));

tptr += sizeof(nd_ipv4);

tlen -= sizeof(nd_ipv4);

ND_PRINT("\n\t IPv4 interface address: %s", GET_IPADDR_STRING(tptr));

tptr += sizeof(nd_ipv4);

tlen -= sizeof(nd_ipv4);

@@ -3232,8 +3243,7 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_HOSTNAME:

ND_PRINT("\n\t Hostname: ");

case ISIS_TLV_HOSTNAME:

ND_PRINT("\n\t Hostname: ");

- if (nd_printzp(ndo, tptr, tlen, ndo->ndo_snapend))

- goto trunc;

+ nd_printjnp(ndo, tptr, tlen);

break;

case ISIS_TLV_SHARED_RISK_GROUP:

break;

case ISIS_TLV_SHARED_RISK_GROUP:

@@ -3246,7 +3256,6 @@ isis_print(netdissect_options *ndo,

if (tlen < 1)

break;

if (tlen < 1)

break;

- ND_TCHECK_1(tptr);

ND_PRINT(", Flags: [%s]",

ISIS_MASK_TLV_SHARED_RISK_GROUP(GET_U_1(tptr)) ? "numbered" : "unnumbered");

tptr++;

ND_PRINT(", Flags: [%s]",

ISIS_MASK_TLV_SHARED_RISK_GROUP(GET_U_1(tptr)) ? "numbered" : "unnumbered");

tptr++;

@@ -3254,14 +3263,12 @@ isis_print(netdissect_options *ndo,

if (tlen < sizeof(nd_ipv4))

break;

if (tlen < sizeof(nd_ipv4))

break;

- ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));

ND_PRINT("\n\t IPv4 interface address: %s", GET_IPADDR_STRING(tptr));

tptr+=sizeof(nd_ipv4);

tlen-=sizeof(nd_ipv4);

if (tlen < sizeof(nd_ipv4))

break;

ND_PRINT("\n\t IPv4 interface address: %s", GET_IPADDR_STRING(tptr));

tptr+=sizeof(nd_ipv4);

tlen-=sizeof(nd_ipv4);

if (tlen < sizeof(nd_ipv4))

break;

- ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));

ND_PRINT("\n\t IPv4 neighbor address: %s", GET_IPADDR_STRING(tptr));

tptr+=sizeof(nd_ipv4);

tlen-=sizeof(nd_ipv4);

ND_PRINT("\n\t IPv4 neighbor address: %s", GET_IPADDR_STRING(tptr));

tptr+=sizeof(nd_ipv4);

tlen-=sizeof(nd_ipv4);

@@ -3269,7 +3276,6 @@ isis_print(netdissect_options *ndo,

while (tlen != 0) {

if (tlen < 4)

goto tlv_trunc;

while (tlen != 0) {

if (tlen < 4)

goto tlv_trunc;

- ND_TCHECK_4(tptr);

ND_PRINT("\n\t Link-ID: 0x%08x", GET_BE_U_4(tptr));

tptr+=4;

tlen-=4;

ND_PRINT("\n\t Link-ID: 0x%08x", GET_BE_U_4(tptr));

tptr+=4;

tlen-=4;

@@ -3284,13 +3290,10 @@ isis_print(netdissect_options *ndo,

ND_TCHECK_1(tlv_lsp->lsp_id + LSP_ID_LEN - 1);

ND_PRINT("\n\t lsp-id: %s",

isis_print_id(ndo, tlv_lsp->lsp_id, LSP_ID_LEN));

ND_TCHECK_1(tlv_lsp->lsp_id + LSP_ID_LEN - 1);

ND_PRINT("\n\t lsp-id: %s",

isis_print_id(ndo, tlv_lsp->lsp_id, LSP_ID_LEN));

- ND_TCHECK_4(tlv_lsp->sequence_number);

ND_PRINT(", seq: 0x%08x",

GET_BE_U_4(tlv_lsp->sequence_number));

ND_PRINT(", seq: 0x%08x",

GET_BE_U_4(tlv_lsp->sequence_number));

- ND_TCHECK_2(tlv_lsp->remaining_lifetime);

ND_PRINT(", lifetime: %5ds",

GET_BE_U_2(tlv_lsp->remaining_lifetime));

ND_PRINT(", lifetime: %5ds",

GET_BE_U_2(tlv_lsp->remaining_lifetime));

- ND_TCHECK_2(tlv_lsp->checksum);

ND_PRINT(", chksum: 0x%04x", GET_BE_U_2(tlv_lsp->checksum));

tlen-=sizeof(struct isis_tlv_lsp);

tlv_lsp++;

ND_PRINT(", chksum: 0x%04x", GET_BE_U_2(tlv_lsp->checksum));

tlen-=sizeof(struct isis_tlv_lsp);

tlv_lsp++;

@@ -3314,7 +3317,6 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_POI:

if (tlen < 1)

goto tlv_trunc;

case ISIS_TLV_POI:

if (tlen < 1)

goto tlv_trunc;

- ND_TCHECK_1(tptr);

num_system_ids = GET_U_1(tptr);

tptr++;

tlen--;

num_system_ids = GET_U_1(tptr);

tptr++;

tlen--;

@@ -3390,7 +3392,6 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_IDRP_INFO:

if (tlen < 1)

break;

case ISIS_TLV_IDRP_INFO:

if (tlen < 1)

break;

- ND_TCHECK_1(tptr);

isis_subtlv_idrp = GET_U_1(tptr);

ND_PRINT("\n\t Inter-Domain Information Type: %s",

tok2str(isis_subtlv_idrp_values,

isis_subtlv_idrp = GET_U_1(tptr);

ND_PRINT("\n\t Inter-Domain Information Type: %s",

tok2str(isis_subtlv_idrp_values,

@@ -3402,7 +3403,6 @@ isis_print(netdissect_options *ndo,

case ISIS_SUBTLV_IDRP_ASN:

if (tlen < 2)

goto tlv_trunc;

case ISIS_SUBTLV_IDRP_ASN:

if (tlen < 2)

goto tlv_trunc;

- ND_TCHECK_2(tptr); /* fetch AS number */

ND_PRINT("AS Number: %u", GET_BE_U_2(tptr));

break;

case ISIS_SUBTLV_IDRP_LOCAL:

ND_PRINT("AS Number: %u", GET_BE_U_2(tptr));

break;

case ISIS_SUBTLV_IDRP_LOCAL:

@@ -3417,7 +3417,6 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_LSP_BUFFERSIZE:

if (tlen < 2)

break;

case ISIS_TLV_LSP_BUFFERSIZE:

if (tlen < 2)

break;

- ND_TCHECK_2(tptr);

ND_PRINT("\n\t LSP Buffersize: %u", GET_BE_U_2(tptr));

break;

ND_PRINT("\n\t LSP Buffersize: %u", GET_BE_U_2(tptr));

break;

@@ -3442,7 +3441,6 @@ isis_print(netdissect_options *ndo,

tlen-=sizeof(struct isis_metric_block);

while (tlen != 0) {

tlen-=sizeof(struct isis_metric_block);

while (tlen != 0) {

- ND_TCHECK_1(tptr);

prefix_len=GET_U_1(tptr); /* read out prefix length in semioctets*/

tptr++;

tlen--;

prefix_len=GET_U_1(tptr); /* read out prefix length in semioctets*/

tptr++;

tlen--;

@@ -3452,7 +3450,6 @@ isis_print(netdissect_options *ndo,

}

if (tlen < prefix_len/2)

break;

}

if (tlen < prefix_len/2)

break;

- ND_TCHECK_LEN(tptr, prefix_len / 2);

ND_PRINT("\n\t\tAddress: %s/%u",

GET_ISONSAP_STRING(tptr, prefix_len / 2), prefix_len * 4);

tptr+=prefix_len/2;

ND_PRINT("\n\t\tAddress: %s/%u",

GET_ISONSAP_STRING(tptr, prefix_len / 2), prefix_len * 4);

tptr+=prefix_len/2;

@@ -3463,7 +3460,6 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_IIH_SEQNR:

if (tlen < 4)

break;

case ISIS_TLV_IIH_SEQNR:

if (tlen < 4)

break;

- ND_TCHECK_4(tptr); /* check if four bytes are on the wire */

ND_PRINT("\n\t Sequence number: %u", GET_BE_U_4(tptr));

break;

ND_PRINT("\n\t Sequence number: %u", GET_BE_U_4(tptr));

break;

@@ -3473,7 +3469,6 @@ isis_print(netdissect_options *ndo,

nd_print_invalid(ndo);

break;

}

nd_print_invalid(ndo);

break;

}

- ND_TCHECK_5(tptr); /* router-id + flags */

ND_PRINT("\n\t Router-ID %s", GET_IPADDR_STRING(tptr));

ND_PRINT(", Flags [%s]",

bittok2str(isis_tlv_router_capability_flags, "none", GET_U_1(tptr+4)));

ND_PRINT("\n\t Router-ID %s", GET_IPADDR_STRING(tptr));

ND_PRINT(", Flags [%s]",

bittok2str(isis_tlv_router_capability_flags, "none", GET_U_1(tptr+4)));

@@ -3487,7 +3482,6 @@ isis_print(netdissect_options *ndo,

case ISIS_TLV_VENDOR_PRIVATE:

if (tlen < 3)

break;

case ISIS_TLV_VENDOR_PRIVATE:

if (tlen < 3)

break;

- ND_TCHECK_3(tptr); /* check if enough byte for a full oui */

vendor_id = GET_BE_U_3(tptr);

ND_PRINT("\n\t Vendor: %s (%u)",

tok2str(oui_values, "Unknown", vendor_id),

vendor_id = GET_BE_U_3(tptr);

ND_PRINT("\n\t Vendor: %s (%u)",

tok2str(oui_values, "Unknown", vendor_id),