diff options
Diffstat (limited to 'contrib/tcpdump/print-lmp.c')
| -rw-r--r-- | contrib/tcpdump/print-lmp.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/contrib/tcpdump/print-lmp.c b/contrib/tcpdump/print-lmp.c index 14c7cf2..84d166f 100644 --- a/contrib/tcpdump/print-lmp.c +++ b/contrib/tcpdump/print-lmp.c @@ -17,7 +17,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-lmp.c,v 1.5.2.1 2005/05/19 06:44:03 guy Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-lmp.c,v 1.5.2.4 2006/06/23 02:07:27 hannes Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -59,7 +59,7 @@ struct lmp_common_header { #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} }; @@ -307,9 +307,6 @@ static const struct tok lmp_data_link_subobj[] = { #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 */ -#define FALSE 0 -#define TRUE 1 - /* * the ctypes are not globally unique so for * translating it to strings we build a table based @@ -599,25 +596,25 @@ lmp_print(register const u_char *pptr, register u_int len) { subobj_len); switch(subobj_type) { case INT_SWITCHING_TYPE_SUBOBJ: - printf("\n\t\t Switching Type: %s (%u)", + printf("\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); - printf("\n\t\t Encoding Type: %s (%u)", + printf("\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); - printf("\n\t\t Min Reservable Bandwidth: %.3f Mbps", - bw.f); + printf("\n\t Min Reservable Bandwidth: %.3f Mbps", + bw.f*8/1000000); bw.i = EXTRACT_32BITS(obj_tptr+offset+8); - printf("\n\t\t Max Reservable Bandwidth: %.3f Mbps", - bw.f); + printf("\n\t Max Reservable Bandwidth: %.3f Mbps", + bw.f*8/1000000); break; case WAVELENGTH_SUBOBJ: - printf("\n\t\t Wavelength: %u", + printf("\n\t Wavelength: %u", EXTRACT_32BITS(obj_tptr+offset+4)); break; default: @@ -656,7 +653,7 @@ lmp_print(register const u_char *pptr, register u_int len) { EXTRACT_16BITS(obj_tptr+10), 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 Transmission Rate: %.3f Mbps",bw.f*8/1000000); printf("\n\t Wavelength: %u", EXTRACT_32BITS(obj_tptr+16)); break; |
