X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/60a835d80f4b6c12dbe2d38fe4ca2de16f3302dc..refs/heads/master:/print-lmp.c diff --git a/print-lmp.c b/print-lmp.c index 904dd712..bfb0798e 100644 --- a/print-lmp.c +++ b/print-lmp.c @@ -10,25 +10,27 @@ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * FOR A PARTICULAR PURPOSE. * - * Support for the Link Management Protocol as per rfc 4204. - * - * Original code by Hannes Gredler (hannes@juniper.net) - * Support for LMP service discovery extensions (defined by UNI 1.0) added - * by Manu Pathak (mapathak@cisco.com), May 2005 + * Original code by Hannes Gredler (hannes@gredler.at) + * Support for LMP service discovery extensions (defined by OIF UNI 1.0) + * added by Manu Pathak (mapathak@cisco.com), May 2005 */ -#define NETDISSECT_REWORKED -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +/* \summary: Link Management Protocol (LMP) printer */ + +/* specification: RFC 4204 */ +/* OIF UNI 1.0: https://web.archive.org/web/20160401194747/http://www.oiforum.com/public/documents/OIF-UNI-01.0.pdf */ + +#include -#include +#include "netdissect-stdinc.h" -#include "interface.h" +#define ND_LONGJMP_FROM_TCHECK +#include "netdissect.h" #include "extract.h" #include "addrtoname.h" #include "gmpls.h" + /* * LMP common header * @@ -42,15 +44,15 @@ */ struct lmp_common_header { - uint8_t version_res[2]; - uint8_t flags; - uint8_t msg_type; - uint8_t length[2]; - uint8_t reserved[2]; + nd_uint16_t version_res; + nd_uint8_t flags; + nd_uint8_t msg_type; + nd_uint16_t length; + nd_byte reserved[2]; }; #define LMP_VERSION 1 -#define LMP_EXTRACT_VERSION(x) (((x)&0xf0)>>4) +#define LMP_EXTRACT_VERSION(x) (((x)&0xf000)>>12) static const struct tok lmp_header_flag_values[] = { { 0x01, "Control Channel Down"}, @@ -212,9 +214,9 @@ static const struct tok lmp_msg_type_values[] = { */ struct lmp_object_header { - uint8_t ctype; - uint8_t class_num; - uint8_t length[2]; + nd_uint8_t ctype; + nd_uint8_t class_num; + nd_uint16_t length; }; #define LMP_OBJ_CC_ID 1 @@ -352,97 +354,170 @@ static const struct tok lmp_ctype_values[] = { { 0, NULL} }; +static int +lmp_print_data_link_subobjs(netdissect_options *ndo, const u_char *obj_tptr, + int total_subobj_len, int offset) +{ + int hexdump = FALSE; + int subobj_type, subobj_len; + + while (total_subobj_len > 0 && hexdump == FALSE ) { + subobj_type = GET_U_1(obj_tptr + offset); + subobj_len = GET_U_1(obj_tptr + offset + 1); + ND_PRINT("\n\t Subobject, Type: %s (%u), Length: %u", + tok2str(lmp_data_link_subobj, + "Unknown", + subobj_type), + subobj_type, + subobj_len); + if (subobj_len < 4) { + ND_PRINT(" (too short)"); + break; + } + if ((subobj_len % 4) != 0) { + ND_PRINT(" (not a multiple of 4)"); + break; + } + if (total_subobj_len < subobj_len) { + ND_PRINT(" (goes past the end of the object)"); + break; + } + switch(subobj_type) { + case INT_SWITCHING_TYPE_SUBOBJ: + ND_PRINT("\n\t Switching Type: %s (%u)", + tok2str(gmpls_switch_cap_values, + "Unknown", + GET_U_1(obj_tptr + offset + 2)), + GET_U_1(obj_tptr + offset + 2)); + ND_PRINT("\n\t Encoding Type: %s (%u)", + tok2str(gmpls_encoding_values, + "Unknown", + GET_U_1(obj_tptr + offset + 3)), + GET_U_1(obj_tptr + offset + 3)); + ND_PRINT("\n\t Min Reservable Bandwidth: %.3f Mbps", + GET_BE_F_4(obj_tptr + offset + 4)*8/1000000); + ND_PRINT("\n\t Max Reservable Bandwidth: %.3f Mbps", + GET_BE_F_4(obj_tptr + offset + 8)*8/1000000); + break; + case WAVELENGTH_SUBOBJ: + ND_PRINT("\n\t Wavelength: %u", + GET_BE_U_4(obj_tptr + offset + 4)); + break; + default: + /* Any Unknown Subobject ==> Exit loop */ + hexdump=TRUE; + break; + } + total_subobj_len-=subobj_len; + offset+=subobj_len; + } + return (hexdump); +} + void lmp_print(netdissect_options *ndo, - register const u_char *pptr, register u_int len) + const u_char *pptr, u_int length) { const struct lmp_common_header *lmp_com_header; - const struct lmp_object_header *lmp_obj_header; const u_char *tptr,*obj_tptr; - int tlen,lmp_obj_len,lmp_obj_ctype,obj_tlen; + u_int version_res, tlen, lmp_obj_len, lmp_obj_ctype, obj_tlen; int hexdump; - int offset,subobj_type,subobj_len,total_subobj_len; - int link_type; - - union { /* int to float conversion buffer */ - float f; - uint32_t i; - } bw; + u_int offset; + u_int link_type; + ndo->ndo_protocol = "lmp"; tptr=pptr; lmp_com_header = (const struct lmp_common_header *)pptr; - ND_TCHECK(*lmp_com_header); + ND_TCHECK_SIZE(lmp_com_header); + + version_res = GET_BE_U_2(lmp_com_header->version_res); /* * Sanity checking of the header. */ - if (LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]) != LMP_VERSION) { - ND_PRINT((ndo, "LMP version %u packet not supported", - LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]))); + if (LMP_EXTRACT_VERSION(version_res) != LMP_VERSION) { + ND_PRINT("LMP version %u packet not supported", + LMP_EXTRACT_VERSION(version_res)); return; } /* in non-verbose mode just lets print the basic Message Type*/ if (ndo->ndo_vflag < 1) { - ND_PRINT((ndo, "LMPv%u %s Message, length: %u", - LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]), - tok2str(lmp_msg_type_values, "unknown (%u)",lmp_com_header->msg_type), - len)); + ND_PRINT("LMPv%u %s Message, length: %u", + LMP_EXTRACT_VERSION(version_res), + tok2str(lmp_msg_type_values, "unknown (%u)",GET_U_1(lmp_com_header->msg_type)), + length); return; } /* ok they seem to want to know everything - lets fully decode it */ - tlen=EXTRACT_16BITS(lmp_com_header->length); - - ND_PRINT((ndo, "\n\tLMPv%u, msg-type: %s, Flags: [%s], length: %u", - LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]), - tok2str(lmp_msg_type_values, "unknown, type: %u",lmp_com_header->msg_type), - bittok2str(lmp_header_flag_values,"none",lmp_com_header->flags), - tlen)); + tlen=GET_BE_U_2(lmp_com_header->length); - tptr+=sizeof(const struct lmp_common_header); - tlen-=sizeof(const struct lmp_common_header); - - while(tlen>0) { - /* did we capture enough for fully decoding the object header ? */ - ND_TCHECK2(*tptr, sizeof(struct lmp_object_header)); + ND_PRINT("\n\tLMPv%u, msg-type: %s, Flags: [%s], length: %u", + LMP_EXTRACT_VERSION(version_res), + tok2str(lmp_msg_type_values, "unknown, type: %u",GET_U_1(lmp_com_header->msg_type)), + bittok2str(lmp_header_flag_values,"none",GET_U_1(lmp_com_header->flags)), + tlen); + if (tlen < sizeof(struct lmp_common_header)) { + ND_PRINT(" (too short)"); + return; + } + if (tlen > length) { + ND_PRINT(" (too long)"); + tlen = length; + } - lmp_obj_header = (const struct lmp_object_header *)tptr; - lmp_obj_len=EXTRACT_16BITS(lmp_obj_header->length); - lmp_obj_ctype=(lmp_obj_header->ctype)&0x7f; + tptr+=sizeof(struct lmp_common_header); + tlen-=sizeof(struct lmp_common_header); - if(lmp_obj_len % 4 || lmp_obj_len < 4) - return; + while(tlen != 0) { + const struct lmp_object_header *lmp_obj_header = + (const struct lmp_object_header *)tptr; + lmp_obj_len=GET_BE_U_2(lmp_obj_header->length); + lmp_obj_ctype=GET_U_1(lmp_obj_header->ctype)&0x7f; - ND_PRINT((ndo, "\n\t %s Object (%u), Class-Type: %s (%u) Flags: [%snegotiable], length: %u", + ND_PRINT("\n\t %s Object (%u), Class-Type: %s (%u) Flags: [%snegotiable], length: %u", tok2str(lmp_obj_values, "Unknown", - lmp_obj_header->class_num), - lmp_obj_header->class_num, + GET_U_1(lmp_obj_header->class_num)), + GET_U_1(lmp_obj_header->class_num), tok2str(lmp_ctype_values, "Unknown", - ((lmp_obj_header->class_num)<<8)+lmp_obj_ctype), + (GET_U_1(lmp_obj_header->class_num)<<8)+lmp_obj_ctype), lmp_obj_ctype, - (lmp_obj_header->ctype)&0x80 ? "" : "non-", - lmp_obj_len)); + GET_U_1(lmp_obj_header->ctype)&0x80 ? "" : "non-", + lmp_obj_len); + + if (lmp_obj_len < 4) { + ND_PRINT(" (too short)"); + return; + } + if ((lmp_obj_len % 4) != 0) { + ND_PRINT(" (not a multiple of 4)"); + return; + } obj_tptr=tptr+sizeof(struct lmp_object_header); obj_tlen=lmp_obj_len-sizeof(struct lmp_object_header); /* did we capture enough for fully decoding the object ? */ - ND_TCHECK2(*tptr, lmp_obj_len); + ND_TCHECK_LEN(tptr, lmp_obj_len); hexdump=FALSE; - switch(lmp_obj_header->class_num) { + switch(GET_U_1(lmp_obj_header->class_num)) { case LMP_OBJ_CC_ID: switch(lmp_obj_ctype) { case LMP_CTYPE_LOC: case LMP_CTYPE_RMT: - ND_PRINT((ndo, "\n\t Control Channel ID: %u (0x%08x)", - EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr))); + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Control Channel ID: %u (0x%08x)", + GET_BE_U_4(obj_tptr), + GET_BE_U_4(obj_tptr)); break; default: @@ -455,23 +530,33 @@ lmp_print(netdissect_options *ndo, switch(lmp_obj_ctype) { case LMP_CTYPE_IPV4_LOC: case LMP_CTYPE_IPV4_RMT: - ND_PRINT((ndo, "\n\t IPv4 Link ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr), - EXTRACT_32BITS(obj_tptr))); + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t IPv4 Link ID: %s (0x%08x)", + GET_IPADDR_STRING(obj_tptr), + GET_BE_U_4(obj_tptr)); break; -#ifdef INET6 case LMP_CTYPE_IPV6_LOC: case LMP_CTYPE_IPV6_RMT: - ND_PRINT((ndo, "\n\t IPv6 Link ID: %s (0x%08x)", - ip6addr_string(ndo, obj_tptr), - EXTRACT_32BITS(obj_tptr))); + if (obj_tlen != 16) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t IPv6 Link ID: %s (0x%08x)", + GET_IP6ADDR_STRING(obj_tptr), + GET_BE_U_4(obj_tptr)); break; -#endif case LMP_CTYPE_UNMD_LOC: case LMP_CTYPE_UNMD_RMT: - ND_PRINT((ndo, "\n\t Link ID: %u (0x%08x)", - EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr))); + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Link ID: %u (0x%08x)", + GET_BE_U_4(obj_tptr), + GET_BE_U_4(obj_tptr)); break; default: hexdump=TRUE; @@ -481,14 +566,22 @@ lmp_print(netdissect_options *ndo, case LMP_OBJ_MESSAGE_ID: switch(lmp_obj_ctype) { case LMP_CTYPE_1: - ND_PRINT((ndo, "\n\t Message ID: %u (0x%08x)", - EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr))); + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Message ID: %u (0x%08x)", + GET_BE_U_4(obj_tptr), + GET_BE_U_4(obj_tptr)); break; case LMP_CTYPE_2: - ND_PRINT((ndo, "\n\t Message ID Ack: %u (0x%08x)", - EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr))); + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Message ID Ack: %u (0x%08x)", + GET_BE_U_4(obj_tptr), + GET_BE_U_4(obj_tptr)); break; default: hexdump=TRUE; @@ -499,9 +592,13 @@ lmp_print(netdissect_options *ndo, switch(lmp_obj_ctype) { case LMP_CTYPE_LOC: case LMP_CTYPE_RMT: - ND_PRINT((ndo, "\n\t Node ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr), - EXTRACT_32BITS(obj_tptr))); + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Node ID: %s (0x%08x)", + GET_IPADDR_STRING(obj_tptr), + GET_BE_U_4(obj_tptr)); break; default: @@ -512,9 +609,13 @@ lmp_print(netdissect_options *ndo, case LMP_OBJ_CONFIG: switch(lmp_obj_ctype) { case LMP_CTYPE_HELLO_CONFIG: - ND_PRINT((ndo, "\n\t Hello Interval: %u\n\t Hello Dead Interval: %u", - EXTRACT_16BITS(obj_tptr), - EXTRACT_16BITS(obj_tptr+2))); + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Hello Interval: %u\n\t Hello Dead Interval: %u", + GET_BE_U_2(obj_tptr), + GET_BE_U_2(obj_tptr + 2)); break; default: @@ -525,9 +626,13 @@ lmp_print(netdissect_options *ndo, case LMP_OBJ_HELLO: switch(lmp_obj_ctype) { case LMP_CTYPE_HELLO: - ND_PRINT((ndo, "\n\t Tx Seq: %u, Rx Seq: %u", - EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr+4))); + if (obj_tlen != 8) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Tx Seq: %u, Rx Seq: %u", + GET_BE_U_4(obj_tptr), + GET_BE_U_4(obj_tptr + 4)); break; default: @@ -536,93 +641,128 @@ lmp_print(netdissect_options *ndo, break; case LMP_OBJ_TE_LINK: - ND_PRINT((ndo, "\n\t Flags: [%s]", - bittok2str(lmp_obj_te_link_flag_values, - "none", - EXTRACT_16BITS(obj_tptr)>>8))); - switch(lmp_obj_ctype) { case LMP_CTYPE_IPV4: - ND_PRINT((ndo, "\n\t Local Link-ID: %s (0x%08x)" + if (obj_tlen != 12) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Flags: [%s]", + bittok2str(lmp_obj_te_link_flag_values, + "none", + GET_U_1(obj_tptr))); + + ND_PRINT("\n\t Local Link-ID: %s (0x%08x)" "\n\t Remote Link-ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr+4), - EXTRACT_32BITS(obj_tptr+4), - ipaddr_string(ndo, obj_tptr+8), - EXTRACT_32BITS(obj_tptr+8))); + GET_IPADDR_STRING(obj_tptr+4), + GET_BE_U_4(obj_tptr + 4), + GET_IPADDR_STRING(obj_tptr+8), + GET_BE_U_4(obj_tptr + 8)); break; -#ifdef INET6 case LMP_CTYPE_IPV6: -#endif + if (obj_tlen != 36) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Flags: [%s]", + bittok2str(lmp_obj_te_link_flag_values, + "none", + GET_U_1(obj_tptr))); + + ND_PRINT("\n\t Local Link-ID: %s (0x%08x)" + "\n\t Remote Link-ID: %s (0x%08x)", + GET_IP6ADDR_STRING(obj_tptr+4), + GET_BE_U_4(obj_tptr + 4), + GET_IP6ADDR_STRING(obj_tptr+20), + GET_BE_U_4(obj_tptr + 20)); + break; + case LMP_CTYPE_UNMD: + if (obj_tlen != 12) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Flags: [%s]", + bittok2str(lmp_obj_te_link_flag_values, + "none", + GET_U_1(obj_tptr))); + + ND_PRINT("\n\t Local Link-ID: %u (0x%08x)" + "\n\t Remote Link-ID: %u (0x%08x)", + GET_BE_U_4(obj_tptr + 4), + GET_BE_U_4(obj_tptr + 4), + GET_BE_U_4(obj_tptr + 8), + GET_BE_U_4(obj_tptr + 8)); + break; + default: hexdump=TRUE; } break; case LMP_OBJ_DATA_LINK: - ND_PRINT((ndo, "\n\t Flags: [%s]", - bittok2str(lmp_obj_data_link_flag_values, - "none", - EXTRACT_16BITS(obj_tptr)>>8))); - switch(lmp_obj_ctype) { case LMP_CTYPE_IPV4: - case LMP_CTYPE_UNMD: - ND_PRINT((ndo, "\n\t Local Interface ID: %s (0x%08x)" + if (obj_tlen < 12) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Flags: [%s]", + bittok2str(lmp_obj_data_link_flag_values, + "none", + GET_U_1(obj_tptr))); + ND_PRINT("\n\t Local Interface ID: %s (0x%08x)" "\n\t Remote Interface ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr+4), - EXTRACT_32BITS(obj_tptr+4), - ipaddr_string(ndo, obj_tptr+8), - EXTRACT_32BITS(obj_tptr+8))); - - total_subobj_len = lmp_obj_len - 16; - offset = 12; - while (total_subobj_len > 0 && hexdump == FALSE ) { - subobj_type = EXTRACT_16BITS(obj_tptr+offset)>>8; - subobj_len = EXTRACT_16BITS(obj_tptr+offset)&0x00FF; - ND_PRINT((ndo, "\n\t Subobject, Type: %s (%u), Length: %u", - tok2str(lmp_data_link_subobj, - "Unknown", - subobj_type), - subobj_type, - subobj_len)); - switch(subobj_type) { - case INT_SWITCHING_TYPE_SUBOBJ: - ND_PRINT((ndo, "\n\t Switching Type: %s (%u)", - tok2str(gmpls_switch_cap_values, - "Unknown", - EXTRACT_16BITS(obj_tptr+offset+2)>>8), - EXTRACT_16BITS(obj_tptr+offset+2)>>8)); - ND_PRINT((ndo, "\n\t Encoding Type: %s (%u)", - tok2str(gmpls_encoding_values, - "Unknown", - EXTRACT_16BITS(obj_tptr+offset+2)&0x00FF), - EXTRACT_16BITS(obj_tptr+offset+2)&0x00FF)); - bw.i = EXTRACT_32BITS(obj_tptr+offset+4); - ND_PRINT((ndo, "\n\t Min Reservable Bandwidth: %.3f Mbps", - bw.f*8/1000000)); - bw.i = EXTRACT_32BITS(obj_tptr+offset+8); - ND_PRINT((ndo, "\n\t Max Reservable Bandwidth: %.3f Mbps", - bw.f*8/1000000)); - break; - case WAVELENGTH_SUBOBJ: - ND_PRINT((ndo, "\n\t Wavelength: %u", - EXTRACT_32BITS(obj_tptr+offset+4))); - break; - default: - /* Any Unknown Subobject ==> Exit loop */ - hexdump=TRUE; - break; - } - total_subobj_len-=subobj_len; - offset+=subobj_len; - } + GET_IPADDR_STRING(obj_tptr+4), + GET_BE_U_4(obj_tptr + 4), + GET_IPADDR_STRING(obj_tptr+8), + GET_BE_U_4(obj_tptr + 8)); + if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 12, 12)) + hexdump=TRUE; break; -#ifdef INET6 + case LMP_CTYPE_IPV6: -#endif + if (obj_tlen < 36) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Flags: [%s]", + bittok2str(lmp_obj_data_link_flag_values, + "none", + GET_U_1(obj_tptr))); + ND_PRINT("\n\t Local Interface ID: %s (0x%08x)" + "\n\t Remote Interface ID: %s (0x%08x)", + GET_IP6ADDR_STRING(obj_tptr+4), + GET_BE_U_4(obj_tptr + 4), + GET_IP6ADDR_STRING(obj_tptr+20), + GET_BE_U_4(obj_tptr + 20)); + + if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 36, 36)) + hexdump=TRUE; + break; + + case LMP_CTYPE_UNMD: + if (obj_tlen < 12) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Flags: [%s]", + bittok2str(lmp_obj_data_link_flag_values, + "none", + GET_U_1(obj_tptr))); + ND_PRINT("\n\t Local Interface ID: %u (0x%08x)" + "\n\t Remote Interface ID: %u (0x%08x)", + GET_BE_U_4(obj_tptr + 4), + GET_BE_U_4(obj_tptr + 4), + GET_BE_U_4(obj_tptr + 8), + GET_BE_U_4(obj_tptr + 8)); + + if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 12, 12)) + hexdump=TRUE; + break; + default: hexdump=TRUE; } @@ -631,24 +771,28 @@ lmp_print(netdissect_options *ndo, case LMP_OBJ_VERIFY_BEGIN: switch(lmp_obj_ctype) { case LMP_CTYPE_1: - ND_PRINT((ndo, "\n\t Flags: %s", + if (obj_tlen != 20) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Flags: %s", bittok2str(lmp_obj_begin_verify_flag_values, "none", - EXTRACT_16BITS(obj_tptr)))); - ND_PRINT((ndo, "\n\t Verify Interval: %u", - EXTRACT_16BITS(obj_tptr+2))); - ND_PRINT((ndo, "\n\t Data links: %u", - EXTRACT_32BITS(obj_tptr+4))); - ND_PRINT((ndo, "\n\t Encoding type: %s", - tok2str(gmpls_encoding_values, "Unknown", *(obj_tptr+8)))); - ND_PRINT((ndo, "\n\t Verify Transport Mechanism: %u (0x%x)%s", - EXTRACT_16BITS(obj_tptr+10), - EXTRACT_16BITS(obj_tptr+10), - EXTRACT_16BITS(obj_tptr+10)&8000 ? " (Payload test messages capable)" : "")); - bw.i = EXTRACT_32BITS(obj_tptr+12); - ND_PRINT((ndo, "\n\t Transmission Rate: %.3f Mbps",bw.f*8/1000000)); - ND_PRINT((ndo, "\n\t Wavelength: %u", - EXTRACT_32BITS(obj_tptr+16))); + GET_BE_U_2(obj_tptr))); + ND_PRINT("\n\t Verify Interval: %u", + GET_BE_U_2(obj_tptr + 2)); + ND_PRINT("\n\t Data links: %u", + GET_BE_U_4(obj_tptr + 4)); + ND_PRINT("\n\t Encoding type: %s", + tok2str(gmpls_encoding_values, "Unknown", GET_U_1((obj_tptr + 8)))); + ND_PRINT("\n\t Verify Transport Mechanism: %u (0x%x)%s", + GET_BE_U_2(obj_tptr + 10), + GET_BE_U_2(obj_tptr + 10), + GET_BE_U_2(obj_tptr + 10)&8000 ? " (Payload test messages capable)" : ""); + ND_PRINT("\n\t Transmission Rate: %.3f Mbps", + GET_BE_F_4(obj_tptr + 12)*8/1000000); + ND_PRINT("\n\t Wavelength: %u", + GET_BE_U_4(obj_tptr + 16)); break; default: @@ -659,10 +803,14 @@ lmp_print(netdissect_options *ndo, case LMP_OBJ_VERIFY_BEGIN_ACK: switch(lmp_obj_ctype) { case LMP_CTYPE_1: - ND_PRINT((ndo, "\n\t Verify Dead Interval: %u" + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Verify Dead Interval: %u" "\n\t Verify Transport Response: %u", - EXTRACT_16BITS(obj_tptr), - EXTRACT_16BITS(obj_tptr+2))); + GET_BE_U_2(obj_tptr), + GET_BE_U_2(obj_tptr + 2)); break; default: @@ -673,8 +821,12 @@ lmp_print(netdissect_options *ndo, case LMP_OBJ_VERIFY_ID: switch(lmp_obj_ctype) { case LMP_CTYPE_1: - ND_PRINT((ndo, "\n\t Verify ID: %u", - EXTRACT_32BITS(obj_tptr))); + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Verify ID: %u", + GET_BE_U_4(obj_tptr)); break; default: @@ -685,33 +837,86 @@ lmp_print(netdissect_options *ndo, case LMP_OBJ_CHANNEL_STATUS: switch(lmp_obj_ctype) { case LMP_CTYPE_IPV4: - case LMP_CTYPE_UNMD: offset = 0; /* Decode pairs: */ - while (offset < (lmp_obj_len-(int)sizeof(struct lmp_object_header)) ) { - ND_PRINT((ndo, "\n\t Interface ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr+offset), - EXTRACT_32BITS(obj_tptr+offset))); - - ND_PRINT((ndo, "\n\t\t Active: %s (%u)", (EXTRACT_32BITS(obj_tptr+offset+4)>>31) ? - "Allocated" : "Non-allocated", - (EXTRACT_32BITS(obj_tptr+offset+4)>>31))); + while (offset+8 <= obj_tlen) { + ND_PRINT("\n\t Interface ID: %s (0x%08x)", + GET_IPADDR_STRING(obj_tptr+offset), + GET_BE_U_4(obj_tptr + offset)); + + ND_PRINT("\n\t\t Active: %s (%u)", + (GET_BE_U_4(obj_tptr + offset + 4)>>31) ? + "Allocated" : "Non-allocated", + (GET_BE_U_4(obj_tptr + offset + 4)>>31)); + + ND_PRINT("\n\t\t Direction: %s (%u)", + (GET_BE_U_4(obj_tptr + offset + 4)>>30)&0x1 ? + "Transmit" : "Receive", + (GET_BE_U_4(obj_tptr + offset + 4)>>30)&0x1); + + ND_PRINT("\n\t\t Channel Status: %s (%u)", + tok2str(lmp_obj_channel_status_values, + "Unknown", + GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF), + GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF); + offset+=8; + } + break; - ND_PRINT((ndo, "\n\t\t Direction: %s (%u)", (EXTRACT_32BITS(obj_tptr+offset+4)>>30)&0x1 ? - "Transmit" : "Receive", - (EXTRACT_32BITS(obj_tptr+offset+4)>>30)&0x1)); + case LMP_CTYPE_IPV6: + offset = 0; + /* Decode pairs: */ + while (offset+20 <= obj_tlen) { + ND_PRINT("\n\t Interface ID: %s (0x%08x)", + GET_IP6ADDR_STRING(obj_tptr+offset), + GET_BE_U_4(obj_tptr + offset)); + + ND_PRINT("\n\t\t Active: %s (%u)", + (GET_BE_U_4(obj_tptr + offset + 16)>>31) ? + "Allocated" : "Non-allocated", + (GET_BE_U_4(obj_tptr + offset + 16)>>31)); + + ND_PRINT("\n\t\t Direction: %s (%u)", + (GET_BE_U_4(obj_tptr + offset + 16)>>30)&0x1 ? + "Transmit" : "Receive", + (GET_BE_U_4(obj_tptr + offset + 16)>>30)&0x1); + + ND_PRINT("\n\t\t Channel Status: %s (%u)", + tok2str(lmp_obj_channel_status_values, + "Unknown", + GET_BE_U_4(obj_tptr + offset + 16)&0x3FFFFFF), + GET_BE_U_4(obj_tptr + offset + 16)&0x3FFFFFF); + offset+=20; + } + break; - ND_PRINT((ndo, "\n\t\t Channel Status: %s (%u)", + case LMP_CTYPE_UNMD: + offset = 0; + /* Decode pairs: */ + while (offset+8 <= obj_tlen) { + ND_PRINT("\n\t Interface ID: %u (0x%08x)", + GET_BE_U_4(obj_tptr + offset), + GET_BE_U_4(obj_tptr + offset)); + + ND_PRINT("\n\t\t Active: %s (%u)", + (GET_BE_U_4(obj_tptr + offset + 4)>>31) ? + "Allocated" : "Non-allocated", + (GET_BE_U_4(obj_tptr + offset + 4)>>31)); + + ND_PRINT("\n\t\t Direction: %s (%u)", + (GET_BE_U_4(obj_tptr + offset + 4)>>30)&0x1 ? + "Transmit" : "Receive", + (GET_BE_U_4(obj_tptr + offset + 4)>>30)&0x1); + + ND_PRINT("\n\t\t Channel Status: %s (%u)", tok2str(lmp_obj_channel_status_values, - "Unknown", - EXTRACT_32BITS(obj_tptr+offset+4)&0x3FFFFFF), - EXTRACT_32BITS(obj_tptr+offset+4)&0x3FFFFFF)); + "Unknown", + GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF), + GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF); offset+=8; } break; -#ifdef INET6 - case LMP_CTYPE_IPV6: -#endif + default: hexdump=TRUE; } @@ -720,18 +925,35 @@ lmp_print(netdissect_options *ndo, case LMP_OBJ_CHANNEL_STATUS_REQ: switch(lmp_obj_ctype) { case LMP_CTYPE_IPV4: - case LMP_CTYPE_UNMD: offset = 0; - while (offset < (lmp_obj_len-(int)sizeof(struct lmp_object_header)) ) { - ND_PRINT((ndo, "\n\t Interface ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr+offset), - EXTRACT_32BITS(obj_tptr+offset))); + while (offset+4 <= obj_tlen) { + ND_PRINT("\n\t Interface ID: %s (0x%08x)", + GET_IPADDR_STRING(obj_tptr+offset), + GET_BE_U_4(obj_tptr + offset)); offset+=4; } break; -#ifdef INET6 + case LMP_CTYPE_IPV6: -#endif + offset = 0; + while (offset+16 <= obj_tlen) { + ND_PRINT("\n\t Interface ID: %s (0x%08x)", + GET_IP6ADDR_STRING(obj_tptr+offset), + GET_BE_U_4(obj_tptr + offset)); + offset+=16; + } + break; + + case LMP_CTYPE_UNMD: + offset = 0; + while (offset+4 <= obj_tlen) { + ND_PRINT("\n\t Interface ID: %u (0x%08x)", + GET_BE_U_4(obj_tptr + offset), + GET_BE_U_4(obj_tptr + offset)); + offset+=4; + } + break; + default: hexdump=TRUE; } @@ -740,17 +962,25 @@ lmp_print(netdissect_options *ndo, case LMP_OBJ_ERROR_CODE: switch(lmp_obj_ctype) { case LMP_CTYPE_BEGIN_VERIFY_ERROR: - ND_PRINT((ndo, "\n\t Error Code: %s", + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Error Code: %s", bittok2str(lmp_obj_begin_verify_error_values, "none", - EXTRACT_32BITS(obj_tptr)))); + GET_BE_U_4(obj_tptr))); break; case LMP_CTYPE_LINK_SUMMARY_ERROR: - ND_PRINT((ndo, "\n\t Error Code: %s", + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Error Code: %s", bittok2str(lmp_obj_link_summary_error_values, "none", - EXTRACT_32BITS(obj_tptr)))); + GET_BE_U_4(obj_tptr))); break; default: hexdump=TRUE; @@ -760,98 +990,115 @@ lmp_print(netdissect_options *ndo, case LMP_OBJ_SERVICE_CONFIG: switch (lmp_obj_ctype) { case LMP_CTYPE_SERVICE_CONFIG_SP: - - ND_PRINT((ndo, "\n\t Flags: %s", + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } + ND_PRINT("\n\t Flags: %s", bittok2str(lmp_obj_service_config_sp_flag_values, "none", - EXTRACT_16BITS(obj_tptr)>>8))); + GET_U_1(obj_tptr))); - ND_PRINT((ndo, "\n\t UNI Version: %u", - EXTRACT_16BITS(obj_tptr) & 0x00FF)); + ND_PRINT("\n\t UNI Version: %u", + GET_U_1(obj_tptr + 1)); break; case LMP_CTYPE_SERVICE_CONFIG_CPSA: + if (obj_tlen != 16) { + ND_PRINT(" (not correct for object)"); + break; + } - link_type = EXTRACT_16BITS(obj_tptr)>>8; + link_type = GET_U_1(obj_tptr); - ND_PRINT((ndo, "\n\t Link Type: %s (%u)", + ND_PRINT("\n\t Link Type: %s (%u)", tok2str(lmp_sd_service_config_cpsa_link_type_values, "Unknown", link_type), - link_type)); + link_type); - if (link_type == LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SDH) { - ND_PRINT((ndo, "\n\t Signal Type: %s (%u)", + switch (link_type) { + case LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SDH: + ND_PRINT("\n\t Signal Type: %s (%u)", tok2str(lmp_sd_service_config_cpsa_signal_type_sdh_values, "Unknown", - EXTRACT_16BITS(obj_tptr) & 0x00FF), - EXTRACT_16BITS(obj_tptr) & 0x00FF)); - } + GET_U_1(obj_tptr + 1)), + GET_U_1(obj_tptr + 1)); + break; - if (link_type == LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SONET) { - ND_PRINT((ndo, "\n\t Signal Type: %s (%u)", + case LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SONET: + ND_PRINT("\n\t Signal Type: %s (%u)", tok2str(lmp_sd_service_config_cpsa_signal_type_sonet_values, "Unknown", - EXTRACT_16BITS(obj_tptr) & 0x00FF), - EXTRACT_16BITS(obj_tptr) & 0x00FF)); + GET_U_1(obj_tptr + 1)), + GET_U_1(obj_tptr + 1)); + break; } - ND_PRINT((ndo, "\n\t Transparency: %s", + ND_PRINT("\n\t Transparency: %s", bittok2str(lmp_obj_service_config_cpsa_tp_flag_values, "none", - EXTRACT_16BITS(obj_tptr+2)>>8))); + GET_U_1(obj_tptr + 2))); - ND_PRINT((ndo, "\n\t Contiguous Concatenation Types: %s", + ND_PRINT("\n\t Contiguous Concatenation Types: %s", bittok2str(lmp_obj_service_config_cpsa_cct_flag_values, "none", - EXTRACT_16BITS(obj_tptr+2)>>8 & 0x00FF))); + GET_U_1(obj_tptr + 3))); - ND_PRINT((ndo, "\n\t Minimum NCC: %u", - EXTRACT_16BITS(obj_tptr+4))); + ND_PRINT("\n\t Minimum NCC: %u", + GET_BE_U_2(obj_tptr + 4)); - ND_PRINT((ndo, "\n\t Maximum NCC: %u", - EXTRACT_16BITS(obj_tptr+6))); + ND_PRINT("\n\t Maximum NCC: %u", + GET_BE_U_2(obj_tptr + 6)); - ND_PRINT((ndo, "\n\t Minimum NVC:%u", - EXTRACT_16BITS(obj_tptr+8))); + ND_PRINT("\n\t Minimum NVC:%u", + GET_BE_U_2(obj_tptr + 8)); - ND_PRINT((ndo, "\n\t Maximum NVC:%u", - EXTRACT_16BITS(obj_tptr+10))); + ND_PRINT("\n\t Maximum NVC:%u", + GET_BE_U_2(obj_tptr + 10)); - ND_PRINT((ndo, "\n\t Local Interface ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr+12), - EXTRACT_32BITS(obj_tptr+12))); + ND_PRINT("\n\t Local Interface ID: %s (0x%08x)", + GET_IPADDR_STRING(obj_tptr+12), + GET_BE_U_4(obj_tptr + 12)); break; case LMP_CTYPE_SERVICE_CONFIG_TRANSPARENCY_TCM: + if (obj_tlen != 8) { + ND_PRINT(" (not correct for object)"); + break; + } - ND_PRINT((ndo, "\n\t Transparency Flags: %s", + ND_PRINT("\n\t Transparency Flags: %s", bittok2str( lmp_obj_service_config_nsa_transparency_flag_values, "none", - EXTRACT_32BITS(obj_tptr)))); + GET_BE_U_4(obj_tptr))); - ND_PRINT((ndo, "\n\t TCM Monitoring Flags: %s", + ND_PRINT("\n\t TCM Monitoring Flags: %s", bittok2str( lmp_obj_service_config_nsa_tcm_flag_values, "none", - EXTRACT_16BITS(obj_tptr+6) & 0x00FF))); + GET_U_1(obj_tptr + 7))); break; case LMP_CTYPE_SERVICE_CONFIG_NETWORK_DIVERSITY: + if (obj_tlen != 4) { + ND_PRINT(" (not correct for object)"); + break; + } - ND_PRINT((ndo, "\n\t Diversity: Flags: %s", + ND_PRINT("\n\t Diversity: Flags: %s", bittok2str( lmp_obj_service_config_nsa_network_diversity_flag_values, "none", - EXTRACT_16BITS(obj_tptr+2) & 0x00FF))); + GET_U_1(obj_tptr + 3))); break; default: hexdump = TRUE; - }; + } break; @@ -865,16 +1112,12 @@ lmp_print(netdissect_options *ndo, print_unknown_data(ndo,tptr+sizeof(struct lmp_object_header),"\n\t ", lmp_obj_len-sizeof(struct lmp_object_header)); + if (tlen < lmp_obj_len) { + ND_PRINT(" [remaining objects length %u < %u]", tlen, lmp_obj_len); + nd_print_invalid(ndo); + break; + } tptr+=lmp_obj_len; tlen-=lmp_obj_len; } - return; -trunc: - ND_PRINT((ndo, "\n\t\t packet exceeded snapshot")); } -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */