From cce96de66db1fcc05b3687c24516c939d5145159 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 5 Apr 2018 12:26:37 -0700 Subject: [PATCH] Sort the PCCC_ES values, as required in a value_string_ext. Change-Id: If3f093ba19cce1a69c1540518e622e4098ba82b6 Reviewed-on: https://code.wireshark.org/review/26763 Reviewed-by: Guy Harris --- epan/dissectors/packet-cip.c | 6 +++--- epan/dissectors/packet-cip.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 68b4cb79ad..349c229136 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -1346,15 +1346,15 @@ static const value_string cip_pccc_es_st_vals[] = { { PCCC_ES_TYPE_MISMATCH, "Type mismatch" }, { PCCC_ES_BAD_RESPONSE, "1771 module response was not valid" }, { PCCC_ES_DUP_LABEL, "Duplicated label" }, - { PCCC_ES_RACK_FAULT, "Remote rack fault" }, - { PCCC_ES_TIMEOUT, "Timeout" }, - { PCCC_ES_UNKNOWN, "Unknown error" }, { PCCC_ES_FILE_ALREADY_OPEN, "File is open; another node owns it" }, { PCCC_ES_PROGRAM_ALREADY_OWNED, "Another node is the program owner" }, { PCCC_ES_RESERVED_1, "Reserved" }, { PCCC_ES_RESERVED_2, "Reserved" }, { PCCC_ES_PROTECTION_VIOLATION, "Data table element protection violation" }, { PCCC_ES_TMP_INTERNAL_ERROR, "Temporary internal problem" }, + { PCCC_ES_RACK_FAULT, "Remote rack fault" }, + { PCCC_ES_TIMEOUT, "Timeout" }, + { PCCC_ES_UNKNOWN, "Unknown error" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-cip.h b/epan/dissectors/packet-cip.h index 3860f60247..5b5f8bf12b 100644 --- a/epan/dissectors/packet-cip.h +++ b/epan/dissectors/packet-cip.h @@ -181,15 +181,15 @@ #define PCCC_ES_TYPE_MISMATCH 0x17 #define PCCC_ES_BAD_RESPONSE 0x18 #define PCCC_ES_DUP_LABEL 0x19 -#define PCCC_ES_RACK_FAULT 0x22 -#define PCCC_ES_TIMEOUT 0x23 -#define PCCC_ES_UNKNOWN 0x24 #define PCCC_ES_FILE_ALREADY_OPEN 0x1A #define PCCC_ES_PROGRAM_ALREADY_OWNED 0x1B #define PCCC_ES_RESERVED_1 0x1C #define PCCC_ES_RESERVED_2 0x1D #define PCCC_ES_PROTECTION_VIOLATION 0x1E #define PCCC_ES_TMP_INTERNAL_ERROR 0x1F +#define PCCC_ES_RACK_FAULT 0x22 +#define PCCC_ES_TIMEOUT 0x23 +#define PCCC_ES_UNKNOWN 0x24 /* PCCC Command Codes */ #define PCCC_CMD_00 0x00