From: Denis Ovsienko Date: Mon, 9 Sep 2013 10:16:31 +0000 (+0400) Subject: LMP: fix some minor output issues X-Git-Tag: tcpdump-4.5.0~43 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/ee87840d97b9ba45aea557ef66e6680bc2baff88 LMP: fix some minor output issues Fix a typo and suppress trailing spaces/tabs in a few cases. --- diff --git a/print-lmp.c b/print-lmp.c index e09b89fc..c03e12ed 100644 --- a/print-lmp.c +++ b/print-lmp.c @@ -552,8 +552,8 @@ lmp_print(register const u_char *pptr, register u_int len) { 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)", + printf("\n\t Local Link-ID: %s (0x%08x)" + "\n\t Remote Link-ID: %s (0x%08x)", ipaddr_string(obj_tptr+4), EXTRACT_32BITS(obj_tptr+4), ipaddr_string(obj_tptr+8), @@ -578,8 +578,8 @@ lmp_print(register const u_char *pptr, register u_int len) { 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)", + printf("\n\t Local Interface ID: %s (0x%08x)" + "\n\t Remote Interface ID: %s (0x%08x)", ipaddr_string(obj_tptr+4), EXTRACT_32BITS(obj_tptr+4), ipaddr_string(obj_tptr+8), @@ -650,10 +650,10 @@ lmp_print(register const u_char *pptr, register u_int len) { 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", + printf("\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*8/1000000); printf("\n\t Wavelength: %u", @@ -668,8 +668,8 @@ lmp_print(register const u_char *pptr, register u_int len) { 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", + printf("\n\t Verify Dead Interval: %u" + "\n\t Verify Transport Response: %u", EXTRACT_16BITS(obj_tptr), EXTRACT_16BITS(obj_tptr+2)); break; diff --git a/tests/lmp-v.out b/tests/lmp-v.out index 571579b7..fcd3bed1 100644 --- a/tests/lmp-v.out +++ b/tests/lmp-v.out @@ -12,7 +12,7 @@ IP (tos 0x0, ttl 1, id 44530, offset 0, flags [none], proto UDP (17), length 84) Verify Interval: 20 Data links: 30 Encoding type: Lambda (photonic) - Verify Tranport Mechanism: 32768 (0x8000) + Verify Transport Mechanism: 32768 (0x8000) Transmission Rate: 0.001 Mbps Wavelength: 8 IP (tos 0x0, ttl 1, id 44531, offset 0, flags [none], proto UDP (17), length 56) @@ -77,7 +77,7 @@ IP (tos 0x0, ttl 1, id 44536, offset 0, flags [none], proto UDP (17), length 124 Error Code: Unacceptable non-negotiable LINK-SUMMARY parameters, Renegotiate LINK-SUMMARY parameters, Invalid DATA-LINK Object, Unknown TE-LINK Object c-type, Unknown DATA-LINK Object c-type Data Link Object (12), Class-Type: IPv4 (1) Flags: [non-negotiable], length: 36 Flags: [none] - Local Interface ID: 192.168.1.1 (0xc0a80101) + Local Interface ID: 192.168.1.1 (0xc0a80101) Remote Interface ID: 192.168.1.2 (0xc0a80102) Subobject, Type: Interface Switching Type (1), Length: 12 Switching Type: Lambda-Switch Capable (150) @@ -88,7 +88,7 @@ IP (tos 0x0, ttl 1, id 44536, offset 0, flags [none], proto UDP (17), length 124 Wavelength: 6 Data Link Object (12), Class-Type: IPv4 (1) Flags: [non-negotiable], length: 36 Flags: [none] - Local Interface ID: 10.1.1.1 (0x0a010101) + Local Interface ID: 10.1.1.1 (0x0a010101) Remote Interface ID: 10.1.1.2 (0x0a010102) Subobject, Type: Interface Switching Type (1), Length: 12 Switching Type: Lambda-Switch Capable (150) @@ -105,7 +105,7 @@ IP (tos 0x0, ttl 1, id 44537, offset 0, flags [none], proto UDP (17), length 68) Message ID Object (5), Class-Type: 2 (2) Flags: [non-negotiable], length: 8 Message ID Ack: 1 (0x00000001) Verify Begin ACK Object (9), Class-Type: 1 (1) Flags: [negotiable], length: 8 - Verify Dead Interval: 50 + Verify Dead Interval: 50 Verify Transport Response: 100 Verify ID Object (10), Class-Type: 1 (1) Flags: [non-negotiable], length: 8 Verify ID: 5