X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/7b1cba646d765868d21e7c66af54ed06f2a739b7..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-rsvp.c diff --git a/print-rsvp.c b/print-rsvp.c index 6e1acd67..29d27412 100644 --- a/print-rsvp.c +++ b/print-rsvp.c @@ -12,9 +12,11 @@ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * FOR A PARTICULAR PURPOSE. * - * Original code by Hannes Gredler (hannes@juniper.net) + * Original code by Hannes Gredler (hannes@gredler.at) */ +/* \summary: Resource ReSerVation Protocol (RSVP) printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -30,7 +32,6 @@ #include "signature.h" static const char tstr[] = " [|rsvp]"; -static const char istr[] = " (invalid)"; /* * RFC 2205 common header @@ -84,7 +85,7 @@ struct rsvp_object_header { #define RSVP_MSGTYPE_PATHTEAR 5 #define RSVP_MSGTYPE_RESVTEAR 6 #define RSVP_MSGTYPE_RESVCONF 7 -#define RSVP_MSGTYPE_AGGREGATE 12 +#define RSVP_MSGTYPE_BUNDLE 12 #define RSVP_MSGTYPE_ACK 13 #define RSVP_MSGTYPE_HELLO_OLD 14 /* ancient Hellos */ #define RSVP_MSGTYPE_SREFRESH 15 @@ -98,7 +99,7 @@ static const struct tok rsvp_msg_type_values[] = { { RSVP_MSGTYPE_PATHTEAR, "PathTear" }, { RSVP_MSGTYPE_RESVTEAR, "ResvTear" }, { RSVP_MSGTYPE_RESVCONF, "ResvConf" }, - { RSVP_MSGTYPE_AGGREGATE, "Aggregate" }, + { RSVP_MSGTYPE_BUNDLE, "Bundle" }, { RSVP_MSGTYPE_ACK, "Acknowledgement" }, { RSVP_MSGTYPE_HELLO_OLD, "Hello (Old)" }, { RSVP_MSGTYPE_SREFRESH, "Refresh" }, @@ -138,7 +139,7 @@ static const struct tok rsvp_header_flag_values[] = { #define RSVP_OBJ_LABEL_SET 36 /* rfc3473 */ #define RSVP_OBJ_PROTECTION 37 /* rfc3473 */ #define RSVP_OBJ_S2L 50 /* rfc4875 */ -#define RSVP_OBJ_DETOUR 63 /* draft-ietf-mpls-rsvp-lsp-fastreroute-07 */ +#define RSVP_OBJ_DETOUR 63 /* rfc4090 */ #define RSVP_OBJ_CLASSTYPE 66 /* rfc4124 */ #define RSVP_OBJ_CLASSTYPE_OLD 125 /* draft-ietf-tewg-diff-te-proto-07 */ #define RSVP_OBJ_SUGGESTED_LABEL 129 /* rfc3473 */ @@ -147,7 +148,7 @@ static const struct tok rsvp_header_flag_values[] = { #define RSVP_OBJ_NOTIFY_REQ 195 /* rfc3473 */ #define RSVP_OBJ_ADMIN_STATUS 196 /* rfc3473 */ #define RSVP_OBJ_PROPERTIES 204 /* juniper proprietary */ -#define RSVP_OBJ_FASTREROUTE 205 /* draft-ietf-mpls-rsvp-lsp-fastreroute-07 */ +#define RSVP_OBJ_FASTREROUTE 205 /* rfc4090 */ #define RSVP_OBJ_SESSION_ATTRIBUTE 207 /* rfc3209 */ #define RSVP_OBJ_GENERALIZED_UNI 229 /* OIF RSVP extensions UNI 1.0 Signaling, Rel. 2 */ #define RSVP_OBJ_CALL_ID 230 /* rfc3474 */ @@ -338,7 +339,7 @@ static const struct tok rsvp_obj_xro_values[] = { { 0, NULL} }; -/* draft-ietf-mpls-rsvp-lsp-fastreroute-07.txt */ +/* RFC4090 */ static const struct tok rsvp_obj_rro_flag_values[] = { { 0x01, "Local protection available" }, { 0x02, "Local protection in use" }, @@ -498,15 +499,16 @@ rsvp_intserv_print(netdissect_options *ndo, if (obj_tlen < 4) return 0; - parameter_id = *(tptr); - ND_TCHECK2(*(tptr + 2), 2); - parameter_length = EXTRACT_16BITS(tptr+2)<<2; /* convert wordcount to bytecount */ + ND_TCHECK_1(tptr); + parameter_id = EXTRACT_U_1(tptr); + ND_TCHECK_2(tptr + 2); + parameter_length = EXTRACT_BE_U_2(tptr + 2)<<2; /* convert wordcount to bytecount */ ND_PRINT((ndo, "\n\t Parameter ID: %s (%u), length: %u, Flags: [0x%02x]", tok2str(rsvp_intserv_parameter_id_values,"unknown",parameter_id), parameter_id, parameter_length, - *(tptr + 1))); + EXTRACT_U_1(tptr + 1))); if (obj_tlen < parameter_length+4) return 0; @@ -520,9 +522,10 @@ rsvp_intserv_print(netdissect_options *ndo, * | IS hop cnt (32-bit unsigned integer) | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - if (parameter_length == 4) - ND_TCHECK2(*(tptr + 4), 4); - ND_PRINT((ndo, "\n\t\tIS hop count: %u", EXTRACT_32BITS(tptr + 4))); + if (parameter_length == 4) { + ND_TCHECK_4(tptr + 4); + ND_PRINT((ndo, "\n\t\tIS hop count: %u", EXTRACT_BE_U_4(tptr + 4))); + } break; case 6: @@ -534,8 +537,8 @@ rsvp_intserv_print(netdissect_options *ndo, * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ if (parameter_length == 4) { - ND_TCHECK2(*(tptr + 4), 4); - bw.i = EXTRACT_32BITS(tptr+4); + ND_TCHECK_4(tptr + 4); + bw.i = EXTRACT_BE_U_4(tptr + 4); ND_PRINT((ndo, "\n\t\tPath b/w estimate: %.10g Mbps", bw.f / 125000)); } break; @@ -549,12 +552,12 @@ rsvp_intserv_print(netdissect_options *ndo, * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ if (parameter_length == 4) { - ND_TCHECK2(*(tptr + 4), 4); + ND_TCHECK_4(tptr + 4); ND_PRINT((ndo, "\n\t\tMinimum path latency: ")); - if (EXTRACT_32BITS(tptr+4) == 0xffffffff) + if (EXTRACT_BE_U_4(tptr + 4) == 0xffffffff) ND_PRINT((ndo, "don't care")); else - ND_PRINT((ndo, "%u", EXTRACT_32BITS(tptr + 4))); + ND_PRINT((ndo, "%u", EXTRACT_BE_U_4(tptr + 4))); } break; @@ -567,9 +570,10 @@ rsvp_intserv_print(netdissect_options *ndo, * | Composed MTU (32-bit unsigned integer) | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - if (parameter_length == 4) - ND_TCHECK2(*(tptr + 4), 4); - ND_PRINT((ndo, "\n\t\tComposed MTU: %u bytes", EXTRACT_32BITS(tptr + 4))); + if (parameter_length == 4) { + ND_TCHECK_4(tptr + 4); + ND_PRINT((ndo, "\n\t\tComposed MTU: %u bytes", EXTRACT_BE_U_4(tptr + 4))); + } break; case 127: /* @@ -589,15 +593,15 @@ rsvp_intserv_print(netdissect_options *ndo, */ if (parameter_length == 20) { - ND_TCHECK2(*(tptr + 4), 20); - bw.i = EXTRACT_32BITS(tptr+4); + ND_TCHECK_LEN(tptr + 4, 20); + bw.i = EXTRACT_BE_U_4(tptr + 4); ND_PRINT((ndo, "\n\t\tToken Bucket Rate: %.10g Mbps", bw.f / 125000)); - bw.i = EXTRACT_32BITS(tptr+8); + bw.i = EXTRACT_BE_U_4(tptr + 8); ND_PRINT((ndo, "\n\t\tToken Bucket Size: %.10g bytes", bw.f)); - bw.i = EXTRACT_32BITS(tptr+12); + bw.i = EXTRACT_BE_U_4(tptr + 12); ND_PRINT((ndo, "\n\t\tPeak Data Rate: %.10g Mbps", bw.f / 125000)); - ND_PRINT((ndo, "\n\t\tMinimum Policed Unit: %u bytes", EXTRACT_32BITS(tptr + 16))); - ND_PRINT((ndo, "\n\t\tMaximum Packet Size: %u bytes", EXTRACT_32BITS(tptr + 20))); + ND_PRINT((ndo, "\n\t\tMinimum Policed Unit: %u bytes", EXTRACT_BE_U_4(tptr + 16))); + ND_PRINT((ndo, "\n\t\tMaximum Packet Size: %u bytes", EXTRACT_BE_U_4(tptr + 20))); } break; @@ -613,10 +617,10 @@ rsvp_intserv_print(netdissect_options *ndo, */ if (parameter_length == 8) { - ND_TCHECK2(*(tptr + 4), 8); - bw.i = EXTRACT_32BITS(tptr+4); + ND_TCHECK_8(tptr + 4); + bw.i = EXTRACT_BE_U_4(tptr + 4); ND_PRINT((ndo, "\n\t\tRate: %.10g Mbps", bw.f / 125000)); - ND_PRINT((ndo, "\n\t\tSlack Term: %u", EXTRACT_32BITS(tptr + 8))); + ND_PRINT((ndo, "\n\t\tSlack Term: %u", EXTRACT_BE_U_4(tptr + 8))); } break; @@ -624,9 +628,10 @@ rsvp_intserv_print(netdissect_options *ndo, case 134: case 135: case 136: - if (parameter_length == 4) - ND_TCHECK2(*(tptr + 4), 4); - ND_PRINT((ndo, "\n\t\tValue: %u", EXTRACT_32BITS(tptr + 4))); + if (parameter_length == 4) { + ND_TCHECK_4(tptr + 4); + ND_PRINT((ndo, "\n\t\tValue: %u", EXTRACT_BE_U_4(tptr + 4))); + } break; default: @@ -655,7 +660,7 @@ rsvp_clear_checksum(void *header) static int rsvp_obj_print(netdissect_options *ndo, const u_char *pptr, u_int plen, const u_char *tptr, - const char *ident, u_int tlen, + const char *indent, u_int tlen, const struct rsvp_common_header *rsvp_com_header) { const struct rsvp_object_header *rsvp_obj_header; @@ -677,24 +682,24 @@ rsvp_obj_print(netdissect_options *ndo, while(tlen>=sizeof(struct rsvp_object_header)) { /* did we capture enough for fully decoding the object header ? */ - ND_TCHECK2(*tptr, sizeof(struct rsvp_object_header)); + ND_TCHECK_LEN(tptr, sizeof(struct rsvp_object_header)); rsvp_obj_header = (const struct rsvp_object_header *)tptr; - rsvp_obj_len=EXTRACT_16BITS(rsvp_obj_header->length); + rsvp_obj_len=EXTRACT_BE_U_2(rsvp_obj_header->length); rsvp_obj_ctype=rsvp_obj_header->ctype; if(rsvp_obj_len % 4) { - ND_PRINT((ndo, "%sERROR: object header size %u not a multiple of 4", ident, rsvp_obj_len)); + ND_PRINT((ndo, "%sERROR: object header size %u not a multiple of 4", indent, rsvp_obj_len)); return -1; } if(rsvp_obj_len < sizeof(struct rsvp_object_header)) { - ND_PRINT((ndo, "%sERROR: object header too short %u < %lu", ident, rsvp_obj_len, - (unsigned long)sizeof(const struct rsvp_object_header))); + ND_PRINT((ndo, "%sERROR: object header too short %u < %lu", indent, rsvp_obj_len, + (unsigned long)sizeof(struct rsvp_object_header))); return -1; } ND_PRINT((ndo, "%s%s Object (%u) Flags: [%s", - ident, + indent, tok2str(rsvp_obj_values, "Unknown", rsvp_obj_header->class_num), @@ -713,7 +718,7 @@ rsvp_obj_print(netdissect_options *ndo, rsvp_obj_len)); if(tlen < rsvp_obj_len) { - ND_PRINT((ndo, "%sERROR: object goes past end of objects TLV", ident)); + ND_PRINT((ndo, "%sERROR: object goes past end of objects TLV", indent)); return -1; } @@ -721,7 +726,7 @@ rsvp_obj_print(netdissect_options *ndo, obj_tlen=rsvp_obj_len-sizeof(struct rsvp_object_header); /* did we capture enough for fully decoding the object ? */ - if (!ND_TTEST2(*tptr, rsvp_obj_len)) + if (!ND_TTEST_LEN(tptr, rsvp_obj_len)) return -1; hexdump=FALSE; @@ -732,13 +737,13 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 8) return -1; ND_PRINT((ndo, "%s IPv4 DestAddress: %s, Protocol ID: 0x%02x", - ident, + indent, ipaddr_string(ndo, obj_tptr), - *(obj_tptr + sizeof(struct in_addr)))); + EXTRACT_U_1(obj_tptr + sizeof(struct in_addr)))); ND_PRINT((ndo, "%s Flags: [0x%02x], DestPort %u", - ident, - *(obj_tptr+5), - EXTRACT_16BITS(obj_tptr + 6))); + indent, + EXTRACT_U_1((obj_tptr + 5)), + EXTRACT_BE_U_2(obj_tptr + 6))); obj_tlen-=8; obj_tptr+=8; break; @@ -746,13 +751,13 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 20) return -1; ND_PRINT((ndo, "%s IPv6 DestAddress: %s, Protocol ID: 0x%02x", - ident, + indent, ip6addr_string(ndo, obj_tptr), - *(obj_tptr + sizeof(struct in6_addr)))); + EXTRACT_U_1(obj_tptr + sizeof(struct in6_addr)))); ND_PRINT((ndo, "%s Flags: [0x%02x], DestPort %u", - ident, - *(obj_tptr+sizeof(struct in6_addr)+1), - EXTRACT_16BITS(obj_tptr + sizeof(struct in6_addr) + 2))); + indent, + EXTRACT_U_1((obj_tptr + sizeof(struct in6_addr) + 1)), + EXTRACT_BE_U_2(obj_tptr + sizeof(struct in6_addr) + 2))); obj_tlen-=20; obj_tptr+=20; break; @@ -761,9 +766,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 36) return -1; ND_PRINT((ndo, "%s IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", - ident, + indent, ip6addr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr+18), + EXTRACT_BE_U_2(obj_tptr + 18), ip6addr_string(ndo, obj_tptr + 20))); obj_tlen-=36; obj_tptr+=36; @@ -773,9 +778,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 26) return -1; ND_PRINT((ndo, "%s IPv6 P2MP LSP ID: 0x%08x, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", - ident, - EXTRACT_32BITS(obj_tptr), - EXTRACT_16BITS(obj_tptr+6), + indent, + EXTRACT_BE_U_4(obj_tptr), + EXTRACT_BE_U_2(obj_tptr + 6), ip6addr_string(ndo, obj_tptr + 8))); obj_tlen-=26; obj_tptr+=26; @@ -784,9 +789,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 12) return -1; ND_PRINT((ndo, "%s IPv4 P2MP LSP ID: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", - ident, + indent, ipaddr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr+6), + EXTRACT_BE_U_2(obj_tptr + 6), ipaddr_string(ndo, obj_tptr + 8))); obj_tlen-=12; obj_tptr+=12; @@ -796,9 +801,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 12) return -1; ND_PRINT((ndo, "%s IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", - ident, + indent, ipaddr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr+6), + EXTRACT_BE_U_2(obj_tptr + 6), ipaddr_string(ndo, obj_tptr + 8))); obj_tlen-=12; obj_tptr+=12; @@ -814,7 +819,7 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < sizeof(struct in_addr)) return -1; ND_PRINT((ndo, "%s IPv4 Receiver Address: %s", - ident, + indent, ipaddr_string(ndo, obj_tptr))); obj_tlen-=sizeof(struct in_addr); obj_tptr+=sizeof(struct in_addr); @@ -823,7 +828,7 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < sizeof(struct in6_addr)) return -1; ND_PRINT((ndo, "%s IPv6 Receiver Address: %s", - ident, + indent, ip6addr_string(ndo, obj_tptr))); obj_tlen-=sizeof(struct in6_addr); obj_tptr+=sizeof(struct in6_addr); @@ -839,7 +844,7 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < sizeof(struct in_addr)) return -1; ND_PRINT((ndo, "%s IPv4 Notify Node Address: %s", - ident, + indent, ipaddr_string(ndo, obj_tptr))); obj_tlen-=sizeof(struct in_addr); obj_tptr+=sizeof(struct in_addr); @@ -848,7 +853,7 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < sizeof(struct in6_addr)) return-1; ND_PRINT((ndo, "%s IPv6 Notify Node Address: %s", - ident, + indent, ip6addr_string(ndo, obj_tptr))); obj_tlen-=sizeof(struct in6_addr); obj_tptr+=sizeof(struct in6_addr); @@ -865,7 +870,7 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: while(obj_tlen >= 4 ) { - ND_PRINT((ndo, "%s Label: %u", ident, EXTRACT_32BITS(obj_tptr))); + ND_PRINT((ndo, "%s Label: %u", indent, EXTRACT_BE_U_4(obj_tptr))); obj_tlen-=4; obj_tptr+=4; } @@ -874,8 +879,8 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 4) return-1; ND_PRINT((ndo, "%s Generalized Label: %u", - ident, - EXTRACT_32BITS(obj_tptr))); + indent, + EXTRACT_BE_U_4(obj_tptr))); obj_tlen-=4; obj_tptr+=4; break; @@ -883,11 +888,11 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 12) return-1; ND_PRINT((ndo, "%s Waveband ID: %u%s Start Label: %u, Stop Label: %u", - ident, - EXTRACT_32BITS(obj_tptr), - ident, - EXTRACT_32BITS(obj_tptr+4), - EXTRACT_32BITS(obj_tptr + 8))); + indent, + EXTRACT_BE_U_4(obj_tptr), + indent, + EXTRACT_BE_U_4(obj_tptr + 4), + EXTRACT_BE_U_4(obj_tptr + 8))); obj_tlen-=12; obj_tptr+=12; break; @@ -902,11 +907,11 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 4) return-1; ND_PRINT((ndo, "%s Reservation Style: %s, Flags: [0x%02x]", - ident, + indent, tok2str(rsvp_resstyle_values, "Unknown", - EXTRACT_24BITS(obj_tptr+1)), - *(obj_tptr))); + EXTRACT_BE_U_3(obj_tptr + 1)), + EXTRACT_U_1(obj_tptr))); obj_tlen-=4; obj_tptr+=4; break; @@ -921,9 +926,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 8) return-1; ND_PRINT((ndo, "%s Source Address: %s, Source Port: %u", - ident, + indent, ipaddr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr + 6))); + EXTRACT_BE_U_2(obj_tptr + 6))); obj_tlen-=8; obj_tptr+=8; break; @@ -931,9 +936,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 20) return-1; ND_PRINT((ndo, "%s Source Address: %s, Source Port: %u", - ident, + indent, ip6addr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr + 18))); + EXTRACT_BE_U_2(obj_tptr + 18))); obj_tlen-=20; obj_tptr+=20; break; @@ -942,12 +947,12 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT((ndo, "%s IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", - ident, + indent, ip6addr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr+18), - ident, + EXTRACT_BE_U_2(obj_tptr + 18), + indent, ip6addr_string(ndo, obj_tptr+20), - EXTRACT_16BITS(obj_tptr + 38))); + EXTRACT_BE_U_2(obj_tptr + 38))); obj_tlen-=40; obj_tptr+=40; break; @@ -955,9 +960,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 8) return-1; ND_PRINT((ndo, "%s IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x", - ident, + indent, ipaddr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr + 6))); + EXTRACT_BE_U_2(obj_tptr + 6))); obj_tlen-=8; obj_tptr+=8; break; @@ -966,12 +971,12 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT((ndo, "%s IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", - ident, + indent, ipaddr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr+6), - ident, + EXTRACT_BE_U_2(obj_tptr + 6), + indent, ipaddr_string(ndo, obj_tptr+8), - EXTRACT_16BITS(obj_tptr + 12))); + EXTRACT_BE_U_2(obj_tptr + 12))); obj_tlen-=16; obj_tptr+=16; break; @@ -985,10 +990,10 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_1: while(obj_tlen >= 4 ) { ND_PRINT((ndo, "%s L3 Protocol ID: %s", - ident, + indent, tok2str(ethertype_values, "Unknown Protocol (0x%04x)", - EXTRACT_16BITS(obj_tptr + 2)))); + EXTRACT_BE_U_2(obj_tptr + 2)))); obj_tlen-=4; obj_tptr+=4; } @@ -997,19 +1002,19 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 12) return-1; ND_PRINT((ndo, "%s L3 Protocol ID: %s", - ident, + indent, tok2str(ethertype_values, "Unknown Protocol (0x%04x)", - EXTRACT_16BITS(obj_tptr + 2)))); - ND_PRINT((ndo, ",%s merge capability",((*(obj_tptr + 4)) & 0x80) ? "no" : "" )); + EXTRACT_BE_U_2(obj_tptr + 2)))); + ND_PRINT((ndo, ",%s merge capability",((EXTRACT_U_1(obj_tptr + 4)) & 0x80) ? "no" : "" )); ND_PRINT((ndo, "%s Minimum VPI/VCI: %u/%u", - ident, - (EXTRACT_16BITS(obj_tptr+4))&0xfff, - (EXTRACT_16BITS(obj_tptr + 6)) & 0xfff)); + indent, + (EXTRACT_BE_U_2(obj_tptr + 4))&0xfff, + (EXTRACT_BE_U_2(obj_tptr + 6)) & 0xfff)); ND_PRINT((ndo, "%s Maximum VPI/VCI: %u/%u", - ident, - (EXTRACT_16BITS(obj_tptr+8))&0xfff, - (EXTRACT_16BITS(obj_tptr + 10)) & 0xfff)); + indent, + (EXTRACT_BE_U_2(obj_tptr + 8))&0xfff, + (EXTRACT_BE_U_2(obj_tptr + 10)) & 0xfff)); obj_tlen-=12; obj_tptr+=12; break; @@ -1017,16 +1022,16 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 12) return-1; ND_PRINT((ndo, "%s L3 Protocol ID: %s", - ident, + indent, tok2str(ethertype_values, "Unknown Protocol (0x%04x)", - EXTRACT_16BITS(obj_tptr + 2)))); + EXTRACT_BE_U_2(obj_tptr + 2)))); ND_PRINT((ndo, "%s Minimum/Maximum DLCI: %u/%u, %s%s bit DLCI", - ident, - (EXTRACT_32BITS(obj_tptr+4))&0x7fffff, - (EXTRACT_32BITS(obj_tptr+8))&0x7fffff, - (((EXTRACT_16BITS(obj_tptr+4)>>7)&3) == 0 ) ? "10" : "", - (((EXTRACT_16BITS(obj_tptr + 4) >> 7) & 3) == 2 ) ? "23" : "")); + indent, + (EXTRACT_BE_U_4(obj_tptr + 4))&0x7fffff, + (EXTRACT_BE_U_4(obj_tptr + 8))&0x7fffff, + (((EXTRACT_BE_U_2(obj_tptr + 4)>>7)&3) == 0 ) ? "10" : "", + (((EXTRACT_BE_U_2(obj_tptr + 4) >> 7) & 3) == 2 ) ? "23" : "")); obj_tlen-=12; obj_tptr+=12; break; @@ -1034,21 +1039,21 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 4) return-1; ND_PRINT((ndo, "%s LSP Encoding Type: %s (%u)", - ident, + indent, tok2str(gmpls_encoding_values, "Unknown", - *obj_tptr), - *obj_tptr)); + EXTRACT_U_1(obj_tptr)), + EXTRACT_U_1(obj_tptr))); ND_PRINT((ndo, "%s Switching Type: %s (%u), Payload ID: %s (0x%04x)", - ident, + indent, tok2str(gmpls_switch_cap_values, "Unknown", - *(obj_tptr+1)), - *(obj_tptr+1), + EXTRACT_U_1((obj_tptr + 1))), + EXTRACT_U_1(obj_tptr + 1), tok2str(gmpls_payload_values, "Unknown", - EXTRACT_16BITS(obj_tptr+2)), - EXTRACT_16BITS(obj_tptr + 2))); + EXTRACT_BE_U_2(obj_tptr + 2)), + EXTRACT_BE_U_2(obj_tptr + 2))); obj_tlen-=4; obj_tptr+=4; break; @@ -1062,42 +1067,64 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: while(obj_tlen >= 4 ) { + u_char length; + + ND_TCHECK_4(obj_tptr); + length = EXTRACT_U_1(obj_tptr + 1); ND_PRINT((ndo, "%s Subobject Type: %s, length %u", - ident, + indent, tok2str(rsvp_obj_xro_values, "Unknown %u", - RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr)), - *(obj_tptr + 1))); + RSVP_OBJ_XRO_MASK_SUBOBJ(EXTRACT_U_1(obj_tptr))), + length)); - if (*(obj_tptr+1) == 0) { /* prevent infinite loops */ - ND_PRINT((ndo, "%s ERROR: zero length ERO subtype", ident)); + if (length == 0) { /* prevent infinite loops */ + ND_PRINT((ndo, "%s ERROR: zero length ERO subtype", indent)); break; } - switch(RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr)) { + switch(RSVP_OBJ_XRO_MASK_SUBOBJ(EXTRACT_U_1(obj_tptr))) { + u_char prefix_length; + case RSVP_OBJ_XRO_IPV4: + if (length != 8) { + ND_PRINT((ndo, " ERROR: length != 8")); + goto invalid; + } + ND_TCHECK_8(obj_tptr); + prefix_length = EXTRACT_U_1(obj_tptr + 6); + if (prefix_length != 32) { + ND_PRINT((ndo, " ERROR: Prefix length %u != 32", + prefix_length)); + goto invalid; + } ND_PRINT((ndo, ", %s, %s/%u, Flags: [%s]", - RSVP_OBJ_XRO_MASK_LOOSE(*obj_tptr) ? "Loose" : "Strict", + RSVP_OBJ_XRO_MASK_LOOSE(EXTRACT_U_1(obj_tptr)) ? "Loose" : "Strict", ipaddr_string(ndo, obj_tptr+2), - *(obj_tptr+6), + EXTRACT_U_1((obj_tptr + 6)), bittok2str(rsvp_obj_rro_flag_values, "none", - *(obj_tptr + 7)))); /* rfc3209 says that this field is rsvd. */ + EXTRACT_U_1((obj_tptr + 7))))); /* rfc3209 says that this field is rsvd. */ break; case RSVP_OBJ_XRO_LABEL: + if (length != 8) { + ND_PRINT((ndo, " ERROR: length != 8")); + goto invalid; + } + ND_TCHECK_8(obj_tptr); ND_PRINT((ndo, ", Flags: [%s] (%#x), Class-Type: %s (%u), %u", bittok2str(rsvp_obj_rro_label_flag_values, "none", - *(obj_tptr+2)), - *(obj_tptr+2), + EXTRACT_U_1((obj_tptr + 2))), + EXTRACT_U_1(obj_tptr + 2), tok2str(rsvp_ctype_values, "Unknown", - *(obj_tptr+3) + 256*RSVP_OBJ_RRO), - *(obj_tptr+3), - EXTRACT_32BITS(obj_tptr + 4))); + EXTRACT_U_1((obj_tptr + 3)) + (256 * RSVP_OBJ_RRO)), + EXTRACT_U_1((obj_tptr + 3)), + EXTRACT_BE_U_4(obj_tptr + 4))); } - obj_tlen-=*(obj_tptr+1); - obj_tptr+=*(obj_tptr+1); + obj_tlen-=EXTRACT_U_1(obj_tptr + 1); + obj_tptr+=EXTRACT_U_1(obj_tptr + 1); } break; default: @@ -1112,9 +1139,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 8) return-1; ND_PRINT((ndo, "%s Source Instance: 0x%08x, Destination Instance: 0x%08x", - ident, - EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr + 4))); + indent, + EXTRACT_BE_U_4(obj_tptr), + EXTRACT_BE_U_4(obj_tptr + 4))); obj_tlen-=8; obj_tptr+=8; break; @@ -1129,9 +1156,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 8) return-1; ND_PRINT((ndo, "%s Restart Time: %ums, Recovery Time: %ums", - ident, - EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr + 4))); + indent, + EXTRACT_BE_U_4(obj_tptr), + EXTRACT_BE_U_4(obj_tptr + 4))); obj_tlen-=8; obj_tptr+=8; break; @@ -1145,22 +1172,22 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_TUNNEL_IPV4: if (obj_tlen < 4) return-1; - namelen = *(obj_tptr+3); + namelen = EXTRACT_U_1(obj_tptr + 3); if (obj_tlen < 4+namelen) return-1; - ND_PRINT((ndo, "%s Session Name: ", ident)); + ND_PRINT((ndo, "%s Session Name: ", indent)); for (i = 0; i < namelen; i++) - safeputchar(ndo, *(obj_tptr + 4 + i)); + safeputchar(ndo, EXTRACT_U_1(obj_tptr + 4 + i)); ND_PRINT((ndo, "%s Setup Priority: %u, Holding Priority: %u, Flags: [%s] (%#x)", - ident, - (int)*obj_tptr, - (int)*(obj_tptr+1), + indent, + EXTRACT_U_1(obj_tptr), + EXTRACT_U_1(obj_tptr + 1), bittok2str(rsvp_session_attribute_flag_values, "none", - *(obj_tptr+2)), - *(obj_tptr + 2))); - obj_tlen-=4+*(obj_tptr+3); - obj_tptr+=4+*(obj_tptr+3); + EXTRACT_U_1((obj_tptr + 2))), + EXTRACT_U_1(obj_tptr + 2))); + obj_tlen-=4+EXTRACT_U_1((obj_tptr + 3)); + obj_tptr+=4+EXTRACT_U_1((obj_tptr + 3)); break; default: hexdump=TRUE; @@ -1179,18 +1206,35 @@ rsvp_obj_print(netdissect_options *ndo, /* read variable length subobjects */ total_subobj_len = obj_tlen; while(total_subobj_len > 0) { - subobj_len = EXTRACT_16BITS(obj_tptr); - subobj_type = (EXTRACT_16BITS(obj_tptr+2))>>8; - af = (EXTRACT_16BITS(obj_tptr+2))&0x00FF; + /* If RFC 3476 Section 3.1 defined that a sub-object of the + * GENERALIZED_UNI RSVP object must have the Length field as + * a multiple of 4, instead of the check below it would be + * better to test total_subobj_len only once before the loop. + * So long as it does not define it and this while loop does + * not implement such a requirement, let's accept that within + * each iteration subobj_len may happen to be a multiple of 1 + * and test it and total_subobj_len respectively. + */ + if (total_subobj_len < 4) + goto invalid; + subobj_len = EXTRACT_BE_U_2(obj_tptr); + subobj_type = (EXTRACT_BE_U_2(obj_tptr + 2))>>8; + af = (EXTRACT_BE_U_2(obj_tptr + 2))&0x00FF; ND_PRINT((ndo, "%s Subobject Type: %s (%u), AF: %s (%u), length: %u", - ident, + indent, tok2str(rsvp_obj_generalized_uni_values, "Unknown", subobj_type), subobj_type, tok2str(af_values, "Unknown", af), af, subobj_len)); - if(subobj_len == 0) + /* In addition to what is explained above, the same spec does not + * explicitly say that the same Length field includes the 4-octet + * sub-object header, but as long as this while loop implements it + * as it does include, let's keep the check below consistent with + * the rest of the code. + */ + if(subobj_len < 4 || subobj_len > total_subobj_len) goto invalid; switch(subobj_type) { @@ -1202,13 +1246,13 @@ rsvp_obj_print(netdissect_options *ndo, if (subobj_len < 8) return -1; ND_PRINT((ndo, "%s UNI IPv4 TNA address: %s", - ident, ipaddr_string(ndo, obj_tptr + 4))); + indent, ipaddr_string(ndo, obj_tptr + 4))); break; case AFNUM_INET6: if (subobj_len < 20) return -1; ND_PRINT((ndo, "%s UNI IPv6 TNA address: %s", - ident, ip6addr_string(ndo, obj_tptr + 4))); + indent, ip6addr_string(ndo, obj_tptr + 4))); break; case AFNUM_NSAP: if (subobj_len) { @@ -1232,11 +1276,11 @@ rsvp_obj_print(netdissect_options *ndo, } ND_PRINT((ndo, "%s U-bit: %x, Label type: %u, Logical port id: %u, Label: %u", - ident, - ((EXTRACT_32BITS(obj_tptr+4))>>31), - ((EXTRACT_32BITS(obj_tptr+4))&0xFF), - EXTRACT_32BITS(obj_tptr+8), - EXTRACT_32BITS(obj_tptr + 12))); + indent, + ((EXTRACT_BE_U_4(obj_tptr + 4))>>31), + ((EXTRACT_BE_U_4(obj_tptr + 4))&0xFF), + EXTRACT_BE_U_4(obj_tptr + 8), + EXTRACT_BE_U_4(obj_tptr + 12))); break; case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL: @@ -1245,7 +1289,7 @@ rsvp_obj_print(netdissect_options *ndo, } ND_PRINT((ndo, "%s Service level: %u", - ident, (EXTRACT_32BITS(obj_tptr + 4)) >> 24)); + indent, (EXTRACT_BE_U_4(obj_tptr + 4)) >> 24)); break; default: @@ -1275,9 +1319,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 8) return-1; ND_PRINT((ndo, "%s Previous/Next Interface: %s, Logical Interface Handle: 0x%08x", - ident, + indent, ipaddr_string(ndo, obj_tptr), - EXTRACT_32BITS(obj_tptr + 4))); + EXTRACT_BE_U_4(obj_tptr + 4))); obj_tlen-=8; obj_tptr+=8; if (obj_tlen) @@ -1288,9 +1332,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 20) return-1; ND_PRINT((ndo, "%s Previous/Next Interface: %s, Logical Interface Handle: 0x%08x", - ident, + indent, ip6addr_string(ndo, obj_tptr), - EXTRACT_32BITS(obj_tptr + 16))); + EXTRACT_BE_U_4(obj_tptr + 16))); obj_tlen-=20; obj_tptr+=20; hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */ @@ -1306,8 +1350,8 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 4) return-1; ND_PRINT((ndo, "%s Refresh Period: %ums", - ident, - EXTRACT_32BITS(obj_tptr))); + indent, + EXTRACT_BE_U_4(obj_tptr))); obj_tlen-=4; obj_tptr+=4; break; @@ -1325,19 +1369,19 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 4) return-1; ND_PRINT((ndo, "%s Msg-Version: %u, length: %u", - ident, - (*obj_tptr & 0xf0) >> 4, - EXTRACT_16BITS(obj_tptr + 2) << 2)); + indent, + (EXTRACT_U_1(obj_tptr) & 0xf0) >> 4, + EXTRACT_BE_U_2(obj_tptr + 2) << 2)); obj_tptr+=4; /* get to the start of the service header */ obj_tlen-=4; while (obj_tlen >= 4) { - intserv_serv_tlen=EXTRACT_16BITS(obj_tptr+2)<<2; + intserv_serv_tlen=EXTRACT_BE_U_2(obj_tptr + 2)<<2; ND_PRINT((ndo, "%s Service Type: %s (%u), break bit %s set, Service length: %u", - ident, - tok2str(rsvp_intserv_service_type_values,"unknown",*(obj_tptr)), - *(obj_tptr), - (*(obj_tptr+1)&0x80) ? "" : "not", + indent, + tok2str(rsvp_intserv_service_type_values,"unknown",EXTRACT_U_1((obj_tptr))), + EXTRACT_U_1(obj_tptr), + (EXTRACT_U_1(obj_tptr + 1)&0x80) ? "" : "not", intserv_serv_tlen)); obj_tptr+=4; /* get to the start of the parameter list */ @@ -1364,9 +1408,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 8) return-1; ND_PRINT((ndo, "%s Source Address: %s, Source Port: %u", - ident, + indent, ipaddr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr + 6))); + EXTRACT_BE_U_2(obj_tptr + 6))); obj_tlen-=8; obj_tptr+=8; break; @@ -1374,9 +1418,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 20) return-1; ND_PRINT((ndo, "%s Source Address: %s, Source Port: %u", - ident, + indent, ip6addr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr + 18))); + EXTRACT_BE_U_2(obj_tptr + 18))); obj_tlen-=20; obj_tptr+=20; break; @@ -1384,9 +1428,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 20) return-1; ND_PRINT((ndo, "%s Source Address: %s, Flow Label: %u", - ident, + indent, ip6addr_string(ndo, obj_tptr), - EXTRACT_24BITS(obj_tptr + 17))); + EXTRACT_BE_U_3(obj_tptr + 17))); obj_tlen-=20; obj_tptr+=20; break; @@ -1394,9 +1438,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 20) return-1; ND_PRINT((ndo, "%s Source Address: %s, LSP-ID: 0x%04x", - ident, + indent, ipaddr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr + 18))); + EXTRACT_BE_U_2(obj_tptr + 18))); obj_tlen-=20; obj_tptr+=20; break; @@ -1405,12 +1449,12 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT((ndo, "%s IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", - ident, + indent, ip6addr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr+18), - ident, + EXTRACT_BE_U_2(obj_tptr + 18), + indent, ip6addr_string(ndo, obj_tptr+20), - EXTRACT_16BITS(obj_tptr + 38))); + EXTRACT_BE_U_2(obj_tptr + 38))); obj_tlen-=40; obj_tptr+=40; break; @@ -1418,9 +1462,9 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 8) return-1; ND_PRINT((ndo, "%s Source Address: %s, LSP-ID: 0x%04x", - ident, + indent, ipaddr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr + 6))); + EXTRACT_BE_U_2(obj_tptr + 6))); obj_tlen-=8; obj_tptr+=8; break; @@ -1429,12 +1473,12 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT((ndo, "%s IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", - ident, + indent, ipaddr_string(ndo, obj_tptr), - EXTRACT_16BITS(obj_tptr+6), - ident, + EXTRACT_BE_U_2(obj_tptr + 6), + indent, ipaddr_string(ndo, obj_tptr+8), - EXTRACT_16BITS(obj_tptr + 12))); + EXTRACT_BE_U_2(obj_tptr + 12))); obj_tlen-=16; obj_tptr+=16; break; @@ -1446,23 +1490,23 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_OBJ_FASTREROUTE: /* the differences between c-type 1 and 7 are minor */ obj_ptr.rsvp_obj_frr = (const struct rsvp_obj_frr_t *)obj_tptr; - bw.i = EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->bandwidth); switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: /* new style */ if (obj_tlen < sizeof(struct rsvp_obj_frr_t)) return-1; + bw.i = EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth); ND_PRINT((ndo, "%s Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps", - ident, - (int)obj_ptr.rsvp_obj_frr->setup_prio, - (int)obj_ptr.rsvp_obj_frr->hold_prio, - (int)obj_ptr.rsvp_obj_frr->hop_limit, - bw.f * 8 / 1000000)); + indent, + obj_ptr.rsvp_obj_frr->setup_prio, + obj_ptr.rsvp_obj_frr->hold_prio, + obj_ptr.rsvp_obj_frr->hop_limit, + bw.f * 8 / 1000000)); ND_PRINT((ndo, "%s Include-any: 0x%08x, Exclude-any: 0x%08x, Include-all: 0x%08x", - ident, - EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->include_any), - EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->exclude_any), - EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->include_all))); + indent, + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->include_any), + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any), + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->include_all))); obj_tlen-=sizeof(struct rsvp_obj_frr_t); obj_tptr+=sizeof(struct rsvp_obj_frr_t); break; @@ -1470,16 +1514,17 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_TUNNEL_IPV4: /* old style */ if (obj_tlen < 16) return-1; + bw.i = EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth); ND_PRINT((ndo, "%s Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps", - ident, - (int)obj_ptr.rsvp_obj_frr->setup_prio, - (int)obj_ptr.rsvp_obj_frr->hold_prio, - (int)obj_ptr.rsvp_obj_frr->hop_limit, - bw.f * 8 / 1000000)); + indent, + obj_ptr.rsvp_obj_frr->setup_prio, + obj_ptr.rsvp_obj_frr->hold_prio, + obj_ptr.rsvp_obj_frr->hop_limit, + bw.f * 8 / 1000000)); ND_PRINT((ndo, "%s Include Colors: 0x%08x, Exclude Colors: 0x%08x", - ident, - EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->include_any), - EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->exclude_any))); + indent, + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->include_any), + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any))); obj_tlen-=16; obj_tptr+=16; break; @@ -1494,7 +1539,7 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_TUNNEL_IPV4: while(obj_tlen >= 8) { ND_PRINT((ndo, "%s PLR-ID: %s, Avoid-Node-ID: %s", - ident, + indent, ipaddr_string(ndo, obj_tptr), ipaddr_string(ndo, obj_tptr + 4))); obj_tlen-=8; @@ -1511,8 +1556,8 @@ rsvp_obj_print(netdissect_options *ndo, switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: ND_PRINT((ndo, "%s CT: %u", - ident, - EXTRACT_32BITS(obj_tptr) & 0x7)); + indent, + EXTRACT_BE_U_4(obj_tptr) & 0x7)); obj_tlen-=4; obj_tptr+=4; break; @@ -1527,13 +1572,13 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_IPV4: if (obj_tlen < 8) return-1; - error_code=*(obj_tptr+5); - error_value=EXTRACT_16BITS(obj_tptr+6); + error_code=EXTRACT_U_1(obj_tptr + 5); + error_value=EXTRACT_BE_U_2(obj_tptr + 6); ND_PRINT((ndo, "%s Error Node Address: %s, Flags: [0x%02x]%s Error Code: %s (%u)", - ident, + indent, ipaddr_string(ndo, obj_tptr), - *(obj_tptr+4), - ident, + EXTRACT_U_1(obj_tptr + 4), + indent, tok2str(rsvp_obj_error_code_values,"unknown",error_code), error_code)); switch (error_code) { @@ -1559,13 +1604,13 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_IPV6: if (obj_tlen < 20) return-1; - error_code=*(obj_tptr+17); - error_value=EXTRACT_16BITS(obj_tptr+18); + error_code=EXTRACT_U_1(obj_tptr + 17); + error_value=EXTRACT_BE_U_2(obj_tptr + 18); ND_PRINT((ndo, "%s Error Node Address: %s, Flags: [0x%02x]%s Error Code: %s (%u)", - ident, + indent, ip6addr_string(ndo, obj_tptr), - *(obj_tptr+16), - ident, + EXTRACT_U_1(obj_tptr + 16), + indent, tok2str(rsvp_obj_error_code_values,"unknown",error_code), error_code)); @@ -1591,27 +1636,28 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_1: if (obj_tlen < 4) return-1; - padbytes = EXTRACT_16BITS(obj_tptr+2); + padbytes = EXTRACT_BE_U_2(obj_tptr + 2); ND_PRINT((ndo, "%s TLV count: %u, padding bytes: %u", - ident, - EXTRACT_16BITS(obj_tptr), + indent, + EXTRACT_BE_U_2(obj_tptr), padbytes)); obj_tlen-=4; obj_tptr+=4; /* loop through as long there is anything longer than the TLV header (2) */ while(obj_tlen >= 2 + padbytes) { ND_PRINT((ndo, "%s %s TLV (0x%02x), length: %u", /* length includes header */ - ident, - tok2str(rsvp_obj_prop_tlv_values,"unknown",*obj_tptr), - *obj_tptr, - *(obj_tptr + 1))); - if (obj_tlen < *(obj_tptr+1)) + indent, + tok2str(rsvp_obj_prop_tlv_values,"unknown",EXTRACT_U_1(obj_tptr)), + EXTRACT_U_1(obj_tptr), + EXTRACT_U_1(obj_tptr + 1))); + if (obj_tlen < EXTRACT_U_1((obj_tptr + 1))) return-1; - if (*(obj_tptr+1) < 2) + if (EXTRACT_U_1(obj_tptr + 1) < 2) return -1; - print_unknown_data(ndo, obj_tptr + 2, "\n\t\t", *(obj_tptr + 1) - 2); - obj_tlen-=*(obj_tptr+1); - obj_tptr+=*(obj_tptr+1); + print_unknown_data(ndo, obj_tptr + 2, "\n\t\t", + EXTRACT_U_1(obj_tptr + 1) - 2); + obj_tlen-=EXTRACT_U_1(obj_tptr + 1); + obj_tptr+=EXTRACT_U_1(obj_tptr + 1); } break; default: @@ -1628,17 +1674,17 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 8) return-1; ND_PRINT((ndo, "%s Flags [0x%02x], epoch: %u", - ident, - *obj_tptr, - EXTRACT_24BITS(obj_tptr + 1))); + indent, + EXTRACT_U_1(obj_tptr), + EXTRACT_BE_U_3(obj_tptr + 1))); obj_tlen-=4; obj_tptr+=4; /* loop through as long there are no messages left */ while(obj_tlen >= 4) { ND_PRINT((ndo, "%s Message-ID 0x%08x (%u)", - ident, - EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr))); + indent, + EXTRACT_BE_U_4(obj_tptr), + EXTRACT_BE_U_4(obj_tptr))); obj_tlen-=4; obj_tptr+=4; } @@ -1655,20 +1701,20 @@ rsvp_obj_print(netdissect_options *ndo, return-1; obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr; ND_PRINT((ndo, "%s Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]", - ident, - EXTRACT_16BITS(obj_ptr.rsvp_obj_integrity->key_id), - EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->key_id+2), - EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->sequence), - EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->sequence+4), + indent, + EXTRACT_BE_U_2(obj_ptr.rsvp_obj_integrity->key_id), + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->key_id + 2), + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence), + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence + 4), bittok2str(rsvp_obj_integrity_flag_values, "none", obj_ptr.rsvp_obj_integrity->flags))); ND_PRINT((ndo, "%s MD5-sum 0x%08x%08x%08x%08x ", - ident, - EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest), - EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest+4), - EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest+8), - EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest + 12))); + indent, + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest), + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 4), + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 8), + EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 12))); sigcheck = signature_verify(ndo, pptr, plen, obj_ptr.rsvp_obj_integrity->digest, @@ -1689,9 +1735,9 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_1: if (obj_tlen < 4) return-1; - ND_PRINT((ndo, "%s Flags [%s]", ident, + ND_PRINT((ndo, "%s Flags [%s]", indent, bittok2str(rsvp_obj_admin_status_flag_values, "none", - EXTRACT_32BITS(obj_tptr)))); + EXTRACT_BE_U_4(obj_tptr)))); obj_tlen-=4; obj_tptr+=4; break; @@ -1705,11 +1751,11 @@ rsvp_obj_print(netdissect_options *ndo, case RSVP_CTYPE_1: if (obj_tlen < 4) return-1; - action = (EXTRACT_16BITS(obj_tptr)>>8); + action = (EXTRACT_BE_U_2(obj_tptr)>>8); - ND_PRINT((ndo, "%s Action: %s (%u), Label type: %u", ident, + ND_PRINT((ndo, "%s Action: %s (%u), Label type: %u", indent, tok2str(rsvp_obj_label_set_action_values, "Unknown", action), - action, ((EXTRACT_32BITS(obj_tptr) & 0x7F)))); + action, ((EXTRACT_BE_U_4(obj_tptr) & 0x7F)))); switch (action) { case LABEL_SET_INCLUSIVE_RANGE: @@ -1718,9 +1764,9 @@ rsvp_obj_print(netdissect_options *ndo, /* only a couple of subchannels are expected */ if (obj_tlen < 12) return -1; - ND_PRINT((ndo, "%s Start range: %u, End range: %u", ident, - EXTRACT_32BITS(obj_tptr+4), - EXTRACT_32BITS(obj_tptr + 8))); + ND_PRINT((ndo, "%s Start range: %u, End range: %u", indent, + EXTRACT_BE_U_4(obj_tptr + 4), + EXTRACT_BE_U_4(obj_tptr + 8))); obj_tlen-=12; obj_tptr+=12; break; @@ -1730,8 +1776,8 @@ rsvp_obj_print(netdissect_options *ndo, obj_tptr+=4; subchannel = 1; while(obj_tlen >= 4 ) { - ND_PRINT((ndo, "%s Subchannel #%u: %u", ident, subchannel, - EXTRACT_32BITS(obj_tptr))); + ND_PRINT((ndo, "%s Subchannel #%u: %u", indent, subchannel, + EXTRACT_BE_U_4(obj_tptr))); obj_tptr+=4; obj_tlen-=4; subchannel++; @@ -1742,6 +1788,7 @@ rsvp_obj_print(netdissect_options *ndo, default: hexdump=TRUE; } + break; case RSVP_OBJ_S2L: switch (rsvp_obj_ctype) { @@ -1749,7 +1796,7 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 4) return-1; ND_PRINT((ndo, "%s Sub-LSP destination address: %s", - ident, ipaddr_string(ndo, obj_tptr))); + indent, ipaddr_string(ndo, obj_tptr))); obj_tlen-=4; obj_tptr+=4; @@ -1758,7 +1805,7 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 16) return-1; ND_PRINT((ndo, "%s Sub-LSP destination address: %s", - ident, ip6addr_string(ndo, obj_tptr))); + indent, ip6addr_string(ndo, obj_tptr))); obj_tlen-=16; obj_tptr+=16; @@ -1766,6 +1813,7 @@ rsvp_obj_print(netdissect_options *ndo, default: hexdump=TRUE; } + break; /* * FIXME those are the defined objects that lack a decoder @@ -1801,11 +1849,11 @@ trunc: void rsvp_print(netdissect_options *ndo, - register const u_char *pptr, register u_int len) + const u_char *pptr, u_int len) { const struct rsvp_common_header *rsvp_com_header; - const u_char *tptr,*subtptr; - u_short plen, tlen, subtlen; + const u_char *tptr; + u_short plen, tlen; tptr=pptr; @@ -1832,7 +1880,7 @@ rsvp_print(netdissect_options *ndo, /* ok they seem to want to know everything - lets fully decode it */ - plen = tlen = EXTRACT_16BITS(rsvp_com_header->length); + plen = tlen = EXTRACT_BE_U_2(rsvp_com_header->length); ND_PRINT((ndo, "\n\tRSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x", RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags), @@ -1841,23 +1889,32 @@ rsvp_print(netdissect_options *ndo, bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(rsvp_com_header->version_flags)), tlen, rsvp_com_header->ttl, - EXTRACT_16BITS(rsvp_com_header->checksum))); + EXTRACT_BE_U_2(rsvp_com_header->checksum))); - if (tlen < sizeof(const struct rsvp_common_header)) { + if (tlen < sizeof(struct rsvp_common_header)) { ND_PRINT((ndo, "ERROR: common header too short %u < %lu", tlen, - (unsigned long)sizeof(const struct rsvp_common_header))); + (unsigned long)sizeof(struct rsvp_common_header))); return; } - tptr+=sizeof(const struct rsvp_common_header); - tlen-=sizeof(const struct rsvp_common_header); + tptr+=sizeof(struct rsvp_common_header); + tlen-=sizeof(struct rsvp_common_header); switch(rsvp_com_header->msg_type) { - case RSVP_MSGTYPE_AGGREGATE: + case RSVP_MSGTYPE_BUNDLE: + /* + * Process each submessage in the bundle message. + * Bundle messages may not contain bundle submessages, so we don't + * need to handle bundle submessages specially. + */ while(tlen > 0) { - subtptr=tptr; - rsvp_com_header = (const struct rsvp_common_header *)subtptr; + const u_char *subpptr=tptr, *subtptr; + u_short subplen, subtlen; + + subtptr=subpptr; + + rsvp_com_header = (const struct rsvp_common_header *)subpptr; ND_TCHECK(*rsvp_com_header); /* @@ -1868,7 +1925,8 @@ rsvp_print(netdissect_options *ndo, RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags))); return; } - subtlen=EXTRACT_16BITS(rsvp_com_header->length); + + subplen = subtlen = EXTRACT_BE_U_2(rsvp_com_header->length); ND_PRINT((ndo, "\n\t RSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x", RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags), @@ -1877,11 +1935,11 @@ rsvp_print(netdissect_options *ndo, bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(rsvp_com_header->version_flags)), subtlen, rsvp_com_header->ttl, - EXTRACT_16BITS(rsvp_com_header->checksum))); + EXTRACT_BE_U_2(rsvp_com_header->checksum))); - if (subtlen < sizeof(const struct rsvp_common_header)) { + if (subtlen < sizeof(struct rsvp_common_header)) { ND_PRINT((ndo, "ERROR: common header too short %u < %lu", subtlen, - (unsigned long)sizeof(const struct rsvp_common_header))); + (unsigned long)sizeof(struct rsvp_common_header))); return; } @@ -1891,14 +1949,17 @@ rsvp_print(netdissect_options *ndo, return; } - subtptr+=sizeof(const struct rsvp_common_header); - subtlen-=sizeof(const struct rsvp_common_header); + subtptr+=sizeof(struct rsvp_common_header); + subtlen-=sizeof(struct rsvp_common_header); - if (rsvp_obj_print(ndo, pptr, plen, subtptr, "\n\t ", subtlen, rsvp_com_header) == -1) + /* + * Print all objects in the submessage. + */ + if (rsvp_obj_print(ndo, subpptr, subplen, subtptr, "\n\t ", subtlen, rsvp_com_header) == -1) return; - tptr+=subtlen+sizeof(const struct rsvp_common_header); - tlen-=subtlen+sizeof(const struct rsvp_common_header); + tptr+=subtlen+sizeof(struct rsvp_common_header); + tlen-=subtlen+sizeof(struct rsvp_common_header); } break; @@ -1914,6 +1975,9 @@ rsvp_print(netdissect_options *ndo, case RSVP_MSGTYPE_HELLO: case RSVP_MSGTYPE_ACK: case RSVP_MSGTYPE_SREFRESH: + /* + * Print all objects in the message. + */ if (rsvp_obj_print(ndo, pptr, plen, tptr, "\n\t ", tlen, rsvp_com_header) == -1) return; break;