X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bef667db65b15c89ec6f1cf325b76acd3c0b8748..refs/heads/mcr-macro-update-1:/print-rsvp.c diff --git a/print-rsvp.c b/print-rsvp.c index ed937376..23b6d5a7 100644 --- a/print-rsvp.c +++ b/print-rsvp.c @@ -113,6 +113,13 @@ static const struct tok rsvp_header_flag_values[] = { { 0, NULL} }; +static const struct tok rsvp_obj_capability_flag_values[] = { + { 0x0004, "RecoveryPath Transmit Enabled" }, + { 0x0002, "RecoveryPath Desired" }, + { 0x0001, "RecoveryPath Srefresh Capable" }, + { 0, NULL} +}; + #define RSVP_OBJ_SESSION 1 /* rfc2205 */ #define RSVP_OBJ_RSVP_HOP 3 /* rfc2205, rfc3473 */ #define RSVP_OBJ_INTEGRITY 4 /* rfc2747 */ @@ -146,6 +153,7 @@ static const struct tok rsvp_header_flag_values[] = { #define RSVP_OBJ_SUGGESTED_LABEL 129 /* rfc3473 */ #define RSVP_OBJ_ACCEPT_LABEL_SET 130 /* rfc3473 */ #define RSVP_OBJ_RESTART_CAPABILITY 131 /* rfc3473 */ +#define RSVP_OBJ_CAPABILITY 134 /* rfc5063 */ #define RSVP_OBJ_NOTIFY_REQ 195 /* rfc3473 */ #define RSVP_OBJ_ADMIN_STATUS 196 /* rfc3473 */ #define RSVP_OBJ_PROPERTIES 204 /* juniper proprietary */ @@ -193,6 +201,7 @@ static const struct tok rsvp_obj_values[] = { { RSVP_OBJ_CALL_ID, "Call-ID" }, { RSVP_OBJ_CALL_OPS, "Call Capability" }, { RSVP_OBJ_RESTART_CAPABILITY, "Restart Capability" }, + { RSVP_OBJ_CAPABILITY, "Capability" }, { RSVP_OBJ_NOTIFY_REQ, "Notify Request" }, { RSVP_OBJ_PROTECTION, "Protection" }, { RSVP_OBJ_ADMIN_STATUS, "Administrative Status" }, @@ -280,6 +289,7 @@ static const struct tok rsvp_ctype_values[] = { { 256*RSVP_OBJ_ERROR_SPEC+RSVP_CTYPE_3, "IPv4 plus opt. TLVs" }, { 256*RSVP_OBJ_ERROR_SPEC+RSVP_CTYPE_4, "IPv6 plus opt. TLVs" }, { 256*RSVP_OBJ_RESTART_CAPABILITY+RSVP_CTYPE_1, "IPv4" }, + { 256*RSVP_OBJ_CAPABILITY+RSVP_CTYPE_1, "1" }, { 256*RSVP_OBJ_SESSION_ATTRIBUTE+RSVP_CTYPE_TUNNEL_IPV4, "Tunnel IPv4" }, { 256*RSVP_OBJ_FASTREROUTE+RSVP_CTYPE_TUNNEL_IPV4, "Tunnel IPv4" }, /* old style*/ { 256*RSVP_OBJ_FASTREROUTE+RSVP_CTYPE_1, "1" }, /* new style */ @@ -295,6 +305,14 @@ static const struct tok rsvp_ctype_values[] = { { 0, NULL} }; +/* + * XXX - this assumes a 16-byte digest, which is true for HMAC-MD5, but + * isn't necessarily the case for other hash algorithms. + * + * Unless I've missed something, there's nothing in RFC 2747 to indicate + * the hash algorithm being used, so it's presumably something set up + * out-of-band, or negotiated by other RSVP objects. + */ struct rsvp_obj_integrity_t { uint8_t flags; uint8_t res; @@ -323,6 +341,8 @@ struct rsvp_obj_frr_t { #define RSVP_OBJ_XRO_MASK_SUBOBJ(x) ((x)&0x7f) #define RSVP_OBJ_XRO_MASK_LOOSE(x) ((x)&0x80) +#define RSVP_OBJ_CAPABILITY_FLAGS_MASK 0x7U + #define RSVP_OBJ_XRO_RES 0 #define RSVP_OBJ_XRO_IPV4 1 #define RSVP_OBJ_XRO_IPV6 2 @@ -490,7 +510,7 @@ static const struct tok rsvp_obj_generalized_uni_values[] = { */ static u_int rsvp_intserv_print(netdissect_options *ndo, - const u_char *tptr, u_short obj_tlen) + const u_char *tptr, u_int obj_tlen) { u_int parameter_id,parameter_length; union { @@ -500,9 +520,7 @@ rsvp_intserv_print(netdissect_options *ndo, if (obj_tlen < 4) return 0; - ND_TCHECK_1(tptr); parameter_id = GET_U_1(tptr); - ND_TCHECK_2(tptr + 2); parameter_length = GET_BE_U_2(tptr + 2)<<2; /* convert wordcount to bytecount */ ND_PRINT("\n\t Parameter ID: %s (%u), length: %u, Flags: [0x%02x]", @@ -524,7 +542,6 @@ rsvp_intserv_print(netdissect_options *ndo, * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ if (parameter_length == 4) { - ND_TCHECK_4(tptr + 4); ND_PRINT("\n\t\tIS hop count: %u", GET_BE_U_4(tptr + 4)); } break; @@ -538,7 +555,6 @@ rsvp_intserv_print(netdissect_options *ndo, * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ if (parameter_length == 4) { - ND_TCHECK_4(tptr + 4); bw.i = GET_BE_U_4(tptr + 4); ND_PRINT("\n\t\tPath b/w estimate: %.10g Mbps", bw.f / 125000); } @@ -553,7 +569,6 @@ rsvp_intserv_print(netdissect_options *ndo, * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ if (parameter_length == 4) { - ND_TCHECK_4(tptr + 4); ND_PRINT("\n\t\tMinimum path latency: "); if (GET_BE_U_4(tptr + 4) == 0xffffffff) ND_PRINT("don't care"); @@ -572,7 +587,6 @@ rsvp_intserv_print(netdissect_options *ndo, * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ if (parameter_length == 4) { - ND_TCHECK_4(tptr + 4); ND_PRINT("\n\t\tComposed MTU: %u bytes", GET_BE_U_4(tptr + 4)); } break; @@ -632,7 +646,6 @@ rsvp_intserv_print(netdissect_options *ndo, case 135: case 136: if (parameter_length == 4) { - ND_TCHECK_4(tptr + 4); ND_PRINT("\n\t\tValue: %u", GET_BE_U_4(tptr + 4)); } break; @@ -681,7 +694,7 @@ rsvp_obj_print(netdissect_options *ndo, float f; uint32_t i; } bw; - uint8_t namelen; + u_int namelen; u_int action, subchannel; @@ -698,8 +711,8 @@ rsvp_obj_print(netdissect_options *ndo, return -1; } if(rsvp_obj_len < sizeof(struct rsvp_object_header)) { - ND_PRINT("%sERROR: object header too short %u < %lu", indent, rsvp_obj_len, - (unsigned long)sizeof(struct rsvp_object_header)); + ND_PRINT("%sERROR: object header too short %u < %zu", indent, rsvp_obj_len, + sizeof(struct rsvp_object_header)); return -1; } @@ -739,10 +752,10 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: if (obj_tlen < 8) - return -1; + goto obj_tooshort; ND_PRINT("%s IPv4 DestAddress: %s, Protocol ID: 0x%02x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_U_1(obj_tptr + sizeof(nd_ipv4))); ND_PRINT("%s Flags: [0x%02x], DestPort %u", indent, @@ -753,10 +766,10 @@ rsvp_obj_print(netdissect_options *ndo, break; case RSVP_CTYPE_IPV6: if (obj_tlen < 20) - return -1; + goto obj_tooshort; ND_PRINT("%s IPv6 DestAddress: %s, Protocol ID: 0x%02x", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_U_1(obj_tptr + sizeof(nd_ipv6))); ND_PRINT("%s Flags: [0x%02x], DestPort %u", indent, @@ -768,47 +781,47 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_TUNNEL_IPV6: if (obj_tlen < 36) - return -1; + goto obj_tooshort; ND_PRINT("%s IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18), - ip6addr_string(ndo, obj_tptr + 20)); + GET_IP6ADDR_STRING(obj_tptr + 20)); obj_tlen-=36; obj_tptr+=36; break; case RSVP_CTYPE_14: /* IPv6 p2mp LSP Tunnel */ if (obj_tlen < 26) - return -1; + goto obj_tooshort; ND_PRINT("%s IPv6 P2MP LSP ID: 0x%08x, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", indent, GET_BE_U_4(obj_tptr), GET_BE_U_2(obj_tptr + 6), - ip6addr_string(ndo, obj_tptr + 8)); + GET_IP6ADDR_STRING(obj_tptr + 8)); obj_tlen-=26; obj_tptr+=26; break; case RSVP_CTYPE_13: /* IPv4 p2mp LSP Tunnel */ if (obj_tlen < 12) - return -1; + goto obj_tooshort; ND_PRINT("%s IPv4 P2MP LSP ID: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6), - ipaddr_string(ndo, obj_tptr + 8)); + GET_IPADDR_STRING(obj_tptr + 8)); obj_tlen-=12; obj_tptr+=12; break; case RSVP_CTYPE_TUNNEL_IPV4: case RSVP_CTYPE_UNI_IPV4: if (obj_tlen < 12) - return -1; + goto obj_tooshort; ND_PRINT("%s IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6), - ipaddr_string(ndo, obj_tptr + 8)); + GET_IPADDR_STRING(obj_tptr + 8)); obj_tlen-=12; obj_tptr+=12; break; @@ -821,19 +834,19 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: if (obj_tlen < sizeof(nd_ipv4)) - return -1; + goto obj_tooshort; ND_PRINT("%s IPv4 Receiver Address: %s", indent, - ipaddr_string(ndo, obj_tptr)); + GET_IPADDR_STRING(obj_tptr)); obj_tlen-=sizeof(nd_ipv4); obj_tptr+=sizeof(nd_ipv4); break; case RSVP_CTYPE_IPV6: if (obj_tlen < sizeof(nd_ipv6)) - return -1; + goto obj_tooshort; ND_PRINT("%s IPv6 Receiver Address: %s", indent, - ip6addr_string(ndo, obj_tptr)); + GET_IP6ADDR_STRING(obj_tptr)); obj_tlen-=sizeof(nd_ipv6); obj_tptr+=sizeof(nd_ipv6); break; @@ -846,19 +859,19 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: if (obj_tlen < sizeof(nd_ipv4)) - return -1; + goto obj_tooshort; ND_PRINT("%s IPv4 Notify Node Address: %s", indent, - ipaddr_string(ndo, obj_tptr)); + GET_IPADDR_STRING(obj_tptr)); obj_tlen-=sizeof(nd_ipv4); obj_tptr+=sizeof(nd_ipv4); break; case RSVP_CTYPE_IPV6: if (obj_tlen < sizeof(nd_ipv6)) - return-1; + goto obj_tooshort; ND_PRINT("%s IPv6 Notify Node Address: %s", indent, - ip6addr_string(ndo, obj_tptr)); + GET_IP6ADDR_STRING(obj_tptr)); obj_tlen-=sizeof(nd_ipv6); obj_tptr+=sizeof(nd_ipv6); break; @@ -881,7 +894,7 @@ rsvp_obj_print(netdissect_options *ndo, break; case RSVP_CTYPE_2: if (obj_tlen < 4) - return-1; + goto obj_tooshort; ND_PRINT("%s Generalized Label: %u", indent, GET_BE_U_4(obj_tptr)); @@ -890,7 +903,7 @@ rsvp_obj_print(netdissect_options *ndo, break; case RSVP_CTYPE_3: if (obj_tlen < 12) - return-1; + goto obj_tooshort; ND_PRINT("%s Waveband ID: %u%s Start Label: %u, Stop Label: %u", indent, GET_BE_U_4(obj_tptr), @@ -909,7 +922,7 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: if (obj_tlen < 4) - return-1; + goto obj_tooshort; ND_PRINT("%s Reservation Style: %s, Flags: [0x%02x]", indent, tok2str(rsvp_resstyle_values, @@ -928,58 +941,58 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: if (obj_tlen < 8) - return-1; + goto obj_tooshort; ND_PRINT("%s Source Address: %s, Source Port: %u", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6)); obj_tlen-=8; obj_tptr+=8; break; case RSVP_CTYPE_IPV6: if (obj_tlen < 20) - return-1; + goto obj_tooshort; ND_PRINT("%s Source Address: %s, Source Port: %u", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18)); obj_tlen-=20; obj_tptr+=20; break; case RSVP_CTYPE_13: /* IPv6 p2mp LSP tunnel */ if (obj_tlen < 40) - return-1; + goto obj_tooshort; ND_PRINT("%s IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18), indent, - ip6addr_string(ndo, obj_tptr+20), + GET_IP6ADDR_STRING(obj_tptr+20), GET_BE_U_2(obj_tptr + 38)); obj_tlen-=40; obj_tptr+=40; break; case RSVP_CTYPE_TUNNEL_IPV4: if (obj_tlen < 8) - return-1; + goto obj_tooshort; ND_PRINT("%s IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6)); obj_tlen-=8; obj_tptr+=8; break; case RSVP_CTYPE_12: /* IPv4 p2mp LSP tunnel */ if (obj_tlen < 16) - return-1; + goto obj_tooshort; ND_PRINT("%s IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6), indent, - ipaddr_string(ndo, obj_tptr+8), + GET_IPADDR_STRING(obj_tptr+8), GET_BE_U_2(obj_tptr + 12)); obj_tlen-=16; obj_tptr+=16; @@ -1004,7 +1017,7 @@ rsvp_obj_print(netdissect_options *ndo, break; case RSVP_CTYPE_2: if (obj_tlen < 12) - return-1; + goto obj_tooshort; ND_PRINT("%s L3 Protocol ID: %s", indent, tok2str(ethertype_values, @@ -1025,7 +1038,7 @@ rsvp_obj_print(netdissect_options *ndo, break; case RSVP_CTYPE_3: if (obj_tlen < 12) - return-1; + goto obj_tooshort; ND_PRINT("%s L3 Protocol ID: %s", indent, tok2str(ethertype_values, @@ -1042,7 +1055,7 @@ rsvp_obj_print(netdissect_options *ndo, break; case RSVP_CTYPE_4: if (obj_tlen < 4) - return-1; + goto obj_tooshort; ND_PRINT("%s LSP Encoding Type: %s (%u)", indent, tok2str(gmpls_encoding_values, @@ -1109,7 +1122,7 @@ rsvp_obj_print(netdissect_options *ndo, } ND_PRINT(", %s, %s/%u, Flags: [%s]", RSVP_OBJ_XRO_MASK_LOOSE(GET_U_1(obj_tptr)) ? "Loose" : "Strict", - ipaddr_string(ndo, obj_tptr+2), + GET_IPADDR_STRING(obj_tptr+2), GET_U_1((obj_tptr + 6)), bittok2str(rsvp_obj_rro_flag_values, "none", @@ -1146,7 +1159,7 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_1: case RSVP_CTYPE_2: if (obj_tlen < 8) - return-1; + goto obj_tooshort; ND_PRINT("%s Source Instance: 0x%08x, Destination Instance: 0x%08x", indent, GET_BE_U_4(obj_tptr), @@ -1163,7 +1176,7 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: if (obj_tlen < 8) - return-1; + goto obj_tooshort; ND_PRINT("%s Restart Time: %ums, Recovery Time: %ums", indent, GET_BE_U_4(obj_tptr), @@ -1176,14 +1189,36 @@ rsvp_obj_print(netdissect_options *ndo, } break; + case RSVP_OBJ_CAPABILITY: + switch(rsvp_obj_ctype) { + case RSVP_CTYPE_1: + if (obj_tlen < 4) + goto obj_tooshort; + uint32_t unused_and_flags = GET_BE_U_4(obj_tptr); + if (unused_and_flags & ~RSVP_OBJ_CAPABILITY_FLAGS_MASK) + ND_PRINT("%s [reserved=0x%08x must be zero]", indent, + unused_and_flags & ~RSVP_OBJ_CAPABILITY_FLAGS_MASK); + ND_PRINT("%s Flags: [%s]", + indent, + bittok2str(rsvp_obj_capability_flag_values, + "none", + (unused_and_flags & RSVP_OBJ_CAPABILITY_FLAGS_MASK))); + obj_tlen-=4; + obj_tptr+=4; + break; + default: + hexdump=TRUE; + } + break; + case RSVP_OBJ_SESSION_ATTRIBUTE: switch(rsvp_obj_ctype) { case RSVP_CTYPE_TUNNEL_IPV4: if (obj_tlen < 4) - return-1; + goto obj_tooshort; namelen = GET_U_1(obj_tptr + 3); if (obj_tlen < 4+namelen) - return-1; + goto obj_tooshort; ND_PRINT("%s Session Name: ", indent); for (i = 0; i < namelen; i++) fn_print_char(ndo, GET_U_1(obj_tptr + 4 + i)); @@ -1210,7 +1245,7 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_1: if (obj_tlen < 4) - return-1; + goto obj_tooshort; /* read variable length subobjects */ total_subobj_len = obj_tlen; @@ -1253,7 +1288,7 @@ rsvp_obj_print(netdissect_options *ndo, * * but that doesn't work; the new URL appears to be * - * http://www.oiforum.com/public/documents/OIF-UNI-01.0.pdf + * https://web.archive.org/web/20160401194747/http://www.oiforum.com/public/documents/OIF-UNI-01.0.pdf * * and *that* document, in section 12.5.2.3 * "GENERALIZED_UNI Object (Class-Num=11bbbbbb (TBA))", @@ -1274,15 +1309,15 @@ rsvp_obj_print(netdissect_options *ndo, switch(af) { case AFNUM_INET: if (subobj_len < 8) - return -1; + goto subobj_tooshort; ND_PRINT("%s UNI IPv4 TNA address: %s", - indent, ipaddr_string(ndo, obj_tptr + 4)); + indent, GET_IPADDR_STRING(obj_tptr + 4)); break; case AFNUM_INET6: if (subobj_len < 20) - return -1; + goto subobj_tooshort; ND_PRINT("%s UNI IPv6 TNA address: %s", - indent, ip6addr_string(ndo, obj_tptr + 4)); + indent, GET_IP6ADDR_STRING(obj_tptr + 4)); break; case AFNUM_NSAP: if (subobj_len) { @@ -1302,7 +1337,7 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_GEN_UNI_SUBOBJ_EGRESS_LABEL: if (subobj_len < 16) { - return -1; + goto subobj_tooshort; } ND_PRINT("%s U-bit: %x, Label type: %u, Logical port id: %u, Label: %u", @@ -1315,7 +1350,7 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL: if (subobj_len < 8) { - return -1; + goto subobj_tooshort; } ND_PRINT("%s Service level: %u", @@ -1342,10 +1377,10 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */ case RSVP_CTYPE_IPV4: if (obj_tlen < 8) - return-1; + goto obj_tooshort; ND_PRINT("%s Previous/Next Interface: %s, Logical Interface Handle: 0x%08x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_4(obj_tptr + 4)); obj_tlen-=8; obj_tptr+=8; @@ -1355,10 +1390,10 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */ case RSVP_CTYPE_IPV6: if (obj_tlen < 20) - return-1; + goto obj_tooshort; ND_PRINT("%s Previous/Next Interface: %s, Logical Interface Handle: 0x%08x", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_4(obj_tptr + 16)); obj_tlen-=20; obj_tptr+=20; @@ -1373,7 +1408,7 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: if (obj_tlen < 4) - return-1; + goto obj_tooshort; ND_PRINT("%s Refresh Period: %ums", indent, GET_BE_U_4(obj_tptr)); @@ -1392,7 +1427,7 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_2: if (obj_tlen < 4) - return-1; + goto obj_tooshort; ND_PRINT("%s Msg-Version: %u, length: %u", indent, (GET_U_1(obj_tptr) & 0xf0) >> 4, @@ -1431,78 +1466,78 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: if (obj_tlen < 8) - return-1; + goto obj_tooshort; ND_PRINT("%s Source Address: %s, Source Port: %u", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6)); obj_tlen-=8; obj_tptr+=8; break; case RSVP_CTYPE_IPV6: if (obj_tlen < 20) - return-1; + goto obj_tooshort; ND_PRINT("%s Source Address: %s, Source Port: %u", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18)); obj_tlen-=20; obj_tptr+=20; break; case RSVP_CTYPE_3: if (obj_tlen < 20) - return-1; + goto obj_tooshort; ND_PRINT("%s Source Address: %s, Flow Label: %u", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_3(obj_tptr + 17)); obj_tlen-=20; obj_tptr+=20; break; case RSVP_CTYPE_TUNNEL_IPV6: if (obj_tlen < 20) - return-1; + goto obj_tooshort; ND_PRINT("%s Source Address: %s, LSP-ID: 0x%04x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18)); obj_tlen-=20; obj_tptr+=20; break; case RSVP_CTYPE_13: /* IPv6 p2mp LSP tunnel */ if (obj_tlen < 40) - return-1; + goto obj_tooshort; ND_PRINT("%s IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18), indent, - ip6addr_string(ndo, obj_tptr+20), + GET_IP6ADDR_STRING(obj_tptr+20), GET_BE_U_2(obj_tptr + 38)); obj_tlen-=40; obj_tptr+=40; break; case RSVP_CTYPE_TUNNEL_IPV4: if (obj_tlen < 8) - return-1; + goto obj_tooshort; ND_PRINT("%s Source Address: %s, LSP-ID: 0x%04x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6)); obj_tlen-=8; obj_tptr+=8; break; case RSVP_CTYPE_12: /* IPv4 p2mp LSP tunnel */ if (obj_tlen < 16) - return-1; + goto obj_tooshort; ND_PRINT("%s IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6), indent, - ipaddr_string(ndo, obj_tptr+8), + GET_IPADDR_STRING(obj_tptr+8), GET_BE_U_2(obj_tptr + 12)); obj_tlen-=16; obj_tptr+=16; @@ -1519,7 +1554,7 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: /* new style */ if (obj_tlen < sizeof(struct rsvp_obj_frr_t)) - return-1; + goto obj_tooshort; bw.i = GET_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth); ND_PRINT("%s Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps", indent, @@ -1538,7 +1573,7 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_TUNNEL_IPV4: /* old style */ if (obj_tlen < 16) - return-1; + goto obj_tooshort; bw.i = GET_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth); ND_PRINT("%s Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps", indent, @@ -1565,8 +1600,8 @@ rsvp_obj_print(netdissect_options *ndo, while(obj_tlen >= 8) { ND_PRINT("%s PLR-ID: %s, Avoid-Node-ID: %s", indent, - ipaddr_string(ndo, obj_tptr), - ipaddr_string(ndo, obj_tptr + 4)); + GET_IPADDR_STRING(obj_tptr), + GET_IPADDR_STRING(obj_tptr + 4)); obj_tlen-=8; obj_tptr+=8; } @@ -1580,6 +1615,8 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_OBJ_CLASSTYPE_OLD: /* fall through */ switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: + if (obj_tlen < 4) + goto obj_tooshort; ND_PRINT("%s CT: %u", indent, GET_BE_U_4(obj_tptr) & 0x7); @@ -1596,12 +1633,12 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */ case RSVP_CTYPE_IPV4: if (obj_tlen < 8) - return-1; + goto obj_tooshort; error_code=GET_U_1(obj_tptr + 5); error_value=GET_BE_U_2(obj_tptr + 6); ND_PRINT("%s Error Node Address: %s, Flags: [0x%02x]%s Error Code: %s (%u)", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_U_1(obj_tptr + 4), indent, tok2str(rsvp_obj_error_code_values,"unknown",error_code), @@ -1628,12 +1665,12 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */ case RSVP_CTYPE_IPV6: if (obj_tlen < 20) - return-1; + goto obj_tooshort; error_code=GET_U_1(obj_tptr + 17); error_value=GET_BE_U_2(obj_tptr + 18); ND_PRINT("%s Error Node Address: %s, Flags: [0x%02x]%s Error Code: %s (%u)", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_U_1(obj_tptr + 16), indent, tok2str(rsvp_obj_error_code_values,"unknown",error_code), @@ -1660,7 +1697,7 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: if (obj_tlen < 4) - return-1; + goto obj_tooshort; padbytes = GET_BE_U_2(obj_tptr + 2); ND_PRINT("%s TLV count: %u, padding bytes: %u", indent, @@ -1676,9 +1713,11 @@ rsvp_obj_print(netdissect_options *ndo, GET_U_1(obj_tptr), GET_U_1(obj_tptr + 1)); if (obj_tlen < GET_U_1(obj_tptr + 1)) - return-1; - if (GET_U_1(obj_tptr + 1) < 2) + goto obj_tooshort; + if (GET_U_1(obj_tptr + 1) < 2) { + ND_PRINT("%sERROR: property TLV is too short", indent); return -1; + } print_unknown_data(ndo, obj_tptr + 2, "\n\t\t", GET_U_1(obj_tptr + 1) - 2); obj_tlen-=GET_U_1(obj_tptr + 1); @@ -1696,8 +1735,8 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: case RSVP_CTYPE_2: - if (obj_tlen < 8) - return-1; + if (obj_tlen < 4) + goto obj_tooshort; ND_PRINT("%s Flags [0x%02x], epoch: %u", indent, GET_U_1(obj_tptr), @@ -1723,7 +1762,7 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: if (obj_tlen < sizeof(struct rsvp_obj_integrity_t)) - return-1; + goto obj_tooshort; obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr; ND_PRINT("%s Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]", indent, @@ -1759,7 +1798,7 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: if (obj_tlen < 4) - return-1; + goto obj_tooshort; ND_PRINT("%s Flags [%s]", indent, bittok2str(rsvp_obj_admin_status_flag_values, "none", GET_BE_U_4(obj_tptr))); @@ -1775,7 +1814,7 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: if (obj_tlen < 4) - return-1; + goto obj_tooshort; action = (GET_BE_U_2(obj_tptr)>>8); ND_PRINT("%s Action: %s (%u), Label type: %u", indent, @@ -1788,7 +1827,7 @@ rsvp_obj_print(netdissect_options *ndo, /* only a couple of subchannels are expected */ if (obj_tlen < 12) - return -1; + goto obj_tooshort; ND_PRINT("%s Start range: %u, End range: %u", indent, GET_BE_U_4(obj_tptr + 4), GET_BE_U_4(obj_tptr + 8)); @@ -1819,18 +1858,18 @@ rsvp_obj_print(netdissect_options *ndo, switch (rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: if (obj_tlen < 4) - return-1; + goto obj_tooshort; ND_PRINT("%s Sub-LSP destination address: %s", - indent, ipaddr_string(ndo, obj_tptr)); + indent, GET_IPADDR_STRING(obj_tptr)); obj_tlen-=4; obj_tptr+=4; break; case RSVP_CTYPE_IPV6: if (obj_tlen < 16) - return-1; + goto obj_tooshort; ND_PRINT("%s Sub-LSP destination address: %s", - indent, ip6addr_string(ndo, obj_tptr)); + indent, GET_IP6ADDR_STRING(obj_tptr)); obj_tlen-=16; obj_tptr+=16; @@ -1863,6 +1902,12 @@ rsvp_obj_print(netdissect_options *ndo, tlen-=rsvp_obj_len; } return 0; +subobj_tooshort: + ND_PRINT("%sERROR: sub-object is too short", indent); + return -1; +obj_tooshort: + ND_PRINT("%sERROR: object is too short", indent); + return -1; invalid: nd_print_invalid(ndo); return -1; @@ -1921,8 +1966,8 @@ rsvp_print(netdissect_options *ndo, GET_BE_U_2(rsvp_com_header->checksum)); if (tlen < sizeof(struct rsvp_common_header)) { - ND_PRINT("ERROR: common header too short %u < %lu", tlen, - (unsigned long)sizeof(struct rsvp_common_header)); + ND_PRINT("ERROR: common header too short %u < %zu", tlen, + sizeof(struct rsvp_common_header)); return; } @@ -1969,8 +2014,8 @@ rsvp_print(netdissect_options *ndo, GET_BE_U_2(rsvp_com_header->checksum)); if (subtlen < sizeof(struct rsvp_common_header)) { - ND_PRINT("ERROR: common header too short %u < %lu", subtlen, - (unsigned long)sizeof(struct rsvp_common_header)); + ND_PRINT("ERROR: common header too short %u < %zu", subtlen, + sizeof(struct rsvp_common_header)); return; }