X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/063402b5808cb8c842737188db3df37c2df8b660..refs/pull/482/head:/print-lmp.c diff --git a/print-lmp.c b/print-lmp.c index 10fdfff1..30edfc74 100644 --- a/print-lmp.c +++ b/print-lmp.c @@ -10,25 +10,20 @@ * 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 */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-lmp.c,v 1.4 2004-04-26 13:40:41 hannes Exp $"; -#endif - #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include - -#include -#include -#include +#include -#include "interface.h" +#include "netdissect.h" #include "extract.h" #include "addrtoname.h" #include "gmpls.h" @@ -46,18 +41,18 @@ static const char rcsid[] _U_ = */ struct lmp_common_header { - u_int8_t version_res[2]; - u_int8_t flags; - u_int8_t msg_type; - u_int8_t length[2]; - u_int8_t reserved[2]; + uint8_t version_res[2]; + uint8_t flags; + uint8_t msg_type; + uint8_t length[2]; + uint8_t reserved[2]; }; #define LMP_VERSION 1 -#define LMP_EXTRACT_VERSION(x) (((x)&0xf0)>>4) +#define LMP_EXTRACT_VERSION(x) (((x)&0xf0)>>4) static const struct tok lmp_header_flag_values[] = { - { 0x00, "Control Channel Down"}, + { 0x01, "Control Channel Down"}, { 0x02, "LMP restart"}, { 0, NULL} }; @@ -89,21 +84,63 @@ static const struct tok lmp_obj_begin_verify_flag_values[] = { }; static const struct tok lmp_obj_begin_verify_error_values[] = { - { 0x01, "\n\t\tLink Verification Procedure Not supported"}, - { 0x02, "\n\t\tUnwilling to verify"}, - { 0x04, "\n\t\tUnsupported verification transport mechanism"}, - { 0x08, "\n\t\tLink_Id configuration error"}, - { 0x10, "\n\t\tUnknown object c-type"}, + { 0x01, "Link Verification Procedure Not supported"}, + { 0x02, "Unwilling to verify"}, + { 0x04, "Unsupported verification transport mechanism"}, + { 0x08, "Link-Id configuration error"}, + { 0x10, "Unknown object c-type"}, { 0, NULL} }; static const struct tok lmp_obj_link_summary_error_values[] = { - { 0x01, "\n\t\tUnacceptable non-negotiable LINK_SUMMARY parameters"}, - { 0x02, "\n\t\tRenegotiate LINK_SUMMARY parameters"}, - { 0x04, "\n\t\tInvalid TE-LINK Object"}, - { 0x08, "\n\t\tInvalid DATA-LINK Object"}, - { 0x10, "\n\t\tUnknown TE-LINK Object c-type"}, - { 0x20, "\n\t\tUnknown DATA-LINK Object c-type"}, + { 0x01, "Unacceptable non-negotiable LINK-SUMMARY parameters"}, + { 0x02, "Renegotiate LINK-SUMMARY parameters"}, + { 0x04, "Invalid TE-LINK Object"}, + { 0x08, "Invalid DATA-LINK Object"}, + { 0x10, "Unknown TE-LINK Object c-type"}, + { 0x20, "Unknown DATA-LINK Object c-type"}, + { 0, NULL} +}; + +/* Service Config Supported Protocols Flags */ +static const struct tok lmp_obj_service_config_sp_flag_values[] = { + { 0x01, "RSVP Supported"}, + { 0x02, "LDP Supported"}, + { 0, NULL} +}; + +/* Service Config Client Port Service Attribute Transparency Flags */ +static const struct tok lmp_obj_service_config_cpsa_tp_flag_values[] = { + { 0x01, "Path/VC Overhead Transparency Supported"}, + { 0x02, "Line/MS Overhead Transparency Supported"}, + { 0x04, "Section/RS Overhead Transparency Supported"}, + { 0, NULL} +}; + +/* Service Config Client Port Service Attribute Contiguous Concatenation Types Flags */ +static const struct tok lmp_obj_service_config_cpsa_cct_flag_values[] = { + { 0x01, "Contiguous Concatenation Types Supported"}, + { 0, NULL} +}; + +/* Service Config Network Service Attributes Transparency Flags */ +static const struct tok lmp_obj_service_config_nsa_transparency_flag_values[] = { + { 0x01, "Standard SOH/RSOH Transparency Supported"}, + { 0x02, "Standard LOH/MSOH Transparency Supported"}, + { 0, NULL} +}; + +/* Service Config Network Service Attributes TCM Monitoring Flags */ +static const struct tok lmp_obj_service_config_nsa_tcm_flag_values[] = { + { 0x01, "Transparent Tandem Connection Monitoring Supported"}, + { 0, NULL} +}; + +/* Network Service Attributes Network Diversity Flags */ +static const struct tok lmp_obj_service_config_nsa_network_diversity_flag_values[] = { + { 0x01, "Node Diversity Supported"}, + { 0x02, "Link Diversity Supported"}, + { 0x04, "SRLG Diversity Supported"}, { 0, NULL} }; @@ -127,6 +164,10 @@ static const struct tok lmp_obj_link_summary_error_values[] = { #define LMP_MSGTYPE_CHANNEL_STATUS_ACK 18 #define LMP_MSGTYPE_CHANNEL_STATUS_REQ 19 #define LMP_MSGTYPE_CHANNEL_STATUS_RESP 20 +/* LMP Service Discovery message types defined by UNI 1.0 */ +#define LMP_MSGTYPE_SERVICE_CONFIG 50 +#define LMP_MSGTYPE_SERVICE_CONFIG_ACK 51 +#define LMP_MSGTYPE_SERVICE_CONFIG_NACK 52 static const struct tok lmp_msg_type_values[] = { { LMP_MSGTYPE_CONFIG, "Config"}, @@ -149,10 +190,13 @@ static const struct tok lmp_msg_type_values[] = { { LMP_MSGTYPE_CHANNEL_STATUS_ACK, "Channel Status ACK"}, { LMP_MSGTYPE_CHANNEL_STATUS_REQ, "Channel Status Request"}, { LMP_MSGTYPE_CHANNEL_STATUS_RESP, "Channel Status Response"}, + { LMP_MSGTYPE_SERVICE_CONFIG, "Service Config"}, + { LMP_MSGTYPE_SERVICE_CONFIG_ACK, "Service Config ACK"}, + { LMP_MSGTYPE_SERVICE_CONFIG_NACK, "Service Config NACK"}, { 0, NULL} }; -/* +/* * LMP object header * * 0 1 2 3 @@ -163,20 +207,20 @@ static const struct tok lmp_msg_type_values[] = { * | | * // (object contents) // * | | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ struct lmp_object_header { - u_int8_t ctype; - u_int8_t class_num; - u_int8_t length[2]; + uint8_t ctype; + uint8_t class_num; + uint8_t length[2]; }; #define LMP_OBJ_CC_ID 1 #define LMP_OBJ_NODE_ID 2 #define LMP_OBJ_LINK_ID 3 #define LMP_OBJ_INTERFACE_ID 4 -#define LMP_OBJ_MESSAGE_ID 5 +#define LMP_OBJ_MESSAGE_ID 5 #define LMP_OBJ_CONFIG 6 #define LMP_OBJ_HELLO 7 #define LMP_OBJ_VERIFY_BEGIN 8 @@ -188,6 +232,8 @@ struct lmp_object_header { #define LMP_OBJ_CHANNEL_STATUS_REQ 14 #define LMP_OBJ_ERROR_CODE 20 +#define LMP_OBJ_SERVICE_CONFIG 51 /* defined in UNI 1.0 */ + static const struct tok lmp_obj_values[] = { { LMP_OBJ_CC_ID, "Control Channel ID" }, { LMP_OBJ_NODE_ID, "Node ID" }, @@ -204,6 +250,8 @@ static const struct tok lmp_obj_values[] = { { LMP_OBJ_CHANNEL_STATUS, "Channel Status" }, { LMP_OBJ_CHANNEL_STATUS_REQ, "Channel Status Request" }, { LMP_OBJ_ERROR_CODE, "Error Code" }, + { LMP_OBJ_SERVICE_CONFIG, "Service Config" }, + { 0, NULL} }; @@ -222,13 +270,13 @@ static const struct tok lmp_data_link_subobj[] = { #define LMP_CTYPE_LOC 1 #define LMP_CTYPE_RMT 2 #define LMP_CTYPE_UNMD 3 - + #define LMP_CTYPE_IPV4_LOC 1 #define LMP_CTYPE_IPV4_RMT 2 #define LMP_CTYPE_IPV6_LOC 3 #define LMP_CTYPE_IPV6_RMT 4 -#define LMP_CTYPE_UNMD_LOC 5 -#define LMP_CTYPE_UNMD_RMT 6 +#define LMP_CTYPE_UNMD_LOC 5 +#define LMP_CTYPE_UNMD_RMT 6 #define LMP_CTYPE_1 1 #define LMP_CTYPE_2 2 @@ -239,8 +287,18 @@ static const struct tok lmp_data_link_subobj[] = { #define LMP_CTYPE_BEGIN_VERIFY_ERROR 1 #define LMP_CTYPE_LINK_SUMMARY_ERROR 2 -#define FALSE 0 -#define TRUE 1 +/* C-Types for Service Config Object */ +#define LMP_CTYPE_SERVICE_CONFIG_SP 1 +#define LMP_CTYPE_SERVICE_CONFIG_CPSA 2 +#define LMP_CTYPE_SERVICE_CONFIG_TRANSPARENCY_TCM 3 +#define LMP_CTYPE_SERVICE_CONFIG_NETWORK_DIVERSITY 4 + +/* + * Different link types allowed in the Client Port Service Attributes + * subobject defined for LMP Service Discovery in the UNI 1.0 spec + */ +#define LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SDH 5 /* UNI 1.0 Sec 9.4.2 */ +#define LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SONET 6 /* UNI 1.0 Sec 9.4.2 */ /* * the ctypes are not globally unique so for @@ -286,43 +344,49 @@ static const struct tok lmp_ctype_values[] = { { 256*LMP_OBJ_CHANNEL_STATUS_REQ+LMP_CTYPE_UNMD, "Unnumbered" }, { 256*LMP_OBJ_ERROR_CODE+LMP_CTYPE_1, "1" }, { 256*LMP_OBJ_ERROR_CODE+LMP_CTYPE_2, "2" }, + { 256*LMP_OBJ_SERVICE_CONFIG+LMP_CTYPE_SERVICE_CONFIG_SP, "1" }, + { 256*LMP_OBJ_SERVICE_CONFIG+LMP_CTYPE_SERVICE_CONFIG_CPSA, "2" }, + { 256*LMP_OBJ_SERVICE_CONFIG+LMP_CTYPE_SERVICE_CONFIG_TRANSPARENCY_TCM, "3" }, + { 256*LMP_OBJ_SERVICE_CONFIG+LMP_CTYPE_SERVICE_CONFIG_NETWORK_DIVERSITY, "4" }, { 0, NULL} }; void -lmp_print(register const u_char *pptr, register u_int len) { - +lmp_print(netdissect_options *ndo, + register const u_char *pptr, register u_int len) +{ 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; int hexdump; - int offset; + int offset,subobj_type,subobj_len,total_subobj_len; + int link_type; union { /* int to float conversion buffer */ - float f; - u_int32_t i; + float f; + uint32_t i; } bw; tptr=pptr; lmp_com_header = (const struct lmp_common_header *)pptr; - TCHECK(*lmp_com_header); + ND_TCHECK(*lmp_com_header); /* * Sanity checking of the header. */ if (LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]) != LMP_VERSION) { - printf("LMP version %u packet not supported", - LMP_EXTRACT_VERSION(lmp_com_header->version_res[0])); + ND_PRINT((ndo, "LMP version %u packet not supported", + LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]))); return; } /* in non-verbose mode just lets print the basic Message Type*/ - if (vflag < 1) { - printf("LMPv%u %s Message, length: %u", + 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); + len)); return; } @@ -330,19 +394,18 @@ lmp_print(register const u_char *pptr, register u_int len) { tlen=EXTRACT_16BITS(lmp_com_header->length); - printf("\n\tLMPv%u, msg-type: %s, Flags: [%s], length: %u", + 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)); 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 ? */ - if (!TTEST2(*tptr, sizeof(struct lmp_object_header))) - goto trunc; + ND_TCHECK2(*tptr, sizeof(struct lmp_object_header)); lmp_obj_header = (const struct lmp_object_header *)tptr; lmp_obj_len=EXTRACT_16BITS(lmp_obj_header->length); @@ -351,7 +414,7 @@ lmp_print(register const u_char *pptr, register u_int len) { if(lmp_obj_len % 4 || lmp_obj_len < 4) return; - printf("\n\t %s Object (%u), Class-Type: %s (%u) Flags: [%snegotiable], length: %u", + ND_PRINT((ndo, "\n\t %s Object (%u), Class-Type: %s (%u) Flags: [%snegotiable], length: %u", tok2str(lmp_obj_values, "Unknown", lmp_obj_header->class_num), @@ -361,14 +424,13 @@ lmp_print(register const u_char *pptr, register u_int len) { ((lmp_obj_header->class_num)<<8)+lmp_obj_ctype), lmp_obj_ctype, (lmp_obj_header->ctype)&0x80 ? "" : "non-", - lmp_obj_len); + lmp_obj_len)); 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 ? */ - if (!TTEST2(*tptr, lmp_obj_len)) - goto trunc; + ND_TCHECK2(*tptr, lmp_obj_len); hexdump=FALSE; switch(lmp_obj_header->class_num) { @@ -377,9 +439,9 @@ lmp_print(register const u_char *pptr, register u_int len) { switch(lmp_obj_ctype) { case LMP_CTYPE_LOC: case LMP_CTYPE_RMT: - printf("\n\t Control Channel ID: %u (0x%08x)", + ND_PRINT((ndo, "\n\t Control Channel ID: %u (0x%08x)", EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr)); + EXTRACT_32BITS(obj_tptr))); break; default: @@ -392,23 +454,21 @@ lmp_print(register const u_char *pptr, register u_int len) { switch(lmp_obj_ctype) { case LMP_CTYPE_IPV4_LOC: case LMP_CTYPE_IPV4_RMT: - printf("\n\t IPv4 Link ID: %s (0x%08x)", - ipaddr_string(obj_tptr), - EXTRACT_32BITS(obj_tptr)); + ND_PRINT((ndo, "\n\t IPv4 Link ID: %s (0x%08x)", + ipaddr_string(ndo, obj_tptr), + EXTRACT_32BITS(obj_tptr))); break; -#ifdef INET6 case LMP_CTYPE_IPV6_LOC: case LMP_CTYPE_IPV6_RMT: - printf("\n\t IPv6 Link ID: %s (0x%08x)", - ip6addr_string(obj_tptr), - EXTRACT_32BITS(obj_tptr)); + ND_PRINT((ndo, "\n\t IPv6 Link ID: %s (0x%08x)", + ip6addr_string(ndo, obj_tptr), + EXTRACT_32BITS(obj_tptr))); break; -#endif case LMP_CTYPE_UNMD_LOC: case LMP_CTYPE_UNMD_RMT: - printf("\n\t Link ID: %u (0x%08x)", + ND_PRINT((ndo, "\n\t Link ID: %u (0x%08x)", EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr)); + EXTRACT_32BITS(obj_tptr))); break; default: hexdump=TRUE; @@ -418,14 +478,14 @@ lmp_print(register const u_char *pptr, register u_int len) { case LMP_OBJ_MESSAGE_ID: switch(lmp_obj_ctype) { case LMP_CTYPE_1: - printf("\n\t Message ID: %u (0x%08x)", + ND_PRINT((ndo, "\n\t Message ID: %u (0x%08x)", EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr)); + EXTRACT_32BITS(obj_tptr))); break; case LMP_CTYPE_2: - printf("\n\t Message ID Ack: %u (0x%08x)", + ND_PRINT((ndo, "\n\t Message ID Ack: %u (0x%08x)", EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr)); + EXTRACT_32BITS(obj_tptr))); break; default: hexdump=TRUE; @@ -436,9 +496,9 @@ lmp_print(register const u_char *pptr, register u_int len) { switch(lmp_obj_ctype) { case LMP_CTYPE_LOC: case LMP_CTYPE_RMT: - printf("\n\t Node ID: %s (0x%08x)", - ipaddr_string(obj_tptr), - EXTRACT_32BITS(obj_tptr)); + ND_PRINT((ndo, "\n\t Node ID: %s (0x%08x)", + ipaddr_string(ndo, obj_tptr), + EXTRACT_32BITS(obj_tptr))); break; default: @@ -449,135 +509,172 @@ lmp_print(register const u_char *pptr, register u_int len) { case LMP_OBJ_CONFIG: switch(lmp_obj_ctype) { case LMP_CTYPE_HELLO_CONFIG: - printf("\n\t Hello Interval: %u\n\t Hello Dead Interval: %u", + ND_PRINT((ndo, "\n\t Hello Interval: %u\n\t Hello Dead Interval: %u", EXTRACT_16BITS(obj_tptr), - EXTRACT_16BITS(obj_tptr+2)); + EXTRACT_16BITS(obj_tptr+2))); break; default: hexdump=TRUE; } break; - + case LMP_OBJ_HELLO: switch(lmp_obj_ctype) { case LMP_CTYPE_HELLO: - printf("\n\t TxSeqNum: %u\n\t RcvSeqNum: %u", + ND_PRINT((ndo, "\n\t Tx Seq: %u, Rx Seq: %u", EXTRACT_32BITS(obj_tptr), - EXTRACT_32BITS(obj_tptr+4)); + EXTRACT_32BITS(obj_tptr+4))); break; default: hexdump=TRUE; } - break; - + break; + case LMP_OBJ_TE_LINK: - printf("\n\t Flags: [%s]", + ND_PRINT((ndo, "\n\t Flags: [%s]", bittok2str(lmp_obj_te_link_flag_values, "none", - EXTRACT_16BITS(obj_tptr)>>8)); - + EXTRACT_16BITS(obj_tptr)>>8))); + switch(lmp_obj_ctype) { case LMP_CTYPE_IPV4: - printf("\n\t Local Link-ID: %s (0x%08x) \ - \n\t Remote Link-ID: %s (0x%08x)", - ipaddr_string(obj_tptr+4), + ND_PRINT((ndo, "\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(obj_tptr+8), - EXTRACT_32BITS(obj_tptr+8)); + ipaddr_string(ndo, obj_tptr+8), + EXTRACT_32BITS(obj_tptr+8))); break; - -#ifdef INET6 + case LMP_CTYPE_IPV6: -#endif case LMP_CTYPE_UNMD: default: hexdump=TRUE; } break; - + case LMP_OBJ_DATA_LINK: - printf("\n\t Flags: [%s]", + ND_PRINT((ndo, "\n\t Flags: [%s]", bittok2str(lmp_obj_data_link_flag_values, "none", - EXTRACT_16BITS(obj_tptr)>>8)); - + EXTRACT_16BITS(obj_tptr)>>8))); + switch(lmp_obj_ctype) { case LMP_CTYPE_IPV4: case LMP_CTYPE_UNMD: - printf("\n\t Local Interface ID: %s (0x%08x) \ - \n\t Remote Interface ID: %s (0x%08x)", - ipaddr_string(obj_tptr+4), + ND_PRINT((ndo, "\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(obj_tptr+8), - EXTRACT_32BITS(obj_tptr+8)); - - /* FIXME: Missing Data link Subobjects decoder */ - + 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; + } + break; -#ifdef INET6 case LMP_CTYPE_IPV6: -#endif default: hexdump=TRUE; } - break; - + break; + case LMP_OBJ_VERIFY_BEGIN: switch(lmp_obj_ctype) { case LMP_CTYPE_1: - printf("\n\t Flags: %s", + ND_PRINT((ndo, "\n\t Flags: %s", bittok2str(lmp_obj_begin_verify_flag_values, "none", - EXTRACT_16BITS(obj_tptr))); - printf("\n\t Verify Interval: %u", - EXTRACT_16BITS(obj_tptr+2)); - printf("\n\t Data links: %u", - EXTRACT_32BITS(obj_tptr+4)); - printf("\n\t Encoding type: %s", - tok2str(gmpls_encoding_values, "Unknown", *(obj_tptr+8))); - printf("\n\t Verify Tranport Mechanism: %u (0x%x) %s", + 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)" : ""); + EXTRACT_16BITS(obj_tptr+10)&8000 ? " (Payload test messages capable)" : "")); bw.i = EXTRACT_32BITS(obj_tptr+12); - printf("\n\t Transmission Rate: %.3f Mbps",bw.f); - printf("\n\t Wavelength: %u", - EXTRACT_32BITS(obj_tptr+16)); + 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))); break; - + default: hexdump=TRUE; } - break; - + break; + case LMP_OBJ_VERIFY_BEGIN_ACK: switch(lmp_obj_ctype) { case LMP_CTYPE_1: - printf("\n\t Verify Dead Interval: %u \ - \n\t Verify Transport Response: %u", + ND_PRINT((ndo, "\n\t Verify Dead Interval: %u" + "\n\t Verify Transport Response: %u", EXTRACT_16BITS(obj_tptr), - EXTRACT_16BITS(obj_tptr+2)); + EXTRACT_16BITS(obj_tptr+2))); break; - + default: hexdump=TRUE; } - break; - + break; + case LMP_OBJ_VERIFY_ID: switch(lmp_obj_ctype) { case LMP_CTYPE_1: - printf("\n\t Verify ID: %u", - EXTRACT_32BITS(obj_tptr)); + ND_PRINT((ndo, "\n\t Verify ID: %u", + EXTRACT_32BITS(obj_tptr))); break; - + default: hexdump=TRUE; } - break; - + break; + case LMP_OBJ_CHANNEL_STATUS: switch(lmp_obj_ctype) { case LMP_CTYPE_IPV4: @@ -585,82 +682,176 @@ lmp_print(register const u_char *pptr, register u_int len) { offset = 0; /* Decode pairs: */ while (offset < (lmp_obj_len-(int)sizeof(struct lmp_object_header)) ) { - printf("\n\t Interface ID: %s (0x%08x)", - ipaddr_string(obj_tptr+offset), - EXTRACT_32BITS(obj_tptr+offset)); - - printf("\n\t\t Active: %s (%u)", (EXTRACT_32BITS(obj_tptr+offset+4)>>31) ? + 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)); - - printf("\n\t\t Direction: %s (%u)", (EXTRACT_32BITS(obj_tptr+offset+4)>>30)&0x1 ? + (EXTRACT_32BITS(obj_tptr+offset+4)>>31))); + + 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); - - printf("\n\t\t Channel Status: %s (%u)", + (EXTRACT_32BITS(obj_tptr+offset+4)>>30)&0x1)); + + ND_PRINT((ndo, "\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); + EXTRACT_32BITS(obj_tptr+offset+4)&0x3FFFFFF)); offset+=8; } break; -#ifdef INET6 case LMP_CTYPE_IPV6: -#endif default: hexdump=TRUE; } - break; - + break; + 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)) ) { - printf("\n\t Interface ID: %s (0x%08x)", - ipaddr_string(obj_tptr+offset), - EXTRACT_32BITS(obj_tptr+offset)); + ND_PRINT((ndo, "\n\t Interface ID: %s (0x%08x)", + ipaddr_string(ndo, obj_tptr+offset), + EXTRACT_32BITS(obj_tptr+offset))); offset+=4; } break; -#ifdef INET6 case LMP_CTYPE_IPV6: -#endif default: hexdump=TRUE; } - break; - + break; + case LMP_OBJ_ERROR_CODE: switch(lmp_obj_ctype) { case LMP_CTYPE_BEGIN_VERIFY_ERROR: - printf("\n\t Error Code: %s", + ND_PRINT((ndo, "\n\t Error Code: %s", bittok2str(lmp_obj_begin_verify_error_values, "none", - EXTRACT_32BITS(obj_tptr))); + EXTRACT_32BITS(obj_tptr)))); break; - + case LMP_CTYPE_LINK_SUMMARY_ERROR: - printf("\n\t Error Code: %s", + ND_PRINT((ndo, "\n\t Error Code: %s", bittok2str(lmp_obj_link_summary_error_values, "none", - EXTRACT_32BITS(obj_tptr))); + EXTRACT_32BITS(obj_tptr)))); break; default: hexdump=TRUE; } - break; - + break; + + case LMP_OBJ_SERVICE_CONFIG: + switch (lmp_obj_ctype) { + case LMP_CTYPE_SERVICE_CONFIG_SP: + + ND_PRINT((ndo, "\n\t Flags: %s", + bittok2str(lmp_obj_service_config_sp_flag_values, + "none", + EXTRACT_16BITS(obj_tptr)>>8))); + + ND_PRINT((ndo, "\n\t UNI Version: %u", + EXTRACT_16BITS(obj_tptr) & 0x00FF)); + + break; + + case LMP_CTYPE_SERVICE_CONFIG_CPSA: + + link_type = EXTRACT_16BITS(obj_tptr)>>8; + + ND_PRINT((ndo, "\n\t Link Type: %s (%u)", + tok2str(lmp_sd_service_config_cpsa_link_type_values, + "Unknown", link_type), + link_type)); + + if (link_type == LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SDH) { + ND_PRINT((ndo, "\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)); + } + + if (link_type == LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SONET) { + ND_PRINT((ndo, "\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)); + } + + ND_PRINT((ndo, "\n\t Transparency: %s", + bittok2str(lmp_obj_service_config_cpsa_tp_flag_values, + "none", + EXTRACT_16BITS(obj_tptr+2)>>8))); + + ND_PRINT((ndo, "\n\t Contiguous Concatenation Types: %s", + bittok2str(lmp_obj_service_config_cpsa_cct_flag_values, + "none", + EXTRACT_16BITS(obj_tptr+2)>>8 & 0x00FF))); + + ND_PRINT((ndo, "\n\t Minimum NCC: %u", + EXTRACT_16BITS(obj_tptr+4))); + + ND_PRINT((ndo, "\n\t Maximum NCC: %u", + EXTRACT_16BITS(obj_tptr+6))); + + ND_PRINT((ndo, "\n\t Minimum NVC:%u", + EXTRACT_16BITS(obj_tptr+8))); + + ND_PRINT((ndo, "\n\t Maximum NVC:%u", + EXTRACT_16BITS(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))); + + break; + + case LMP_CTYPE_SERVICE_CONFIG_TRANSPARENCY_TCM: + + ND_PRINT((ndo, "\n\t Transparency Flags: %s", + bittok2str( + lmp_obj_service_config_nsa_transparency_flag_values, + "none", + EXTRACT_32BITS(obj_tptr)))); + + ND_PRINT((ndo, "\n\t TCM Monitoring Flags: %s", + bittok2str( + lmp_obj_service_config_nsa_tcm_flag_values, + "none", + EXTRACT_16BITS(obj_tptr+6) & 0x00FF))); + + break; + + case LMP_CTYPE_SERVICE_CONFIG_NETWORK_DIVERSITY: + + ND_PRINT((ndo, "\n\t Diversity: Flags: %s", + bittok2str( + lmp_obj_service_config_nsa_network_diversity_flag_values, + "none", + EXTRACT_16BITS(obj_tptr+2) & 0x00FF))); + break; + + default: + hexdump = TRUE; + }; + + break; + default: - if (vflag <= 1) - print_unknown_data(obj_tptr,"\n\t ",obj_tlen); + if (ndo->ndo_vflag <= 1) + print_unknown_data(ndo,obj_tptr,"\n\t ",obj_tlen); break; } /* do we want to see an additionally hexdump ? */ - if (vflag > 1 || hexdump==TRUE) - print_unknown_data(tptr+sizeof(sizeof(struct lmp_object_header)),"\n\t ", + if (ndo->ndo_vflag > 1 || hexdump==TRUE) + print_unknown_data(ndo,tptr+sizeof(struct lmp_object_header),"\n\t ", lmp_obj_len-sizeof(struct lmp_object_header)); tptr+=lmp_obj_len; @@ -668,5 +859,11 @@ lmp_print(register const u_char *pptr, register u_int len) { } return; trunc: - printf("\n\t\t packet exceeded snapshot"); + ND_PRINT((ndo, "\n\t\t packet exceeded snapshot")); } +/* + * Local Variables: + * c-style: whitesmith + * c-basic-offset: 8 + * End: + */