X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/db25418bdc671fb2699d3f1b5a0e47647726316f..a681cd86bd3c049cc31b19b0c0c48a225d25b33a:/print-rsvp.c diff --git a/print-rsvp.c b/print-rsvp.c index c2ff5f63..d6019039 100644 --- a/print-rsvp.c +++ b/print-rsvp.c @@ -14,8 +14,8 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.24 2003-10-22 11:43:04 hannes Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.29 2004-07-21 21:43:26 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -231,6 +231,9 @@ static const struct tok rsvp_ctype_values[] = { { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_IPV4, "IPv4" }, { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_IPV6, "IPv6" }, { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_TUNNEL_IPV4, "Tunnel IPv4" }, + { 256*RSVP_OBJ_MESSAGE_ID+RSVP_CTYPE_1, "1" }, + { 256*RSVP_OBJ_MESSAGE_ID_ACK+RSVP_CTYPE_1, "1" }, + { 256*RSVP_OBJ_MESSAGE_ID_LIST+RSVP_CTYPE_1, "1" }, { 256*RSVP_OBJ_STYLE+RSVP_CTYPE_1, "1" }, { 256*RSVP_OBJ_HELLO+RSVP_CTYPE_1, "Hello Request" }, { 256*RSVP_OBJ_HELLO+RSVP_CTYPE_2, "Hello Ack" }, @@ -367,7 +370,7 @@ static struct tok rsvp_obj_error_code_routing_values[] = { #define TRUE 1 -int rsvp_intserv_print(const u_char *); +static int rsvp_intserv_print(const u_char *, u_short); /* * this is a dissector for all the intserv defined @@ -375,8 +378,8 @@ int rsvp_intserv_print(const u_char *); * it is called from various rsvp objects; * returns the amount of bytes being processed */ -int -rsvp_intserv_print(const u_char *tptr) { +static int +rsvp_intserv_print(const u_char *tptr, u_short obj_tlen) { int parameter_id,parameter_length; union { @@ -384,6 +387,8 @@ rsvp_intserv_print(const u_char *tptr) { u_int32_t i; } bw; + if (obj_tlen < 4) + return 0; parameter_id = *(tptr); parameter_length = EXTRACT_16BITS(tptr+2)<<2; /* convert wordcount to bytecount */ @@ -393,6 +398,8 @@ rsvp_intserv_print(const u_char *tptr) { parameter_length, *(tptr+1)); + if (obj_tlen < parameter_length+4) + return 0; switch(parameter_id) { /* parameter_id */ case 4: @@ -403,7 +410,8 @@ rsvp_intserv_print(const u_char *tptr) { * | IS hop cnt (32-bit unsigned integer) | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - printf("\n\t\tIS hop count: %u", EXTRACT_32BITS(tptr+4)); + if (parameter_length == 4) + printf("\n\t\tIS hop count: %u", EXTRACT_32BITS(tptr+4)); break; case 6: @@ -414,8 +422,10 @@ rsvp_intserv_print(const u_char *tptr) { * | Path b/w estimate (32-bit IEEE floating point number) | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - bw.i = EXTRACT_32BITS(tptr+4); - printf("\n\t\tPath b/w estimate: %.10g Mbps", bw.f/125000); + if (parameter_length == 4) { + bw.i = EXTRACT_32BITS(tptr+4); + printf("\n\t\tPath b/w estimate: %.10g Mbps", bw.f/125000); + } break; case 8: @@ -426,11 +436,13 @@ rsvp_intserv_print(const u_char *tptr) { * | Minimum path latency (32-bit integer) | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - printf("\n\t\tMinimum path latency: "); - if (EXTRACT_32BITS(tptr+4) == 0xffffffff) - printf("don't care"); - else - printf("%u", EXTRACT_32BITS(tptr+4)); + if (parameter_length == 4) { + printf("\n\t\tMinimum path latency: "); + if (EXTRACT_32BITS(tptr+4) == 0xffffffff) + printf("don't care"); + else + printf("%u", EXTRACT_32BITS(tptr+4)); + } break; case 10: @@ -442,7 +454,8 @@ rsvp_intserv_print(const u_char *tptr) { * | Composed MTU (32-bit unsigned integer) | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - printf("\n\t\tComposed MTU: %u bytes", EXTRACT_32BITS(tptr+4)); + if (parameter_length == 4) + printf("\n\t\tComposed MTU: %u bytes", EXTRACT_32BITS(tptr+4)); break; case 127: /* @@ -461,14 +474,16 @@ rsvp_intserv_print(const u_char *tptr) { * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - bw.i = EXTRACT_32BITS(tptr+4); - printf("\n\t\tToken Bucket Rate: %.10g Mbps", bw.f/125000); - bw.i = EXTRACT_32BITS(tptr+8); - printf("\n\t\tToken Bucket Size: %.10g bytes", bw.f); - bw.i = EXTRACT_32BITS(tptr+12); - printf("\n\t\tPeak Data Rate: %.10g Mbps", bw.f/125000); - printf("\n\t\tMinimum Policed Unit: %u bytes", EXTRACT_32BITS(tptr+16)); - printf("\n\t\tMaximum Packet Size: %u bytes", EXTRACT_32BITS(tptr+20)); + if (parameter_length == 20) { + bw.i = EXTRACT_32BITS(tptr+4); + printf("\n\t\tToken Bucket Rate: %.10g Mbps", bw.f/125000); + bw.i = EXTRACT_32BITS(tptr+8); + printf("\n\t\tToken Bucket Size: %.10g bytes", bw.f); + bw.i = EXTRACT_32BITS(tptr+12); + printf("\n\t\tPeak Data Rate: %.10g Mbps", bw.f/125000); + printf("\n\t\tMinimum Policed Unit: %u bytes", EXTRACT_32BITS(tptr+16)); + printf("\n\t\tMaximum Packet Size: %u bytes", EXTRACT_32BITS(tptr+20)); + } break; case 130: @@ -482,16 +497,19 @@ rsvp_intserv_print(const u_char *tptr) { * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - bw.i = EXTRACT_32BITS(tptr+4); - printf("\n\t\tRate: %.10g Mbps", bw.f/125000); - printf("\n\t\tSlack Term: %u", EXTRACT_32BITS(tptr+8)); + if (parameter_length == 8) { + bw.i = EXTRACT_32BITS(tptr+4); + printf("\n\t\tRate: %.10g Mbps", bw.f/125000); + printf("\n\t\tSlack Term: %u", EXTRACT_32BITS(tptr+8)); + } break; case 133: case 134: case 135: case 136: - printf("\n\t\tValue: %u", EXTRACT_32BITS(tptr+4)); + if (parameter_length == 4) + printf("\n\t\tValue: %u", EXTRACT_32BITS(tptr+4)); break; default: @@ -501,54 +519,18 @@ rsvp_intserv_print(const u_char *tptr) { return (parameter_length+4); /* header length 4 bytes */ } -void -rsvp_print(register const u_char *pptr, register u_int len) { +static int +rsvp_obj_print (const u_char *tptr, const u_char *ident, u_int tlen) { - const struct rsvp_common_header *rsvp_com_header; const struct rsvp_object_header *rsvp_obj_header; - const u_char *tptr,*obj_tptr; - u_short tlen,rsvp_obj_len,rsvp_obj_ctype,obj_tlen,intserv_serv_tlen; - int hexdump,processed,padbytes,error_code,error_value; + const u_char *obj_tptr; + u_short rsvp_obj_len,rsvp_obj_ctype,obj_tlen,intserv_serv_tlen; + int hexdump,processed,padbytes,error_code,error_value,i; union { float f; u_int32_t i; } bw; - - tptr=pptr; - rsvp_com_header = (const struct rsvp_common_header *)pptr; - TCHECK(*rsvp_com_header); - - /* - * Sanity checking of the header. - */ - if (RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags) != RSVP_VERSION) { - printf("RSVP version %u packet not supported", - RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags)); - return; - } - - /* in non-verbose mode just lets print the basic Message Type*/ - if (vflag < 1) { - printf("RSVP %s Message, length: %u", - tok2str(rsvp_msg_type_values, "unknown (%u)",rsvp_com_header->msg_type), - len); - return; - } - - /* ok they seem to want to know everything - lets fully decode it */ - - tlen=EXTRACT_16BITS(rsvp_com_header->length); - - printf("RSVP\n\tv: %u, msg-type: %s, Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x", - RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags), - tok2str(rsvp_msg_type_values, "unknown, type: %u",rsvp_com_header->msg_type), - 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)); - - tptr+=sizeof(const struct rsvp_common_header); - tlen-=sizeof(const struct rsvp_common_header); + u_int8_t namelen; while(tlen>0) { /* did we capture enough for fully decoding the object header ? */ @@ -559,10 +541,14 @@ rsvp_print(register const u_char *pptr, register u_int len) { rsvp_obj_len=EXTRACT_16BITS(rsvp_obj_header->length); rsvp_obj_ctype=rsvp_obj_header->ctype; - if(rsvp_obj_len % 4 || rsvp_obj_len < 4) - return; + if(rsvp_obj_len % 4 || rsvp_obj_len < sizeof(struct rsvp_object_header)) { + printf("ERROR: object header too short %u < %lu", rsvp_obj_len, + (unsigned long)sizeof(const struct rsvp_object_header)); + return -1; + } - printf("\n\t %s Object (%u) Flags: [%s", + printf("%s%s Object (%u) Flags: [%s", + ident, tok2str(rsvp_obj_values, "Unknown", rsvp_obj_header->class_num), @@ -579,23 +565,27 @@ rsvp_print(register const u_char *pptr, register u_int len) { ((rsvp_obj_header->class_num)<<8)+rsvp_obj_ctype), rsvp_obj_ctype, rsvp_obj_len); - + obj_tptr=tptr+sizeof(struct rsvp_object_header); obj_tlen=rsvp_obj_len-sizeof(struct rsvp_object_header); /* did we capture enough for fully decoding the object ? */ if (!TTEST2(*tptr, rsvp_obj_len)) - goto trunc; + return -1; hexdump=FALSE; switch(rsvp_obj_header->class_num) { case RSVP_OBJ_SESSION: switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: - printf("\n\t IPv4 DestAddress: %s, Protocol ID: 0x%02x", + if (obj_tlen < 8) + return -1; + printf("%s IPv4 DestAddress: %s, Protocol ID: 0x%02x", + ident, ipaddr_string(obj_tptr), *(obj_tptr+4)); - printf("\n\t Flags: [0x%02x], DestPort %u", + printf("%s Flags: [0x%02x], DestPort %u", + ident, *(obj_tptr+5), EXTRACT_16BITS(obj_tptr+6)); obj_tlen-=8; @@ -603,10 +593,14 @@ rsvp_print(register const u_char *pptr, register u_int len) { break; #ifdef INET6 case RSVP_CTYPE_IPV6: - printf("\n\t IPv6 DestAddress: %s, Protocol ID: 0x%02x", + if (obj_tlen < 20) + return -1; + printf("%s IPv6 DestAddress: %s, Protocol ID: 0x%02x", + ident, ip6addr_string(obj_tptr), *(obj_tptr+16)); - printf("\n\t Flags: [0x%02x], DestPort %u", + printf("%s Flags: [0x%02x], DestPort %u", + ident, *(obj_tptr+17), EXTRACT_16BITS(obj_tptr+18)); obj_tlen-=20; @@ -614,7 +608,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { break; case RSVP_CTYPE_TUNNEL_IPV6: - printf("\n\t IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", + if (obj_tlen < 36) + return -1; + printf("%s IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", + ident, ip6addr_string(obj_tptr), EXTRACT_16BITS(obj_tptr+18), ip6addr_string(obj_tptr+20)); @@ -623,7 +620,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { break; #endif case RSVP_CTYPE_TUNNEL_IPV4: - printf("\n\t IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", + if (obj_tlen < 12) + return -1; + printf("%s IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", + ident, ipaddr_string(obj_tptr), EXTRACT_16BITS(obj_tptr+6), ipaddr_string(obj_tptr+8)); @@ -638,14 +638,20 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_CONFIRM: switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: - printf("\n\t IPv4 Receiver Address: %s", + if (obj_tlen < 4) + return -1; + printf("%s IPv4 Receiver Address: %s", + ident, ipaddr_string(obj_tptr)); obj_tlen-=4; obj_tptr+=4; break; #ifdef INET6 case RSVP_CTYPE_IPV6: - printf("\n\t IPv6 Receiver Address: %s", + if (obj_tlen < 16) + return -1; + printf("%s IPv6 Receiver Address: %s", + ident, ip6addr_string(obj_tptr)); obj_tlen-=16; obj_tptr+=16; @@ -659,14 +665,20 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_NOTIFY_REQ: switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: - printf("\n\t IPv4 Notify Node Address: %s", + if (obj_tlen < 4) + return -1; + printf("%s IPv4 Notify Node Address: %s", + ident, ipaddr_string(obj_tptr)); obj_tlen-=4; obj_tptr+=4; break; #ifdef INET6 case RSVP_CTYPE_IPV6: - printf("\n\t IPv6 Notify Node Address: %s", + if (obj_tlen < 16) + return-1; + printf("%s IPv6 Notify Node Address: %s", + ident, ip6addr_string(obj_tptr)); obj_tlen-=16; obj_tptr+=16; @@ -684,20 +696,27 @@ rsvp_print(register const u_char *pptr, register u_int len) { switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: while(obj_tlen >= 4 ) { - printf("\n\t Label: %u", EXTRACT_32BITS(obj_tptr)); + printf("%s Label: %u", ident, EXTRACT_32BITS(obj_tptr)); obj_tlen-=4; obj_tptr+=4; } break; case RSVP_CTYPE_2: - printf("\n\t Generalized Label: %u", + if (obj_tlen < 4) + return-1; + printf("%s Generalized Label: %u", + ident, EXTRACT_32BITS(obj_tptr)); obj_tlen-=4; obj_tptr+=4; break; case RSVP_CTYPE_3: - printf("\n\t Waveband ID: %u\n\t Start Label: %u, Stop Label: %u", + if (obj_tlen < 12) + return-1; + printf("%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)); obj_tlen-=12; @@ -711,7 +730,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_STYLE: switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: - printf("\n\t Reservation Style: %s, Flags: [0x%02x]", + if (obj_tlen < 4) + return-1; + printf("%s Reservation Style: %s, Flags: [0x%02x]", + ident, tok2str(rsvp_resstyle_values, "Unknown", EXTRACT_24BITS(obj_tptr+1)), @@ -727,7 +749,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_SENDER_TEMPLATE: switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: - printf("\n\t Source Address: %s, Source Port: %u", + if (obj_tlen < 8) + return-1; + printf("%s Source Address: %s, Source Port: %u", + ident, ipaddr_string(obj_tptr), EXTRACT_16BITS(obj_tptr+6)); obj_tlen-=8; @@ -735,7 +760,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { break; #ifdef INET6 case RSVP_CTYPE_IPV6: - printf("\n\t Source Address: %s, Source Port: %u", + if (obj_tlen < 20) + return-1; + printf("%s Source Address: %s, Source Port: %u", + ident, ip6addr_string(obj_tptr), EXTRACT_16BITS(obj_tptr+18)); obj_tlen-=20; @@ -743,7 +771,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { break; #endif case RSVP_CTYPE_TUNNEL_IPV4: - printf("\n\t IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x", + if (obj_tlen < 8) + return-1; + printf("%s IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x", + ident, ipaddr_string(obj_tptr), EXTRACT_16BITS(obj_tptr+6)); obj_tlen-=8; @@ -758,7 +789,8 @@ rsvp_print(register const u_char *pptr, register u_int len) { switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: while(obj_tlen >= 4 ) { - printf("\n\t L3 Protocol ID: %s", + printf("%s L3 Protocol ID: %s", + ident, tok2str(ethertype_values, "Unknown Protocol (0x%04x)", EXTRACT_16BITS(obj_tptr+2))); @@ -767,26 +799,35 @@ rsvp_print(register const u_char *pptr, register u_int len) { } break; case RSVP_CTYPE_2: - printf("\n\t L3 Protocol ID: %s", + if (obj_tlen < 12) + return-1; + printf("%s L3 Protocol ID: %s", + ident, tok2str(ethertype_values, "Unknown Protocol (0x%04x)", EXTRACT_16BITS(obj_tptr+2))); printf(",%s merge capability",((*(obj_tptr+4))&0x80) ? "no" : "" ); - printf("\n\t Minimum VPI/VCI: %u/%u", + printf("%s Minimum VPI/VCI: %u/%u", + ident, (EXTRACT_16BITS(obj_tptr+4))&0xfff, (EXTRACT_16BITS(obj_tptr+6))&0xfff); - printf("\n\t Maximum VPI/VCI: %u/%u", + printf("%s Maximum VPI/VCI: %u/%u", + ident, (EXTRACT_16BITS(obj_tptr+8))&0xfff, (EXTRACT_16BITS(obj_tptr+10))&0xfff); obj_tlen-=12; obj_tptr+=12; break; case RSVP_CTYPE_3: - printf("\n\t L3 Protocol ID: %s", + if (obj_tlen < 12) + return-1; + printf("%s L3 Protocol ID: %s", + ident, tok2str(ethertype_values, "Unknown Protocol (0x%04x)", EXTRACT_16BITS(obj_tptr+2))); - printf("\n\t Minimum/Maximum DLCI: %u/%u, %s%s bit DLCI", + printf("%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" : "", @@ -795,12 +836,16 @@ rsvp_print(register const u_char *pptr, register u_int len) { obj_tptr+=12; break; case RSVP_CTYPE_4: - printf("\n\t LSP Encoding Type: %s (%u)", + if (obj_tlen < 8) + return-1; + printf("%s LSP Encoding Type: %s (%u)", + ident, tok2str(gmpls_encoding_values, "Unknown", *obj_tptr), *obj_tptr); - printf("\n\t Switching Type: %s (%u), Payload ID: %s (0x%04x)", + printf("%s Switching Type: %s (%u), Payload ID: %s (0x%04x)", + ident, tok2str(gmpls_switch_cap_values, "Unknown", *(obj_tptr+1)), @@ -822,7 +867,8 @@ rsvp_print(register const u_char *pptr, register u_int len) { switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: while(obj_tlen >= 4 ) { - printf("\n\t Subobject Type: %s", + printf("%s Subobject Type: %s", + ident, tok2str(rsvp_obj_xro_values, "Unknown %u", RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr))); @@ -849,7 +895,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: case RSVP_CTYPE_2: - printf("\n\t Source Instance: 0x%08x, Destination Instance: 0x%08x", + if (obj_tlen < 8) + return-1; + printf("%s Source Instance: 0x%08x, Destination Instance: 0x%08x", + ident, EXTRACT_32BITS(obj_tptr), EXTRACT_32BITS(obj_tptr+4)); obj_tlen-=8; @@ -863,9 +912,14 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_RESTART_CAPABILITY: switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: - printf("\n\t Restart Time: %ums, Recovery Time: %ums", + if (obj_tlen < 8) + return-1; + printf("%s Restart Time: %ums, Recovery Time: %ums", + ident, EXTRACT_16BITS(obj_tptr), EXTRACT_16BITS(obj_tptr+4)); + obj_tlen-=8; + obj_tptr+=8; break; default: hexdump=TRUE; @@ -875,8 +929,16 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_SESSION_ATTRIBUTE: switch(rsvp_obj_ctype) { case RSVP_CTYPE_TUNNEL_IPV4: - printf("\n\t Session Name: %s",(obj_tptr+4)); - printf("\n\t Setup Priority: %u, Holding Priority: %u, Flags: [%s]", + if (obj_tlen < 4) + return-1; + namelen = *(obj_tptr+3); + if (obj_tlen < 4+namelen) + return-1; + printf("%s Session Name: ", ident); + for (i = 0; i < namelen; i++) + safeputchar(*(obj_tptr+4+i)); + printf("%s Setup Priority: %u, Holding Priority: %u, Flags: [%s]", + ident, (int)*obj_tptr, (int)*(obj_tptr+1), tok2str(rsvp_session_attribute_flag_values, @@ -895,7 +957,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { switch(rsvp_obj_ctype) { case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */ case RSVP_CTYPE_IPV4: - printf("\n\t Previous/Next Interface: %s, Logical Interface Handle: 0x%08x", + if (obj_tlen < 8) + return-1; + printf("%s Previous/Next Interface: %s, Logical Interface Handle: 0x%08x", + ident, ipaddr_string(obj_tptr), EXTRACT_32BITS(obj_tptr+4)); obj_tlen-=8; @@ -905,7 +970,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { #ifdef INET6 case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */ case RSVP_CTYPE_IPV6: - printf("\n\t Previous/Next Interface: %s, Logical Interface Handle: 0x%08x", + if (obj_tlen < 20) + return-1; + printf("%s Previous/Next Interface: %s, Logical Interface Handle: 0x%08x", + ident, ip6addr_string(obj_tptr), EXTRACT_32BITS(obj_tptr+16)); obj_tlen-=20; @@ -921,7 +989,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_TIME_VALUES: switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: - printf("\n\t Refresh Period: %ums", + if (obj_tlen < 4) + return-1; + printf("%s Refresh Period: %ums", + ident, EXTRACT_32BITS(obj_tptr)); obj_tlen-=4; obj_tptr+=4; @@ -937,7 +1008,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_FLOWSPEC: switch(rsvp_obj_ctype) { case RSVP_CTYPE_2: - printf("\n\t Msg-Version: %u, length: %u", + if (obj_tlen < 4) + return-1; + printf("%s Msg-Version: %u, length: %u", + ident, (*obj_tptr & 0xf0) >> 4, EXTRACT_16BITS(obj_tptr+2)<<2); obj_tptr+=4; /* get to the start of the service header */ @@ -945,7 +1019,8 @@ rsvp_print(register const u_char *pptr, register u_int len) { while (obj_tlen >= 4) { intserv_serv_tlen=EXTRACT_16BITS(obj_tptr+2)<<2; - printf("\n\t Service Type: %s (%u), break bit %s set, Service length: %u", + printf("%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", @@ -955,7 +1030,7 @@ rsvp_print(register const u_char *pptr, register u_int len) { obj_tlen-=4; while (intserv_serv_tlen>=4) { - processed = rsvp_intserv_print(obj_tptr); + processed = rsvp_intserv_print(obj_tptr, obj_tlen); if (processed == 0) break; obj_tlen-=processed; @@ -972,7 +1047,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_FILTERSPEC: switch(rsvp_obj_ctype) { case RSVP_CTYPE_IPV4: - printf("\n\t Source Address: %s, Source Port: %u", + if (obj_tlen < 8) + return-1; + printf("%s Source Address: %s, Source Port: %u", + ident, ipaddr_string(obj_tptr), EXTRACT_16BITS(obj_tptr+6)); obj_tlen-=8; @@ -980,21 +1058,30 @@ rsvp_print(register const u_char *pptr, register u_int len) { break; #ifdef INET6 case RSVP_CTYPE_IPV6: - printf("\n\t Source Address: %s, Source Port: %u", + if (obj_tlen < 20) + return-1; + printf("%s Source Address: %s, Source Port: %u", + ident, ip6addr_string(obj_tptr), EXTRACT_16BITS(obj_tptr+18)); obj_tlen-=20; obj_tptr+=20; break; case RSVP_CTYPE_3: - printf("\n\t Source Address: %s, Flow Label: %u", + if (obj_tlen < 20) + return-1; + printf("%s Source Address: %s, Flow Label: %u", + ident, ip6addr_string(obj_tptr), EXTRACT_24BITS(obj_tptr+17)); obj_tlen-=20; obj_tptr+=20; break; case RSVP_CTYPE_TUNNEL_IPV6: - printf("\n\t Source Address: %s, LSP-ID: 0x%04x", + if (obj_tlen < 20) + return-1; + printf("%s Source Address: %s, LSP-ID: 0x%04x", + ident, ipaddr_string(obj_tptr), EXTRACT_16BITS(obj_tptr+18)); obj_tlen-=20; @@ -1002,7 +1089,10 @@ rsvp_print(register const u_char *pptr, register u_int len) { break; #endif case RSVP_CTYPE_TUNNEL_IPV4: - printf("\n\t Source Address: %s, LSP-ID: 0x%04x", + if (obj_tlen < 8) + return-1; + printf("%s Source Address: %s, LSP-ID: 0x%04x", + ident, ipaddr_string(obj_tptr), EXTRACT_16BITS(obj_tptr+6)); obj_tlen-=8; @@ -1016,13 +1106,17 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_FASTREROUTE: switch(rsvp_obj_ctype) { case RSVP_CTYPE_TUNNEL_IPV4: + if (obj_tlen < 16) + return-1; bw.i = EXTRACT_32BITS(obj_tptr+4); - printf("\n\t Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps", + printf("%s Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps", + ident, (int)*obj_tptr, (int)*(obj_tptr+1), (int)*(obj_tptr+2), bw.f*8/1000000); - printf("\n\t Include Colors: 0x%08x, Exclude Colors: 0x%08x", + printf("%s Include Colors: 0x%08x, Exclude Colors: 0x%08x", + ident, EXTRACT_32BITS(obj_tptr+8), EXTRACT_32BITS(obj_tptr+12)); obj_tlen-=16; @@ -1037,7 +1131,8 @@ rsvp_print(register const u_char *pptr, register u_int len) { switch(rsvp_obj_ctype) { case RSVP_CTYPE_TUNNEL_IPV4: while(obj_tlen >= 8) { - printf("\n\t PLR-ID: %s, Avoid-Node-ID: %s", + printf("%s PLR-ID: %s, Avoid-Node-ID: %s", + ident, ipaddr_string(obj_tptr), ipaddr_string(obj_tptr+4)); obj_tlen-=8; @@ -1053,11 +1148,15 @@ rsvp_print(register const u_char *pptr, register u_int len) { switch(rsvp_obj_ctype) { case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */ case RSVP_CTYPE_IPV4: + if (obj_tlen < 8) + return-1; error_code=*(obj_tptr+5); error_value=EXTRACT_16BITS(obj_tptr+6); - printf("\n\t Error Node Adress: %s, Flags: [0x%02x]\n\t Error Code: %s (%u)", + printf("%s Error Node Adress: %s, Flags: [0x%02x]%s Error Code: %s (%u)", + ident, ipaddr_string(obj_tptr), *(obj_tptr+4), + ident, tok2str(rsvp_obj_error_code_values,"unknown",error_code), error_code); switch (error_code) { @@ -1070,15 +1169,21 @@ rsvp_print(register const u_char *pptr, register u_int len) { printf(", Unknown Error Value (%u)", error_value); break; } + obj_tlen-=8; + obj_tptr+=8; break; #ifdef INET6 case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */ case RSVP_CTYPE_IPV6: + if (obj_tlen < 20) + return-1; error_code=*(obj_tptr+17); error_value=EXTRACT_16BITS(obj_tptr+18); - printf("\n\t Error Node Adress: %s, Flags: [0x%02x]\n\t Error Code: %s (%u)", + printf("%s Error Node Adress: %s, Flags: [0x%02x]%s Error Code: %s (%u)", + ident, ip6addr_string(obj_tptr), *(obj_tptr+16), + ident, tok2str(rsvp_obj_error_code_values,"unknown",error_code), error_code); @@ -1091,7 +1196,8 @@ rsvp_print(register const u_char *pptr, register u_int len) { default: break; } - + obj_tlen-=20; + obj_tptr+=20; break; #endif default: @@ -1102,18 +1208,24 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_PROPERTIES: switch(rsvp_obj_ctype) { case RSVP_CTYPE_1: + if (obj_tlen < 4) + return-1; padbytes = EXTRACT_16BITS(obj_tptr+2); - printf("\n\t TLV count: %u, padding bytes: %u", + printf("%s TLV count: %u, padding bytes: %u", + ident, EXTRACT_16BITS(obj_tptr), padbytes); - obj_tlen-=4; - obj_tptr+=4; + obj_tlen-=4; + obj_tptr+=4; /* loop through as long there is anything longer than the TLV header (2) */ while(obj_tlen >= 2 + padbytes) { - printf("\n\t %s TLV (0x%02x), length: %u", /* length includes header */ + printf("%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)) + return-1; print_unknown_data(obj_tptr+2,"\n\t\t",*(obj_tptr+1)-2); obj_tlen-=*(obj_tptr+1); obj_tptr+=*(obj_tptr+1); @@ -1124,6 +1236,34 @@ rsvp_print(register const u_char *pptr, register u_int len) { } break; + case RSVP_OBJ_MESSAGE_ID: /* fall through */ + case RSVP_OBJ_MESSAGE_ID_ACK: /* fall through */ + case RSVP_OBJ_MESSAGE_ID_LIST: + switch(rsvp_obj_ctype) { + case RSVP_CTYPE_1: + if (obj_tlen < 8) + return-1; + printf("%s Flags [0x%02x], epoch: %u", + ident, + *obj_tptr, + EXTRACT_24BITS(obj_tptr+1)); + obj_tlen-=4; + obj_tptr+=4; + /* loop through as long there are no messages left */ + while(obj_tlen >= 4) { + printf("%s Message-ID 0x%08x (%u)", + ident, + EXTRACT_32BITS(obj_tptr), + EXTRACT_32BITS(obj_tptr)); + obj_tlen-=4; + obj_tptr+=4; + } + break; + default: + hexdump=TRUE; + } + break; + /* * FIXME those are the defined objects that lack a decoder * you are welcome to contribute code ;-) @@ -1132,25 +1272,146 @@ rsvp_print(register const u_char *pptr, register u_int len) { case RSVP_OBJ_INTEGRITY: case RSVP_OBJ_SCOPE: case RSVP_OBJ_POLICY_DATA: - case RSVP_OBJ_MESSAGE_ID: - case RSVP_OBJ_MESSAGE_ID_ACK: - case RSVP_OBJ_MESSAGE_ID_LIST: case RSVP_OBJ_LABEL_SET: case RSVP_OBJ_ACCEPT_LABEL_SET: case RSVP_OBJ_PROTECTION: default: if (vflag <= 1) - print_unknown_data(obj_tptr,"\n\t ",obj_tlen); + print_unknown_data(obj_tptr,"\n\t ",obj_tlen); /* FIXME identation */ break; } /* do we want to see an additionally hexdump ? */ if (vflag > 1 || hexdump==TRUE) - print_unknown_data(tptr+sizeof(sizeof(struct rsvp_object_header)),"\n\t ", + print_unknown_data(tptr+sizeof(sizeof(struct rsvp_object_header)),"\n\t ", /* FIXME identation */ rsvp_obj_len-sizeof(struct rsvp_object_header)); tptr+=rsvp_obj_len; tlen-=rsvp_obj_len; } + return 0; +trunc: + printf("\n\t\t packet exceeded snapshot"); + return -1; +} + + +void +rsvp_print(register const u_char *pptr, register u_int len) { + + const struct rsvp_common_header *rsvp_com_header; + const u_char *tptr,*subtptr; + u_short tlen,subtlen; + + tptr=pptr; + + rsvp_com_header = (const struct rsvp_common_header *)pptr; + TCHECK(*rsvp_com_header); + + /* + * Sanity checking of the header. + */ + if (RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags) != RSVP_VERSION) { + printf("ERROR: RSVP version %u packet not supported", + RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags)); + return; + } + + /* in non-verbose mode just lets print the basic Message Type*/ + if (vflag < 1) { + printf("RSVPv%u %s Message, length: %u", + RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags), + tok2str(rsvp_msg_type_values, "unknown (%u)",rsvp_com_header->msg_type), + len); + return; + } + + /* ok they seem to want to know everything - lets fully decode it */ + + tlen=EXTRACT_16BITS(rsvp_com_header->length); + + printf("\n\tRSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x", + RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags), + tok2str(rsvp_msg_type_values, "unknown, type: %u",rsvp_com_header->msg_type), + rsvp_com_header->msg_type, + 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)); + + if (tlen < sizeof(const struct rsvp_common_header)) { + printf("ERROR: common header too short %u < %lu", tlen, + (unsigned long)sizeof(const struct rsvp_common_header)); + return; + } + + tptr+=sizeof(const struct rsvp_common_header); + tlen-=sizeof(const struct rsvp_common_header); + + switch(rsvp_com_header->msg_type) { + + case RSVP_MSGTYPE_AGGREGATE: + while(tlen > 0) { + subtptr=tptr; + rsvp_com_header = (const struct rsvp_common_header *)subtptr; + TCHECK(*rsvp_com_header); + + /* + * Sanity checking of the header. + */ + if (RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags) != RSVP_VERSION) { + printf("ERROR: RSVP version %u packet not supported", + RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags)); + return; + } + subtlen=EXTRACT_16BITS(rsvp_com_header->length); + + printf("\n\t RSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x", + RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags), + tok2str(rsvp_msg_type_values, "unknown, type: %u",rsvp_com_header->msg_type), + rsvp_com_header->msg_type, + 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)); + + if (subtlen < sizeof(const struct rsvp_common_header)) { + printf("ERROR: common header too short %u < %lu", subtlen, + (unsigned long)sizeof(const struct rsvp_common_header)); + return; + } + + subtptr+=sizeof(const struct rsvp_common_header); + subtlen-=sizeof(const struct rsvp_common_header); + + if (rsvp_obj_print(subtptr,"\n\t ", subtlen) == -1) + return; + + tptr+=subtlen+sizeof(const struct rsvp_common_header); + tlen-=subtlen+sizeof(const struct rsvp_common_header); + } + + break; + + case RSVP_MSGTYPE_PATH: + case RSVP_MSGTYPE_RESV: + case RSVP_MSGTYPE_PATHERR: + case RSVP_MSGTYPE_RESVERR: + case RSVP_MSGTYPE_PATHTEAR: + case RSVP_MSGTYPE_RESVTEAR: + case RSVP_MSGTYPE_RESVCONF: + case RSVP_MSGTYPE_HELLO_OLD: + case RSVP_MSGTYPE_HELLO: + case RSVP_MSGTYPE_ACK: + case RSVP_MSGTYPE_SREFRESH: + if (rsvp_obj_print(tptr,"\n\t ", tlen) == -1) + return; + break; + + default: + print_unknown_data(tptr,"\n\t ",tlen); + break; + } + return; trunc: printf("\n\t\t packet exceeded snapshot");