osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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 <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-04-05 12:26:37 -07:00
parent 35c83b22c0
commit cce96de66d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-cip.c
View File

@ -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 }
};

6
epan/dissectors/packet-cip.h
View File

@ -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