From d0aad4b7edc05d9ecf6b9c6615a47fd5c58d732c Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Fri, 29 Jan 2021 16:23:05 +0000 Subject: [PATCH] VQP: Do not print unknown error codes twice. [skip ci] (cherry picked from commit 28e725ef4104f23db2cb806ca95ad2399b0b500b) --- CHANGES | 1 + print-vqp.c | 4 ++-- tests/vqp-oobr.out | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 4bc3efa8..f7c5b2cb 100644 --- a/CHANGES +++ b/CHANGES @@ -11,6 +11,7 @@ TBD RRCP: support more Realtek protocols than just RRCP. MPLS: show the EXP field as TC, as per RFC 5462. ICMP: redo MPLS Extension code as general ICMP Extension code. + VQP: Do not print unknown error codes twice. Building and testing: Update config.guess and config.sub. Handle some Autoconf/make errors better. diff --git a/print-vqp.c b/print-vqp.c index f87898e0..a26cd0e3 100644 --- a/print-vqp.c +++ b/print-vqp.c @@ -132,7 +132,7 @@ vqp_print(netdissect_options *ndo, const u_char *pptr, u_int len) ND_PRINT("VQPv%u %s Message, error-code %s (%u), length %u", version, tok2str(vqp_msg_type_values, "unknown (%u)",GET_U_1(vqp_common_header->msg_type)), - tok2str(vqp_error_code_values, "unknown (%u)",GET_U_1(vqp_common_header->error_code)), + tok2str(vqp_error_code_values, "unknown", GET_U_1(vqp_common_header->error_code)), GET_U_1(vqp_common_header->error_code), len); return; @@ -143,7 +143,7 @@ vqp_print(netdissect_options *ndo, const u_char *pptr, u_int len) ND_PRINT("\n\tVQPv%u, %s Message, error-code %s (%u), seq 0x%08x, items %u, length %u", version, tok2str(vqp_msg_type_values, "unknown (%u)",GET_U_1(vqp_common_header->msg_type)), - tok2str(vqp_error_code_values, "unknown (%u)",GET_U_1(vqp_common_header->error_code)), + tok2str(vqp_error_code_values, "unknown", GET_U_1(vqp_common_header->error_code)), GET_U_1(vqp_common_header->error_code), GET_BE_U_4(vqp_common_header->sequence), nitems, diff --git a/tests/vqp-oobr.out b/tests/vqp-oobr.out index 01825153..358599e1 100644 --- a/tests/vqp-oobr.out +++ b/tests/vqp-oobr.out @@ -1,3 +1,3 @@ 1 [Error converting time] IP (tos 0x0, ttl 17, id 40207, offset 0, flags [+, DF, rsvd], proto UDP (17), length 46, bad cksum 8f04 (->f897)!) 0.0.128.20.1589 > 12.251.167.8.62720: - VQPv1, unknown (127) Message, error-code unknown (31) (31), seq 0x80f90000, items 27, length 18 [|vqp] + VQPv1, unknown (127) Message, error-code unknown (31), seq 0x80f90000, items 27, length 18 [|vqp] -- 2.39.5