diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-12-12 20:16:30 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-12-12 20:16:30 +0000 |
| commit | ebaeed5a1fdb12303cee296bc96ea4fa1e69a005 (patch) | |
| tree | 7e051de494d09687059ab9eed8bd9a2ca977a2f5 /epan | |
| parent | e14b04c20f1f3274db9fbf9470e148d6b3d6d582 (diff) | |
(Trivial)
- Fix indentation to match editor modelines (tabs-->spaces);
- Rework/add some whitespace;
svn path=/trunk/; revision=53978
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-assa_r3.c | 6548 | ||||
| -rw-r--r-- | epan/dissectors/packet-atmtcp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-cip.h | 44 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcerpc.c | 140 | ||||
| -rw-r--r-- | epan/dissectors/packet-dvb-data-mpe.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-dvb-s2-bb.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-gtpv2.c | 214 | ||||
| -rw-r--r-- | epan/dissectors/packet-hazelcast.c | 916 | ||||
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 46 | ||||
| -rw-r--r-- | epan/dissectors/packet-isup.c | 578 | ||||
| -rw-r--r-- | epan/dissectors/packet-kafka.c | 16 | ||||
| -rw-r--r-- | epan/dissectors/packet-knet.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-p_mul.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-ppp.c | 28 |
14 files changed, 4279 insertions, 4279 deletions
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 758955f6c6..b409469f24 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -6785,3285 +6785,3285 @@ void proto_register_r3 (void) /* Setup list of header fields */ static hf_register_info hf [] = - { - { &hf_r3_tildex3ds, - { "DPAC Attention", "r3.dpac_attention", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_header, - { "Header", "r3.header", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_payload, - { "Payload", "r3.payload", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_tail, - { "Tail", "r3.tail", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_sigil, - { "Sigil", "r3.sigil", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_address, - { "Address", "r3.address", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_packetnumber, - { "Packet Number", "r3.packetnumber", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_packetlength, - { "Packet Length", "r3.packetlength", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_encryption, - { "Crypt Type", "r3.encryption", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_encryptionschemenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_crc, - { "CRC", "r3.crc", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_crc_bad, - { "Bad CRC", "r3.crc_bad", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_xor, - { "XOR", "r3.xor", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_xor_bad, - { "Bad XOR", "r3.xor_bad", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_commandlength, - { "Command Length", "r3.command.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_command, - { "Command", "r3.command.command", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_cmdnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_commanddata, - { "Command Data", "r3.command.data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_commandmfglength, - { "Mfg Command Length", "r3.commandmfg.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_commandmfg, - { "Mfg Command", "r3.commandmfg.command", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_cmdmfgnames_ext, 0x0, - NULL, HFILL } - }, - #if 0 - { &hf_r3_commandmfgdata, - { "Mfg Command Data", "r3.commandmfg.data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - #endif - - { &hf_r3_responselength, - { "Response Length", "r3.response.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_responsecommand, - { "Response Command", "r3.response.command", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_cmdnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_responsetype, - { "Response Type", "r3.response.responsetype", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_responsetypenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_responsetocommand, - { "Response To Command", "r3.response.to_command", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_cmdnames_ext, 0x0, - NULL, HFILL } - }, - #if 0 - { &hf_r3_responsedata, - { "Response Data", "r3.response.data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - #endif - - { &hf_r3_upstreamcommand, - { "Upstream Command", "r3.upstreamcommand.command", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_upstreamcommandnames_ext, 0x0, - NULL, HFILL } - }, - - { &hf_r3_upstreamfield, - { "Upstream Field", "r3.upstreamfield", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldlength, - { "Field Length", "r3.upstreamfield.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldtype, - { "Field Type", "r3.upstreamfield.type", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_upstreamfieldnames_ext, 0x0, - NULL, HFILL } - }, - #if 0 - { &hf_r3_upstreamfielddatalen, - { "Data Length", "r3.upstreamfield.datalen", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - #endif - { &hf_r3_upstreamfielderror, - { "Error", "r3.upstreamfield.error", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_SERIALNUMBER], - { "Serial Number", "r3.upstreamfield.serialnumber", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_NAR], - { "Next Available Record", "r3.upstreamfield.nar", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_ENTRYDEVICE], - { "Entry Device", "r3.upstreamfield.entrydevice", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_PPMIFIELDTYPE], - { "PPMI Field Type", "r3.upstreamfield.ppmifieldtype", - FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_PIN], - { "PIN", "r3.upstreamfield.pin", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_SEQUENCENUMBER], - { "Sequence Number", "r3.upstreamfield.sequencenumber", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_RESPONSEWINDOW], - { "Response Window", "r3.upstreamfield.responsewindow", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_USERNUMBER], - { "User Number", "r3.upstreamfield.usernumber", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_VERSION], - { "Version", "r3.upstreamfield.version", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_EVENTLOGRECORD], - { "Event Log Record", "r3.upstreamfield.eventlogrecord", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_DATETIME], - { "Date/Time", "r3.upstreamfield.datetime", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_EVENTLOGRECORDCOUNT], - { "Event Log Record Count", "r3.upstreamfield.eventlogrecordcount", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_DECLINEDRECORDCOUNT], - { "Declined Log Record", "r3.upstreamfield.declinedlogrecord", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_DECLINEDRECORD], - { "Declined Log", "r3.upstreamfield.declinedlog", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_USERTYPE], - { "User Type", "r3.upstreamfield.usertype", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_usertypenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_ACCESSALWAYS], - { "Access Always", "r3.upstreamfield.accessalways", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_CACHED], - { "Cached", "r3.upstreamfield.cached", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_PRIMARYFIELDTYPE], - { "Primary Field Type", "r3.upstreamfield.primaryfieldtype", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_AUXFIELDTYPE], - { "Aux Field Type", "r3.upstreamfield.auxfieldtype", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_ACCESSMODE], - { "Access Mode", "r3.upstreamfield.accessmode", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_accessmodenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_EXPIREON], - { "Expire On", "r3.upstreamfield.expireon", - FT_UINT24, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_USECOUNT], - { "Use Count", "r3.upstreamfield.usecount", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_TIMEZONE], - { "Timezone", "r3.upstreamfield.timezone", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_EXCEPTIONGROUP], - { "Exception Group", "r3.upstreamfield.exceptiongroup", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_PRIMARYPIN], - { "Primary PIN", "r3.upstreamfield.primarypin", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_AUXPIN], - { "Aux PIN", "r3.upstreamfield.auxpin", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_ALARMRECORDCOUNT], - { "Alarm Record Count", "r3.upstreamfield.alarmrecordcount", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_ALARMRECORD], - { "Alarm Record", "r3.upstreamfield.alarmrecord", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_AUXCTLRVERSION], - { "Aux Controller Version", "r3.upstreamfield.auxctlrversion", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_configitems, - { "Configuration Item List", "r3.configitems", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_configitem, - { "Configuration Item", "r3.configitem", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_configitemnames_ext, 0x0, - NULL, HFILL } - }, - #if 0 - { &hf_r3_configfield, - { "Config Field", "r3.configfield", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - #endif - { &hf_r3_configitemlength, - { "Configuration Item Length", "r3.configitem.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_configitemtype, - { "Configuration Item Type", "r3.configitem.type", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_configtypenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_configitemdata, - { "Configuration Item Data", "r3.configitem.data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_configitemdata_bool, - { "Configuration Item Boolean", "r3.configitem.data_boolean", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_configitemdata_8, - { "Configuration Item 8-bit", "r3.configitem.data_8", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_configitemdata_16, - { "Configuration Item 16-bit", "r3.configitem.data_16", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_configitemdata_32, - { "Configuration Item 32-bit", "r3.configitem.data_32", - FT_UINT32, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_configitemdata_string, - { "Configuration Item String", "r3.configitem.data_string", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_timezonearray [ 0], - { "Timezone 0", "r3.timezone.0", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000001, - NULL, HFILL } - }, - { &hf_r3_timezonearray [ 1], - { "Timezone 1", "r3.timezone.1", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000002, - NULL, HFILL } - }, - { &hf_r3_timezonearray [ 2], - { "Timezone 2", "r3.timezone.2", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000004, - NULL, HFILL } - }, - { &hf_r3_timezonearray [ 3], - { "Timezone 3", "r3.timezone.3", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000008, - NULL, HFILL } - }, - { &hf_r3_timezonearray [ 4], - { "Timezone 4", "r3.timezone.4", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000010, - NULL, HFILL } - }, - { &hf_r3_timezonearray [ 5], - { "Timezone 5", "r3.timezone.5", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000020, - NULL, HFILL } - }, - { &hf_r3_timezonearray [ 6], - { "Timezone 6", "r3.timezone.6", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000040, - NULL, HFILL } - }, - { &hf_r3_timezonearray [ 7], - { "Timezone 7", "r3.timezone.7", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000080, - NULL, HFILL } - }, - { &hf_r3_timezonearray [ 8], - { "Timezone 8", "r3.timezone.8", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000100, - NULL, HFILL } - }, - { &hf_r3_timezonearray [ 9], - { "Timezone 9", "r3.timezone.9", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000200, - NULL, HFILL } - }, - { &hf_r3_timezonearray [10], - { "Timezone 10", "r3.timezone.10", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000400, - NULL, HFILL } - }, - { &hf_r3_timezonearray [11], - { "Timezone 11", "r3.timezone.11", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000800, - NULL, HFILL } - }, - { &hf_r3_timezonearray [12], - { "Timezone 12", "r3.timezone.12", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00001000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [13], - { "Timezone 13", "r3.timezone.13", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00002000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [14], - { "Timezone 14", "r3.timezone.14", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00004000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [15], - { "Timezone 15", "r3.timezone.15", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00008000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [16], - { "Timezone 16", "r3.timezone.16", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00010000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [17], - { "Timezone 17", "r3.timezone.17", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00020000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [18], - { "Timezone 18", "r3.timezone.18", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00040000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [19], - { "Timezone 19", "r3.timezone.19", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00080000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [20], - { "Timezone 20", "r3.timezone.20", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00100000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [21], - { "Timezone 21", "r3.timezone.21", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00200000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [22], - { "Timezone 22", "r3.timezone.22", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00400000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [23], - { "Timezone 23", "r3.timezone.23", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00800000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [24], - { "Timezone 24", "r3.timezone.24", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x01000000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [25], - { "Timezone 25", "r3.timezone.25", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x02000000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [26], - { "Timezone 26", "r3.timezone.26", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x04000000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [27], - { "Timezone 27", "r3.timezone.27", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x08000000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [28], - { "Timezone 28", "r3.timezone.28", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x10000000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [29], - { "Timezone 29", "r3.timezone.29", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x20000000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [30], - { "Timezone 30", "r3.timezone.30", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x40000000, - NULL, HFILL } - }, - { &hf_r3_timezonearray [31], - { "Timezone 31", "r3.timezone.31", - FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x80000000, - NULL, HFILL } - }, - - { &hf_r3_expireon_year, - { "Expiration Year", "r3.expireon.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_expireon_month, - { "Expiration Month", "r3.expireon.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_expireon_day, - { "Expiration Day", "r3.expireon.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_datetime_year, - { "Date/Time Year", "r3.datetime.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_datetime_month, - { "Date/Time Month", "r3.datetime.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_datetime_day, - { "Date/Time Day", "r3.datetime.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_datetime_dow, - { "Date/Time DOW", "r3.datetime.dow", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_daynames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_datetime_hours, - { "Date/Time Hours", "r3.datetime.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_datetime_minutes, - { "Date/Time Minutes", "r3.datetime.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_datetime_seconds, - { "Date/Time Seconds", "r3.datetime.seconds", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_datetime_dst, - { "Date/Time DST", "r3.datetime.dst", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_eventlog_recordnumber, - { "Record Number", "r3.eventlog.recordnumber", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlog_year, - { "Year", "r3.eventlog.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlog_month, - { "Month", "r3.eventlog.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlog_day, - { "Day", "r3.eventlog.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlog_hour, - { "Hours", "r3.eventlog.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlog_minute, - { "Minutes", "r3.eventlog.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlog_second, - { "Seconds", "r3.eventlog.seconds", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlog_usernumber, - { "User Number", "r3.eventlog.usernumber", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlog_event, - { "ID", "r3.eventlog.id", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_eventnames_ext, 0x0, - NULL, HFILL } - }, - - { &hf_r3_declinedlog_recordnumber, - { "Record Number", "r3.declinedlog.recordnumber", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_year, - { "Year", "r3.declinedlog.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_month, - { "Month", "r3.declinedlog.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_day, - { "Day", "r3.declinedlog.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_hour, - { "Hours", "r3.declinedlog.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_minute, - { "Minutes", "r3.declinedlog.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_second, - { "Seconds", "r3.declinedlog.seconds", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_usernumber, - { "User Number", "r3.declinedlog.usernumber", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_cred1type, - { "Credential 1 Type", "r3.declinedlog.cred1type", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_fieldtypenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_cred2type, - { "Credential 2 Type", "r3.declinedlog.cred2type", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_fieldtypenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_cred1, - { "Credential 1", "r3.declinedlog.cred1", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlog_cred2, - { "Credential 2", "r3.declinedlog.cred2", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_alarmlog_recordnumber, - { "Record Number", "r3.alarmlog.recordnumber", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlog_year, - { "Year", "r3.alarmlog.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlog_month, - { "Month", "r3.alarmlog.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlog_day, - { "Day", "r3.alarmlog.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlog_hour, - { "Hours", "r3.alarmlog.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlog_minute, - { "Minutes", "r3.alarmlog.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlog_second, - { "Seconds", "r3.alarmlog.seconds", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlog_id, - { "ID", "r3.alarmlog.id", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_alarmidnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlog_usernumber, - { "User Number", "r3.alarmlog.usernumber", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_debugmsg, - { "Debug Message", "r3.debug", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_setdate_year, - { "Year", "r3.setdate.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_setdate_month, - { "Month", "r3.setdate.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_setdate_day, - { "Day", "r3.setdate.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_setdate_dow, - { "Day-Of-Week", "r3.setdate.dow", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_daynames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_setdate_hours, - { "Hours", "r3.setdate.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_setdate_minutes, - { "Minutes", "r3.setdate.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_setdate_seconds, - { "Seconds", "r3.setdate.seconds", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_deleteusers, - { "Delete Users", "r3.deleteusers", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_deleteusersnames_ext, 0x0, - NULL, HFILL } - }, - - { &hf_r3_defineexception_number, - { "Exception Number", "r3.defineexception.number", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_defineexception_startdate_month, - { "Start Month", "r3.defineexception.start.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_defineexception_startdate_day, - { "Start Day", "r3.defineexception.start.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_defineexception_startdate_hours, - { "Start Hours", "r3.defineexception.start.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_defineexception_startdate_minutes, - { "Start Minutes", "r3.defineexception.start.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_defineexception_enddate_month, - { "End Month", "r3.defineexception.end.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_defineexception_enddate_day, - { "End Day", "r3.defineexception.end.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_defineexception_enddate_hours, - { "End Hours", "r3.defineexception.end.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_defineexception_enddate_minutes, - { "End Minutes", "r3.defineexception.end.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_defineexceptiongroup_number, - { "Define Exception Group Number", "r3.defineexceptiongroup.number", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_defineexceptiongroup_bits, - { "Define Exception Group Bit Field", "r3.defineexceptiongroup.field", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_definecalendar_number, - { "Define Calendar Number", "r3.definecalendar.number", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_definecalendar_bits, - { "Define Calendar Bit Field", "r3.definecalendar.field", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_definetimezone_number, - { "Timezone Number", "r3.definetimezone.number", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_definetimezone_starttime_hours, - { "Start Hours", "r3.definetimezone.start.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_definetimezone_starttime_minutes, - { "Start Minutes", "r3.definetimezone.start.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_definetimezone_endtime_hours, - { "End Hours", "r3.definetimezone.end.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_definetimezone_endtime_minutes, - { "End Minutes", "r3.definetimezone.end.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_definetimezone_daymap [0], - { "Sunday", "r3.definetimezone.daymap.sunday", - FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000001, - NULL, HFILL } - }, - { &hf_r3_definetimezone_daymap [1], - { "Monday", "r3.definetimezone.daymap.monday", - FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000002, - NULL, HFILL } - }, - { &hf_r3_definetimezone_daymap [2], - { "Tuesday", "r3.definetimezone.daymap.tuesday", - FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000004, - NULL, HFILL } - }, - { &hf_r3_definetimezone_daymap [3], - { "Wednesday", "r3.definetimezone.daymap.wednesday", - FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000008, - NULL, HFILL } - }, - { &hf_r3_definetimezone_daymap [4], - { "Thursday", "r3.definetimezone.daymap.thursday", - FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000010, - NULL, HFILL } - }, - { &hf_r3_definetimezone_daymap [5], - { "Friday", "r3.definetimezone.daymap.friday", - FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000020, - NULL, HFILL } - }, - { &hf_r3_definetimezone_daymap [6], - { "Saturday", "r3.definetimezone.daymap.saturday", - FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000040, - NULL, HFILL } - }, - { &hf_r3_definetimezone_exceptiongroup, - { "Exception Group", "r3.definetimezone.exceptiongroup", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_definetimezone_mode, - { "Mode", "r3.definetimezone.mode", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_timezonemodenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_definetimezone_calendar, - { "Calendar", "r3.definetimezone.calendar", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_rmtauthretry_sequence, - { "Remote Auth Retry Sequence", "r3.rmtauthretry.sequence", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_rmtauthretry_retry, - { "Remote Auth Retry Mode", "r3.rmtauthretry.mode", - FT_BOOLEAN, BASE_NONE, TFS (&tfs_rmtauthretry_flags), 0x0, - NULL, HFILL } - }, - - { &hf_r3_eventlogdump_starttime_year, - { "Start Year", "r3.eventlogdump.start.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlogdump_starttime_month, - { "Start Month", "r3.eventlogdump.start.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlogdump_starttime_day, - { "Start Day", "r3.eventlogdump.start.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlogdump_starttime_hours, - { "Start Hours", "r3.eventlogdump.start.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlogdump_starttime_minutes, - { "Start Minutes", "r3.eventlogdump.start.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlogdump_endtime_year, - { "End Year", "r3.eventlogdump.end.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlogdump_endtime_month, - { "End Month", "r3.eventlogdump.end.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlogdump_endtime_day, - { "End Day", "r3.eventlogdump.end.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlogdump_endtime_hours, - { "End Hours", "r3.eventlogdump.end.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlogdump_endtime_minutes, - { "End Minutes", "r3.eventlogdump.end.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_eventlogdump_user, - { "Filter User", "r3.eventlogdump.user", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_declinedlogdump_starttime_year, - { "Start Year", "r3.declinedlogdump.start.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlogdump_starttime_month, - { "Start Month", "r3.declinedlogdump.start.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlogdump_starttime_day, - { "Start Day", "r3.declinedlogdump.start.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlogdump_starttime_hours, - { "Start Hours", "r3.declinedlogdump.start.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlogdump_starttime_minutes, - { "Start Minutes", "r3.declinedlogdump.start.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlogdump_endtime_year, - { "End Year", "r3.declinedlogdump.end.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlogdump_endtime_month, - { "End Month", "r3.declinedlogdump.end.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlogdump_endtime_day, - { "End Day", "r3.declinedlogdump.end.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlogdump_endtime_hours, - { "End Hours", "r3.declinedlogdump.end.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_declinedlogdump_endtime_minutes, - { "End Minutes", "r3.declinedlogdump.end.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_alarmlogdump_starttime_year, - { "Start Year", "r3.alarmlogdump.start.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlogdump_starttime_month, - { "Start Month", "r3.alarmlogdump.start.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlogdump_starttime_day, - { "Start Day", "r3.alarmlogdump.start.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlogdump_starttime_hours, - { "Start Hours", "r3.alarmlogdump.start.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlogdump_starttime_minutes, - { "Start Minutes", "r3.alarmlogdump.start.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlogdump_endtime_year, - { "End Year", "r3.alarmlogdump.end.year", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlogdump_endtime_month, - { "End Month", "r3.alarmlogdump.end.month", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlogdump_endtime_day, - { "End Day", "r3.alarmlogdump.end.day", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlogdump_endtime_hours, - { "End Hours", "r3.alarmlogdump.end.hours", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarmlogdump_endtime_minutes, - { "End Minutes", "r3.alarmlogdump.end.minutes", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_nvramclearoptions [ 0], - { "NVRAMCLEAROPTIONS_CFGINSTALLER", "r3.nvramclear.cfginstaller", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000001, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [ 1], - { "NVRAMCLEAROPTIONS_CFGADMIN", "r3.nvramclear.cfgadmin", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000002, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [ 2], - { "NVRAMCLEAROPTIONS_EXCEPTIONS", "r3.nvramclear.exceptions", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000004, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [ 3], - { "NVRAMCLEAROPTIONS_EXCEPTIONGROUPS", "r3.nvramclear.exceptiongroups", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000008, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [ 4], - { "NVRAMCLEAROPTIONS_CALENDARS", "r3.nvramclear.calendars", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000010, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [ 5], - { "NVRAMCLEAROPTIONS_TIMEZONES", "r3.nvramclear.timezones", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000020, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [ 6], - { "NVRAMCLEAROPTIONS_FILTERS", "r3.nvramclear.filters", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000040, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [ 7], - { "NVRAMCLEAROPTIONS_EVENTLOG", "r3.nvramclear.eventlog", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000080, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [ 8], - { "NVRAMCLEAROPTIONS_USERDATA", "r3.nvramclear.userdata", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000100, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [ 9], - { "NVRAMCLEAROPTIONS_DECLINEDLOG", "r3.nvramclear.declinedlog", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000200, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [10], - { "NVRAMCLEAROPTIONS_ALARMLOG", "r3.nvramclear.alarmlog", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000400, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [11], - { "NVRAMCLEAROPTIONS_LRUCACHE", "r3.nvramclear.lrucache", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000800, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [12], - { "NVRAMCLEAROPTIONS_DBHASH", "r3.nvramclear.dbhash", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00001000, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [13], - { "NVRAMCLEAROPTIONS_CFGSYSTEM", "r3.nvramclear.cfgsystem", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00002000, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [14], - { "NVRAMCLEAROPTIONS_UNUSED", "r3.nvramclear.unused", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00004000, - NULL, HFILL } - }, - { &hf_r3_nvramclearoptions [15], - { "NVRAMCLEAROPTIONS_USEBACKUP", "r3.nvramclear.usebackup", - FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00008000, - NULL, HFILL } - }, - - { &hf_r3_writeeventlog_user, - { "User", "r3.writeeventlog.user", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_writeeventlog_event, - { "Event", "r3.writeeventlog.event", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_eventnames_ext, 0x0, - NULL, HFILL } - }, - - { &hf_r3_powertableselection, - { "Table", "r3.powertableselection", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_powertablenames_ext, 0x0, - NULL, HFILL } - }, - - { &hf_r3_filter_type, - { "Type", "r3.filter.type", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_filtertypenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_filter_list, - { "Event", "r3.filter.event", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_filtereventnames_ext, 0x0, - NULL, HFILL } - }, - - { &hf_r3_alarm_length, - { "Length", "r3.alarm.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarm_id, - { "ID", "r3.alarm.id", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_alarmidnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_alarm_state, - { "State", "r3.alarm.state", - FT_BOOLEAN, BASE_NONE, TFS (&tfs_enabled_disabled), 0x0, - NULL, HFILL } - }, - - /* XXX: start: Originally missing: Best guess */ - { &hf_r3_dpac_action, - { "Dpac Action", "r3.dpac.action", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_dpac_waittime, - { "Dpac Waittime", "r3.dpac.waittime", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_dpac_command, - { "Dpac Command", "r3.dpac.command", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_dpacreply_stuff, - { "Dpac Reply Stuff", "r3.dpacreply.stuff", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_dpacreply_length, - { "Dpac Reply Length", "r3.dpacreply.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_dpacreply_reply, - { "Dpac Reply", "r3.dpacreply.reply", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - /* XXX: end: Originally missing --- */ - - { &hf_r3_mfgfield_length, - { "Field Length", "r3.mfgfield.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_mfgfield, - { "Field", "r3.mfgfield.field", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_mfgfieldnames_ext, 0x0, - NULL, HFILL } - }, - #if 0 - { &hf_r3_mfgfield_data, - { "Field Data", "r3.mfgfield.data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - #endif - - { &hf_r3_mfgsetserialnumber, - { "Serial Number", "r3.mfgsetserialnumber", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_mfgsetcryptkey, - { "Crypt Key", "r3.mfgsetcryptkey", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_mfgdumpnvram, - { "NVRAM Section", "r3.mfgnvramdump", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_mfgnvramdumpnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_mfgremoteunlock, - { "Remote Unlock", "r3.mfgremoteunlock", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_mfgremoteunlocknames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_mfgtestpreserve, - { "Preserve Mode", "r3.mfgtestpreserve", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_mfgtestpreservenames_ext, 0x0, - NULL, HFILL } - }, - - { &hf_r3_adc [0], - { "ADC 0", "r3.adc.0", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adc [1], - { "ADC 1", "r3.adc.1", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adc [2], - { "ADC 2", "r3.adc.2", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adc [3], - { "ADC 3", "r3.adc.3", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adc [4], - { "ADC 4", "r3.adc.4", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adc [5], - { "ADC 5", "r3.adc.5", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adc [6], - { "ADC 6", "r3.adc.6", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adc [7], - { "ADC 7", "r3.adc.7", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_hardwareid_board, - { "Board ID", "r3.hardwareid.board", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_hardwareid_cpuid, - { "CPU ID", "r3.hardwareid.cpuid", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_hardwareid_cpurev, - { "CPU Rev", "r3.hardwareid.cpurev", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_testkeypad, - { "Keypad Char", "r3.test.keypad", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_testmagcard, - { "Mag Card", "r3.test.magcard", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_testproxcard, - { "Prox Card", "r3.test.proxcard", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_nvramdump_record, - { "Record Number", "r3.nvramdump.record", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_nvramdump_length, - { "Record Length", "r3.nvramdump.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_nvramdump_data, - { "Record Data", "r3.nvramdump.data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_nvramdumprle_record, - { "Record Number", "r3.nvramdumprle.record", - FT_UINT24, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_nvramdumprle_length, - { "Record Length", "r3.nvramdumprle.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_nvramdumprle_data, - { "Record Data", "r3.nvramdumprle.data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_iopins_lat, - { "LAT", "r3.iopins.lat", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_iopins_port, - { "PORT", "r3.iopins.port", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_iopins_tris, - { "TRIS", "r3.iopins.tris", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_mortisepins_s1, - { "Mortise Pin S1", "r3.mortisepins.s1", - FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000001, - NULL, HFILL } - }, - { &hf_r3_mortisepins_s2, - { "Mortise Pin S2", "r3.mortisepins.s2", - FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000002, - NULL, HFILL } - }, - { &hf_r3_mortisepins_s3, - { "Mortise Pin S3", "r3.mortisepins.s3", - FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000004, - NULL, HFILL } - }, - { &hf_r3_mortisepins_s4, - { "Mortise Pin S4", "r3.mortisepins.s4", - FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000008, - NULL, HFILL } - }, - - { &hf_r3_checksumresults , - { "Checksum Results", "r3.checksumresults", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_checksumresults_field, - { "Field", "r3.checksumresults.field", - FT_UINT8, BASE_HEX|BASE_EXT_STRING, & r3_checksumresultnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_checksumresults_length, - { "Length", "r3.checksumresults.length", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_checksumresults_state, - { "State", "r3.checksumresults.state", - FT_BOOLEAN, BASE_NONE, TFS (&tfs_errornoerror_flags), 0x0, - NULL, HFILL } - }, - - { &hf_r3_forceoptions_item, - { "Item", "r3.forceoptions.item", - FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_forceitemnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_forceoptions_length, - { "Length", "r3.forceoptions.length", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_forceoptions_state_8, - { "State", "r3.forceoptions.state", - FT_BOOLEAN, BASE_NONE, TFS (&tfs_enabled_disabled), 0x0, - NULL, HFILL } - }, - { &hf_r3_forceoptions_state_16, - { "State", "r3.forceoptions.state", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_forceoptions_state_24, - { "State", "r3.forceoptions.state", - FT_UINT24, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_forceoptions_state_32, - { "State", "r3.forceoptions.state", - FT_UINT32, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_peekpoke_operation, - { "Operation", "r3.peekpoke.operation", - FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_peekpokenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_peekpoke_address, - { "Address", "r3.peekpoke.address", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_peekpoke_length, - { "Length", "r3.peekpoke.length", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_peekpoke_poke8, - { "8 Bit Value", "r3.peekpoke.poke8", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_peekpoke_poke16, - { "16 Bit Value", "r3.peekpoke.poke16", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_peekpoke_poke24, - { "24 Bit Value", "r3.peekpoke.poke24", - FT_UINT24, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_peekpoke_poke32, - { "32 Bit Value", "r3.peekpoke.poke32", - FT_UINT32, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_peekpoke_pokestring, - { "String Value", "r3.peekpoke.pokestring", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_firmwaredownload_length, - { "Length", "r3.firmwaredownload.length", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_firmwaredownload_record, - { "Record Number", "r3.firmwaredownload.record", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_firmwaredownload_action, - { "Action", "r3.firmwaredownload.action", - FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_downloadfirmwarenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_firmwaredownload_timeout, - { "Timeout", "r3.firmwaredownload.timeout", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_firmwaredownload_nvram, - { "NVRAM", "r3.firmwaredownload.nvram", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_firmwaredownload_address, - { "Address", "r3.firmwaredownload.address", - FT_UINT32, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_firmwaredownload_bytes, - { "Bytes", "r3.firmwaredownload.bytes", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_firmwaredownload_data, - { "Data", "r3.firmwaredownload.data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_firmwaredownload_crc, - { "CRC", "r3.firmwaredownload.crc", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_firmwaredownload_crc_bad, - { "Bad CRC", "r3.firmwaredownload.crc_bad", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_nvramchecksumvalue, - { "Value", "r3.nvramchecksum.value", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_nvramchecksumvalue_fixup, - { "Fixup", "r3.nvramchecksum.fixup", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_capabilities, - { "Capability", "r3.capabilities", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_capabilities_length, - { "Length", "r3.capabilities.length", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_capabilities_type, - { "Type", "r3.capabilities.type", - FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_capabilitiesnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_capabilities_value, - { "Value", "r3.capabilities.value", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_lockstate_passage, - { "Passage", "r3.lockstate.passage", - FT_BOOLEAN, 24, NULL, 0x00000001, - NULL, HFILL } - }, - { &hf_r3_lockstate_panic, - { "Panic", "r3.lockstate.panic", - FT_BOOLEAN, 24, NULL, 0x00000002, - NULL, HFILL } - }, - { &hf_r3_lockstate_lockout, - { "Lockout", "r3.lockstate.lockout", - FT_BOOLEAN, 24, NULL, 0x00000004, - NULL, HFILL } - }, - { &hf_r3_lockstate_relock, - { "Relock", "r3.lockstate.relock", - FT_BOOLEAN, 24, NULL, 0x00000008, - NULL, HFILL } - }, - { &hf_r3_lockstate_autoopen, - { "Auto Open", "r3.lockstate.autoopen", - FT_BOOLEAN, 24, NULL, 0x00000010, - NULL, HFILL } - }, - { &hf_r3_lockstate_nextauto, - { "Next Auto", "r3.lockstate.nextauto", - FT_BOOLEAN, 24, NULL, 0x00000020, - NULL, HFILL } - }, - { &hf_r3_lockstate_lockstate, - { "Lock State", "r3.lockstate.lockstate", - FT_BOOLEAN, 24, NULL, 0x00000040, - NULL, HFILL } - }, - { &hf_r3_lockstate_wantstate, - { "Want State", "r3.lockstate.wantstate", - FT_BOOLEAN, 24, NULL, 0x00000080, - NULL, HFILL } - }, - { &hf_r3_lockstate_remote, - { "Remote", "r3.lockstate.remote", - FT_BOOLEAN, 24, NULL, 0x00000100, - NULL, HFILL } - }, - { &hf_r3_lockstate_update, - { "Update", "r3.lockstate.update", - FT_BOOLEAN, 24, NULL, 0x00000200, - NULL, HFILL } - }, - { &hf_r3_lockstate_exceptionspresent, - { "Exceptions Present", "r3.lockstate.exceptionspresent", - FT_BOOLEAN, 24, NULL, 0x00000400, - NULL, HFILL } - }, - { &hf_r3_lockstate_exceptionsactive, - { "Exceptions Active", "r3.lockstate.exceptionsactive", - FT_BOOLEAN, 24, NULL, 0x00000800, - NULL, HFILL } - }, - { &hf_r3_lockstate_timezonespresent, - { "Timezones Presents", "r3.lockstate.timezonespresent", - FT_BOOLEAN, 24, NULL, 0x00001000, - NULL, HFILL } - }, - { &hf_r3_lockstate_timezonesactive, - { "Timezones Active", "r3.lockstate.timezonesactive", - FT_BOOLEAN, 24, NULL, 0x00002000, - NULL, HFILL } - }, - { &hf_r3_lockstate_autounlockspresent, - { "Auto Unlocks Present", "r3.lockstate.autounlockspresent", - FT_BOOLEAN, 24, NULL, 0x00004000, - NULL, HFILL } - }, - { &hf_r3_lockstate_autounlocksactive, - { "Auto Unlocks Active", "r3.lockstate.autounlocksactive", - FT_BOOLEAN, 24, NULL, 0x00008000, - NULL, HFILL } - }, - { &hf_r3_lockstate_uapmspresent, - { "UAPMs Present", "r3.lockstate.uapmspresent", - FT_BOOLEAN, 24, NULL, 0x00010000, - NULL, HFILL } - }, - { &hf_r3_lockstate_uapmsactive, - { "UAPMs Active", "r3.lockstate.uapmsactive", - FT_BOOLEAN, 24, NULL, 0x00020000, - NULL, HFILL } - }, - { &hf_r3_lockstate_uapmrelockspresent, - { "UAPM Relocks Present", "r3.lockstate.uapmrelockspresent", - FT_BOOLEAN, 24, NULL, 0x00040000, - NULL, HFILL } - }, - { &hf_r3_lockstate_uapmreslocksactive, - { "UAPM Relocks Active", "r3.lockstate.uapmreslocksactive", - FT_BOOLEAN, 24, NULL, 0x00080000, - NULL, HFILL } - }, - { &hf_r3_lockstate_nvramprotect, - { "NVRAM Protect", "r3.lockstate.nvramprotect", - FT_BOOLEAN, 24, NULL, 0x00100000, - NULL, HFILL } - }, - { &hf_r3_lockstate_nvramchecksum, - { "MVRAM Checksum", "r3.lockstate.nvramchecksum", - FT_BOOLEAN, 24, NULL, 0x00200000, - NULL, HFILL } - }, - - #if 0 - { &hf_r3_mortisestatelog, - { "Mortise State Log", "r3.mortisestatelog", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - #endif - { &hf_r3_mortisestatelog_pointer, - { "Event Pointer", "r3.mortisestatelog.pointer", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_mortisestatelog_mortisetype, - { "Mortise Type", "r3.mortisestatelog.mortisetype", - FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_mortisetypenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_mortisestatelog_waiting, - { "Waiting For Door Closed", "r3.mortisestatelog.waiting", - FT_BOOLEAN, BASE_NONE, TFS (&tfs_true_false ), 0x00, - NULL, HFILL } - }, - { &hf_r3_mortisestatelog_state, - { "State", "r3.mortisestatelog.state", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_mortisestatelog_last, - { "Last State", "r3.mortisestatelog.laststate", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_mortisestatelog_event, - { "Event", "r3.mortisestatelog.event", - FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_mortiseeventnames_ext, 0x0, - NULL, HFILL } - }, - - { &hf_r3_timerchain_newtick, - { "New Tick", "r3.timerchain.newtick", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_timerchain_currentboundary, - { "Current Boundary", "r3.timerchain.currentboundary", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_timerchain_tasktag, - { "Task Tag", "r3.timerchain.tasktag", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_timerchain_address, - { "Address", "r3.timerchain.address", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_timerchain_reload, - { "Reload", "r3.timerchain.reload", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_timerchain_boundary, - { "Boundary", "r3.timerchain.boundary", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_timerchain_count, - { "Count", "r3.timerchain.count", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_timerchain_flags, - { "Flags", "r3.timerchain.flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_taskflags_taskid, - { "Task ID", "r3.taskflags.taskid", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_taskflags_flags, - { "Flags", "r3.taskflags.flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_checkpointlog_entryptr, - { "Entry Pointer", "r3.checkpointlog.entrypointer", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_checkpointlog_rcon, - { "RCON", "r3.checkpointlog.rcon", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_checkpointlog_checkpoint, - { "Checkpoint", "r3.checkpointlog.checkpoint", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_cpuregisters_intcon, - { "INTCON", "r3.cpuregisters.intcon", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon2, - { "INTCON2", "r3.cpuregisters.intcon2", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon3, - { "INTCON3", "r3.cpuregisters.intcon3", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir1, - { "PIR1", "r3.cpuregisters.pir1", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir2, - { "PIR2", "r3.cpuregisters.pir2", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir3, - { "PIR3", "r3.cpuregisters.pir3", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie1, - { "PIE1", "r3.cpuregisters.pie1", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie2, - { "PIE2", "r3.cpuregisters.pie2", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie3, - { "PIE3", "r3.cpuregisters.pie3", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr1, - { "IPR1", "r3.cpuregisters.ipr1", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr2, - { "IPR2", "r3.cpuregisters.ipr2", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr3, - { "IPR3", "r3.cpuregisters.ipr3", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcon, - { "RCON", "r3.cpuregisters.rcon", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_osccon, - { "OSCCON", "r3.cpuregisters.osccon", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta, - { "RCSTA", "r3.cpuregisters.rcsta", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta, - { "TXSTA", "r3.cpuregisters.txsta", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta2, - { "RCSTA2", "r3.cpuregisters.rcsta2", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta2, - { "TXSTA2", "r3.cpuregisters.txsta2", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_wdtcon, - { "WDTCON", "r3.cpuregisters.wdtcon", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_cpuregisters_intcon_rbif, - { "INTCON.RBIF", "r3.cpuregisters.intcon.rbif", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon_int0if, - { "INTCON.INT0IF", "r3.cpuregisters.intcon.int0if", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon_tmr0if, - { "INTCON.TMR0IF", "r3.cpuregisters.intcon.tmr0if", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon_rbie, - { "INTCON.RBIE", "r3.cpuregisters.intcon.rbie", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon_int0ie, - { "INTCON.INT0IE", "r3.cpuregisters.intcon.int0ie", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon_tmr0ie, - { "INTCON.TMR0IE", "r3.cpuregisters.intcon.tmr0ie", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon_giel, - { "INTCON.GIEL", "r3.cpuregisters.intcon.giel", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon_gieh, - { "INTCON.GIEH", "r3.cpuregisters.intcon.gieh", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon2_rbip, - { "INTCON2.RBIP", "r3_cpuregisters_intcon2_rbip", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon2_int3ip, - { "INTCON2.INT3IP", "r3_cpuregisters_intcon2_int3ip", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon2_tmr0ip, - { "INTCON2.TMR0IP", "r3_cpuregisters_intcon2_tmr0ip", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon2_intedg3, - { "INTCON2.INTEDG3", "r3_cpuregisters_intcon2_intedg3", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon2_intedg2, - { "INTCON2.INTEDG2", "r3_cpuregisters_intcon2_intedg2", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon2_intedg1, - { "INTCON2.INTEDG1", "r3_cpuregisters_intcon2_intedg1", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon2_intedg0, - { "INTCON2.INTEDG0", "r3_cpuregisters_intcon2_intedg0", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon2_rbpu, - { "INTCON2.RBPU", "r3_cpuregisters_intcon2_rbpu", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon3_int1if, - { "INTCON3.INT1IF", "r3.cpuregisters.intcon3.int1if", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon3_int2if, - { "INTCON3.INT2IF", "r3.cpuregisters.intcon3.int2if", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon3_int3if, - { "INTCON3.INT3IF", "r3.cpuregisters.intcon3.int3if", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon3_int1ie, - { "INTCON3.INT1IE", "r3.cpuregisters.intcon3.int1ie", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon3_int2ie, - { "INTCON3.INT2IE", "r3.cpuregisters.intcon3.int2ie", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon3_int3ie, - { "INTCON3.INT3IE", "r3.cpuregisters.intcon3.int3ie", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon3_int1ip, - { "INTCON3.INT1IP", "r3.cpuregisters.intcon3.int1ip", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_intcon3_int2ip, - { "INTCON3.INT2IP", "r3.cpuregisters.intcon3.int2ip", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir1_tmr1if, - { "PIR1.TMR1IF", "r3.cpuregisters.pir1.tmr1if", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir1_tmr2if, - { "PIR1.TMR2IF", "r3.cpuregisters.pir1.tmr2if", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir1_ccp1if, - { "PIR1.CCP1IF", "r3.cpuregisters.pir1.ccp1if", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir1_ssp1if, - { "PIR1.SSP1IF", "r3.cpuregisters.pir1.ssp1if", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir1_tx1if, - { "PIR1.TX1IF", "r3.cpuregisters.pir1.tx1if", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir1_rc1if, - { "PIR1.RC1IF", "r3.cpuregisters.pir1.rc1if", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir1_adif, - { "PIR1.ADIF", "r3.cpuregisters.pir1.adif", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir1_pspif, - { "PIR1.PSPIF", "r3.cpuregisters.pir1.pspif", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir2_ccp2if, - { "PIR2.CCP2IF", "r3.cpuregisters.pir2.ccp2if", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir2_tmr3if, - { "PIR2.TMR3IF", "r3.cpuregisters.pir2.tmr3if", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir2_hlvdif, - { "PIR2.HLVDIF", "r3.cpuregisters.pir2.hlvdif", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir2_bcl1if, - { "PIR2.BCL1IF", "r3.cpuregisters.pir2.bcl1if", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir2_eeif, - { "PIR2.EEIF", "r3.cpuregisters.pir2.eeif", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir2_unused5, - { "PIR2.UNUSED5", "r3.cpuregisters.pir2.unused5", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir2_cmif, - { "PIR2.CMIF", "r3.cpuregisters.pir2.cmif", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir2_oscfif, - { "PIR2.OSCFIF", "r3.cpuregisters.pir2.oscfif", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir3_ccp3if, - { "PIR3.CCP3IF", "r3.cpuregisters.pir3.ccp3if", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir3_ccp4if, - { "PIR3.CCP4IF", "r3.cpuregisters.pir3.ccp4if", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir3_ccp5if, - { "PIR3.CCP5IF", "r3.cpuregisters.pir3.ccp5if", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir3_tmr4if, - { "PIR3.TMR4IF", "r3.cpuregisters.pir3.tmr4if", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir3_tx2if, - { "PIR3.TX2IF", "r3.cpuregisters.pir3.tx2if", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir3_rc2if, - { "PIR3.RC2IF", "r3.cpuregisters.pir3.rc2if", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir3_bcl2if, - { "PIR3.BCL2IF", "r3.cpuregisters.pir3.bcl2if", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pir3_ssp2if, - { "PIR3.SSP2IF", "r3.cpuregisters.pir3.ssp2if", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie1_tmr1ie, - { "PIE1.TMR1IE", "r3.cpuregisters.pie1.tmr1ie", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie1_tmr2ie, - { "PIE1.TMR2IE", "r3.cpuregisters.pie1.tmr2ie", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie1_ccp1ie, - { "PIE1.CCP1IE", "r3.cpuregisters.pie1.ccp1ie", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie1_ssp1ie, - { "PIE1.SSP1IE", "r3.cpuregisters.pie1.ssp1ie", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie1_tx1ie, - { "PIE1.TX1IE", "r3.cpuregisters.pie1.tx1ie", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie1_rc1ie, - { "PIE1.RC1IE", "r3.cpuregisters.pie1.rc1ie", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie1_adie, - { "PIE1.ADIE", "r3.cpuregisters.pie1.adie", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie1_pspie, - { "PIE1.PSPIE", "r3.cpuregisters.pie1.pspie", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie2_oscfie, - { "PIE2.OSCFIE", "r3.cpuregisters.pie2.oscfie", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie2_cmie, - { "PIE2.CMIE", "r3.cpuregisters.pie2.cmie", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie2_unused2, - { "PIE2.UNUSED2", "r3.cpuregisters.pie2.unused2", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie2_eeie, - { "PIE2.EEIE", "r3.cpuregisters.pie2.eeie", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie2_bcl1ie, - { "PIE2.BCL1IE", "r3.cpuregisters.pie2.bcl1ie", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie2_hlvdie, - { "PIE2.HLVDIE", "r3.cpuregisters.pie2.hlvdie", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie2_tmr3ie, - { "PIE2.TMR3IE", "r3.cpuregisters.pie2.tmr3ie", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie2_ccp2ie, - { "PIE2.CCP2IE", "r3.cpuregisters.pie2.ccp2ie", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie3_ccp3ie, - { "PIE3.CCP3IE", "r3.cpuregisters.pie3.ccp3ie", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie3_ccp4ie, - { "PIE3.CCP4IE", "r3.cpuregisters.pie3.ccp4ie", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie3_ccp5ie, - { "PIE3.CCP5IE", "r3.cpuregisters.pie3.ccp5ie", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie3_tmr4ie, - { "PIE3.TMR4IE", "r3.cpuregisters.pie3.tmr4ie", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie3_tx2ie, - { "PIE3.TX2IE", "r3.cpuregisters.pie3.tx2ie", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie3_rc2ie, - { "PIE3.RC2IE", "r3.cpuregisters.pie3.rc2ie", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie3_bcl2ie, - { "PIE3.BCL2IE", "r3.cpuregisters.pie3.bcl2ie", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_pie3_ssp2ie, - { "PIE3.SSP2IE", "r3.cpuregisters.pie3.ssp2ie", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr1_tmr1ip, - { "IPR1.TMR1IP", "r3.cpuregisters.ipr1.tmr1ip", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr1_tmr2ip, - { "IPR1.TMR2IP", "r3.cpuregisters.ipr1.tmr2ip", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr1_ccp1ip, - { "IPR1.CCP1IP", "r3.cpuregisters.ipr1.ccp1ip", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr1_ssp1ip, - { "IPR1.SSP1IP", "r3.cpuregisters.ipr1.ssp1ip", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr1_tx1ip, - { "IPR1.TX1IP", "r3.cpuregisters.ipr1.tx1ip", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr1_rc1ip, - { "IPR1.RC1IP", "r3.cpuregisters.ipr1.rc1ip", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr1_adip, - { "IPR1.ADIP", "r3.cpuregisters.ipr1.adip", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr1_pspip, - { "IPR1.PSPIP", "r3.cpuregisters.ipr1.pspip", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr2_ccp2ip, - { "IPR2.CCP2IP", "r3.cpuregisters.ipr2.ccp2ip", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr2_tmr3ip, - { "IPR2.TMR3IP", "r3.cpuregisters.ipr2.tmr3ip", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr2_hlvdip, - { "IPR2.HLVDIP", "r3.cpuregisters.ipr2.hlvdip", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr2_bcl1ip, - { "IPR2.BCL1IP", "r3.cpuregisters.ipr2.bcl1ip", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr2_eeip, - { "IPR2.EEIP", "r3.cpuregisters.ipr2.eeip", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr2_unused5, - { "IPR2.UNUSED5", "r3.cpuregisters.ipr2.unused5", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr2_cmip, - { "IPR2.CMIP", "r3.cpuregisters.ipr2.cmip", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr2_oscfip, - { "IPR2.OSCFIP", "r3.cpuregisters.ipr2.oscfip", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr3_ccp2ip, - { "IPR3.CCP2IP", "r3.cpuregisters.ipr3.ccp2ip", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr3_ccp4ip, - { "IPR3.CCP4IP", "r3.cpuregisters.ipr3.ccp4ip", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr3_ccp5ip, - { "IPR3.CCP5IP", "r3.cpuregisters.ipr3.ccp5ip", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr3_tmr4ip, - { "IPR3.TMR4IP", "r3.cpuregisters.ipr3.tmr4ip", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr3_tx2ip, - { "IPR3.TX2IP", "r3.cpuregisters.ipr3.tx2ip", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr3_rc2ip, - { "IPR3.RC2IP", "r3.cpuregisters.ipr3.rc2ip", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr3_bcl2ip, - { "IPR3.BCL2IP", "r3.cpuregisters.ipr3.bcl2ip", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_ipr3_ssp2ip, - { "IPR3.SSP2IP", "r3.cpuregisters.ipr3.ssp2ip", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcon_bor, - { "RCON./BOR", "r3.cpuregisters.rcon.bor", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcon_por, - { "RCON./POR", "r3.cpuregisters.rcon.por", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcon_pd, - { "RCON./PD", "r3.cpuregisters.rcon.pd", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcon_to, - { "RCON./TO", "r3.cpuregisters.rcon.to", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcon_unused4, - { "RCON.UNUSED4", "r3.cpuregisters.rcon.unused4", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcon_ri, - { "RCON./RI", "r3.cpuregisters.rcon.ri", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcon_sboren, - { "RCON.SBOREN", "r3.cpuregisters.rcon.sboren", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcon_ipen, - { "RCON.IPEN", "r3.cpuregisters.rcon.ipen", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_osccon_scs0, - { "OSCCON.SCS0", "r3.cpuregisters.osccon.scs0", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_osccon_scs1, - { "OSCCON.SCS1", "r3.cpuregisters.osccon.scs1", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_osccon_iofs, - { "OSCCON.IOFS", "r3.cpuregisters.osccon.iofs", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_osccon_osts, - { "OSCCON.OSTS", "r3.cpuregisters.osccon.osts", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_osccon_ircf0, - { "OSCCON.IRCF0", "r3.cpuregisters.osccon.ircf0", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_osccon_ircf1, - { "OSCCON.IRCF1", "r3.cpuregisters.osccon.ircf1", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_osccon_ircf2, - { "OSCCON.IRCF2", "r3.cpuregisters.osccon.ircf2", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_osccon_idlen, - { "OSCCON.IDLEN", "r3.cpuregisters.osccon.idlen", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta_rx9d, - { "RCSTA.RX9D", "r3.cpuregisters.rcsta.rx9d", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta_oerr, - { "RCSTA.OERR", "r3.cpuregisters.rcsta.oerr", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta_ferr, - { "RCSTA.FERR", "r3.cpuregisters.rcsta.ferr", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta_adden, - { "RCSTA.ADDEN", "r3.cpuregisters.rcsta.adden", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta_cren, - { "RCSTA.CREN", "r3.cpuregisters.rcsta.cren", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta_sren, - { "RCSTA.SREN", "r3.cpuregisters.rcsta.sren", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta_rx9, - { "RCSTA.RX9", "r3.cpuregisters.rcsta.rx9", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta_spen, - { "RCSTA.SPEN", "r3.cpuregisters.rcsta.spen", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta_tx9d, - { "TXSTA.TX9D", "r3.cpuregisters.txsta.tx9d", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta_trmt, - { "TXSTA.TRMT", "r3.cpuregisters.txsta.trmt", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta_brgh, - { "TXSTA.BRGH", "r3.cpuregisters.txsta.brgh", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta_sendb, - { "TXSTA.SENDB", "r3.cpuregisters.txsta.sendb", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta_sync, - { "TXSTA.SYNC", "r3.cpuregisters.txsta.sync", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta_txen, - { "TXSTA.TXEN", "r3.cpuregisters.txsta.txen", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta_tx9, - { "TXSTA.TX9", "r3.cpuregisters.txsta.tx9", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta_csrc, - { "TXSTA.CSRC", "r3.cpuregisters.txsta.csrc", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta2_rx9d, - { "RCSTA2.RX9D", "r3.cpuregisters.rcsta2.rx9d", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta2_oerr, - { "RCSTA2.OERR", "r3.cpuregisters.rcsta2.oerr", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta2_ferr, - { "RCSTA2.FERR", "r3.cpuregisters.rcsta2.ferr", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta2_adden, - { "RCSTA2.ADDEN", "r3.cpuregisters.rcsta2.adden", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta2_cren, - { "RCSTA2.CREN", "r3.cpuregisters.rcsta2.cren", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta2_sren, - { "RCSTA2.SREN", "r3.cpuregisters.rcsta2.sren", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta2_rx9, - { "RCSTA2.RX9", "r3.cpuregisters.rcsta2.rx9", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_rcsta2_spen, - { "RCSTA2.SPEN", "r3.cpuregisters.rcsta2.spen", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta2_tx9d, - { "TXSTA2.TX9D", "r3.cpuregisters.txsta2.tx9d", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta2_trmt, - { "TXSTA2.TRMT", "r3.cpuregisters.txsta2.trmt", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta2_brgh, - { "TXSTA2.BRGH", "r3.cpuregisters.txsta2.brgh", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta2_sendb, - { "TXSTA2.SENDB", "r3.cpuregisters.txsta2.sendb", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta2_sync, - { "TXSTA2.SYNC", "r3.cpuregisters.txsta2.sync", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta2_txen, - { "TXSTA2.TXEN", "r3.cpuregisters.txsta2.txen", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta2_tx9, - { "TXSTA2.TX9", "r3.cpuregisters.txsta2.tx9", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_txsta2_csrc, - { "TXSTA2.CSRC", "r3.cpuregisters.txsta2.csrc", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_wdtcon_swdten, - { "WDTCON.SWDTEN", "r3.cpuregisters.wdtcon.swdten", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_wdtcon_unused1, - { "WDTCON.UNUSED1", "r3.cpuregisters.wdtcon.unused1", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_wdtcon_unused2, - { "WDTCON.UNUSED2", "r3.cpuregisters.wdtcon.unused2", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_wdtcon_unused3, - { "WDTCON.UNUSED3", "r3.cpuregisters.wdtcon.unused3", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_wdtcon_unused4, - { "WDTCON.UNUSED4", "r3.cpuregisters.wdtcon.unused4", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_wdtcon_unused5, - { "WDTCON.UNUSED5", "r3.cpuregisters.wdtcon.unused5", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_wdtcon_unused6, - { "WDTCON.UNUSED6", "r3.cpuregisters.wdtcon.unused6", - FT_BOOLEAN, 8, NULL, 0x40, - NULL, HFILL } - }, - { &hf_r3_cpuregisters_wdtcon_unused7, - { "WDTCON.UNUSED7", "r3.cpuregisters.wdtcon.unused7", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL } - }, - - { &hf_r3_dumpm41t81_reg00, - { "REG 0x00", "r3.m41t81.reg00", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg01, - { "REG 0x01", "r3.m41t81.reg01", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg02, - { "REG 0x02", "r3.m41t81.reg02", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg03, - { "REG 0x03", "r3.m41t81.reg03", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg04, - { "REG 0x04", "r3.m41t81.reg04", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg05, - { "REG 0x05", "r3.m41t81.reg05", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg06, - { "REG 0x06", "r3.m41t81.reg06", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg07, - { "REG 0x07", "r3.m41t81.reg07", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg08, - { "REG 0x08", "r3.m41t81.reg08", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg09, - { "REG 0x09", "r3.m41t81.reg09", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0a, - { "REG 0x0a", "r3.m41t81.reg0a", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0b, - { "REG 0x0b", "r3.m41t81.reg0b", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0c, - { "REG 0x0c", "r3.m41t81.reg0c", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0d, - { "REG 0x0d", "r3.m41t81.reg0d", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0e, - { "REG 0x0e", "r3.m41t81.reg0e", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0f, - { "REG 0x0f", "r3.m41t81.reg0f", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg10, - { "REG 0x10", "r3.m41t81.reg10", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg11, - { "REG 0x11", "r3.m41t81.reg11", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg12, - { "REG 0x12", "r3.m41t81.reg12", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg13, - { "REG 0x13", "r3.m41t81.reg13", - FT_UINT8, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_dumpm41t81_reg00_sec1, - { ".1 Seconds", "r3.m41t81.reg00.sec1", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg00_sec01, - { ".01 Seconds", "r3.m41t81.reg00.sec01", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg01_st, - { "ST", "r3.m41t81.reg01.st", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg01_10sec, - { "10 Seconds", "r3.m41t81.reg01.10sec", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg01_1sec, - { "1 Seconds", "r3.m41t81.reg01.1sec", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg02_notused, - { "(not used)", "r3.m41t81.reg02.notused", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg02_10min, - { "10 Minutes", "r3.m41t81.reg02.10min", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg02_1min, - { "1 Minutes", "r3.m41t81.reg02.1min", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg03_cbe, - { "CBE", "r3.m41t81.reg03.cbe", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg03_cb, - { "CB", "r3.m41t81.reg03.cb", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg03_10hour, - { "10 Hours", "r3.m41t81.reg03.10hour", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg03_1hour, - { "1 Hours", "r3.m41t81.reg03.1hour", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg04_notused, - { "(not used)", "r3.m41t81.reg04.notused", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg04_dow, - { "DOW", "r3.m41t81.reg04.dow", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg05_notused, - { "(not used)", "r3.m41t81.reg05.notused", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg05_10day, - { "10 Day", "r3.m41t81.reg05.10day", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg05_1day, - { "1 Day", "r3.m41t81.reg05.1day", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg06_notused, - { "(not used)", "r3.m41t81.reg06.notused", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg06_10month, - { "10 Month", "r3.m41t81.reg06.10month", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg06_1month, - { "1 Month", "r3.m41t81.reg06.1month", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg07_10year, - { "10 Year", "r3.m41t81.reg07.10year", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg07_1year, - { "1 Year", "r3.m41t81.reg07.1year", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg08_out, - { "OUT", "r3.m41t81.reg08.out", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg08_ft, - { "FT", "r3.m41t81.reg08.ft", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg08_s, - { "S", "r3.m41t81.reg08.s", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg08_cal, - { "CAL", "r3.m41t81.reg08.cal", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg09_notused, - { "(not used)", "r3.m41t81.reg09.notused", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg09_bmb, - { "BMB", "r3.m41t81.reg09.bmb", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg09_rb, - { "RB", "r3.m41t81.reg09.rb", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0a_afe, - { "AFE", "r3.m41t81.reg0a.afe", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0a_sqwe, - { "SQWE", "r3.m41t81.reg0a.sqwe", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0a_abe, - { "ABE", "r3.m41t81.reg0a.abe", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0a_10monthalm, - { "10 Month Alarm", "r3.m41t81.reg0a.10monthalm", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0a_1monthalm, - { "1 Month Alarm", "r3.m41t81.reg0a.1monthalm", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0b_rpt5, - { "RPT5", "r3.m41t81.reg0b.rpt5", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0b_rpt4, - { "RPT4", "r3.m41t81.reg0b.rpt4", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0b_10dayalm, - { "10 Day Alarm", "r3.m41t81.reg0b.10dayalm", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0b_1dayalm, - { "1 Day Alarm", "r3.m41t81.reg0b.1dayalm", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0c_rpt3, - { "RPT3", "r3.m41t81.reg0c.rpt3", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0c_ht, - { "HT", "r3.m41t81.reg0c.ht", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0c_10houralm, - { "10 Hour Alarm", "r3.m41t81.reg0c.10houralm", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0c_1houralm, - { "1 Hour Alarm", "r3.m41t81.reg0c.1houralm", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0d_rpt2, - { "RPT2", "r3.m41t81.reg0d.rpt2", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0d_10minalm, - { "10 Min Alarm", "r3.m41t81.reg0d.10minalm", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0d_1minalm, - { "1 Min Alarm", "r3.m41t81.reg0d.1minalm", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0e_rpt1, - { "RPT1", "r3.m41t81.reg0e.rpt1", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0e_10secalm, - { "10 Sec Alarm", "r3.m41t81.reg0e.10secalm", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0e_1secalm, - { "1 Sec Alarm", "r3.m41t81.reg0e.1secalm", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0f_wdf, - { "WDF", "r3.m41t81.reg0f.wdf", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0f_af, - { "AF", "r3.m41t81.reg0f.af", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg0f_notused, - { "(not used)", "r3.m41t81.reg0f.notused", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg10_notused, - { "(not used)", "r3.m41t81.reg10.notused", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg11_notused, - { "(not used)", "r3.m41t81.reg11.notused", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg12_notused, - { "(not used)", "r3.m41t81.reg12.notused", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg13_rs, - { "RS", "r3.m41t81.reg13.rs", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_dumpm41t81_reg13_notused, - { "(not used)", "r3.m41t81.reg13.notused", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_debuglog_recordnumber, - { "Record Number", "r3.debuglog.recordnumber", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_debuglog_flags, - { "Flags", "r3.debuglog.flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_debuglog_tick, - { "Tick", "r3.debuglog.tick", - FT_UINT16, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL } - }, - - { &hf_r3_adduserparamtype, - { "Upstream Field", "r3.manageuser", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypelength, - { "Field Length", "r3.manageuser.length", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypetype, - { "Field Type", "r3.manageuser.type", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_adduserparamtypenames_ext, 0x0, - NULL, HFILL } - }, - #if 0 - { &hf_r3_adduserparamtypedatalen, - { "Data Length", "r3.manageuser.datalen", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypeerror, - { "Error", "r3.manageuser.error", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - #endif - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_DISPOSITION], - { "Disposition", "r3.manageuser.disposition", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_dispositionnames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_USERNO], - { "User Number", "r3.manageuser.usernumber", - FT_UINT16, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_ACCESSALWAYS], - { "Access Always", "r3.manageuser.accessalways", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_ACCESSMODE], - { "Access Mode", "r3.manageuser.accessmode", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_accessmodenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_CACHED], - { "Cached", "r3.manageuser.cached", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_USERTYPE], - { "User Type", "r3.manageuser.usertype", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_usertypenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_PRIMARYFIELD], - { "Primary Field", "r3.manageuser.primaryfield", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_PRIMARYFIELDTYPE], - { "Primary Field Type", "r3.manageuser.primaryfieldtype", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_AUXFIELD], - { "Aux Field", "r3.manageuser.auxfield", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_AUXFIELDTYPE], - { "Aux Field Type", "r3.manageuser.auxfieldtype", - FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_USECOUNT], - { "Use Count", "r3.manageuser.usecount", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_EXCEPTIONGROUP], - { "Exception Group", "r3.manageuser.exceptiongroup", - FT_UINT8, BASE_DEC_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_EXPIREON], - { "Expire On", "r3.manageuser.expireon", - FT_UINT24, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_TIMEZONE], - { "Timezone", "r3.manageuser.timezone", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - } - }; + { + { &hf_r3_tildex3ds, + { "DPAC Attention", "r3.dpac_attention", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_header, + { "Header", "r3.header", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_payload, + { "Payload", "r3.payload", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_tail, + { "Tail", "r3.tail", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_sigil, + { "Sigil", "r3.sigil", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_address, + { "Address", "r3.address", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_packetnumber, + { "Packet Number", "r3.packetnumber", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_packetlength, + { "Packet Length", "r3.packetlength", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_encryption, + { "Crypt Type", "r3.encryption", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_encryptionschemenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_crc, + { "CRC", "r3.crc", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_crc_bad, + { "Bad CRC", "r3.crc_bad", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_xor, + { "XOR", "r3.xor", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_xor_bad, + { "Bad XOR", "r3.xor_bad", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_commandlength, + { "Command Length", "r3.command.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_command, + { "Command", "r3.command.command", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_cmdnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_commanddata, + { "Command Data", "r3.command.data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_commandmfglength, + { "Mfg Command Length", "r3.commandmfg.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_commandmfg, + { "Mfg Command", "r3.commandmfg.command", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_cmdmfgnames_ext, 0x0, + NULL, HFILL } + }, +#if 0 + { &hf_r3_commandmfgdata, + { "Mfg Command Data", "r3.commandmfg.data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, +#endif + + { &hf_r3_responselength, + { "Response Length", "r3.response.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_responsecommand, + { "Response Command", "r3.response.command", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_cmdnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_responsetype, + { "Response Type", "r3.response.responsetype", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_responsetypenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_responsetocommand, + { "Response To Command", "r3.response.to_command", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_cmdnames_ext, 0x0, + NULL, HFILL } + }, +#if 0 + { &hf_r3_responsedata, + { "Response Data", "r3.response.data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, +#endif + + { &hf_r3_upstreamcommand, + { "Upstream Command", "r3.upstreamcommand.command", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_upstreamcommandnames_ext, 0x0, + NULL, HFILL } + }, + + { &hf_r3_upstreamfield, + { "Upstream Field", "r3.upstreamfield", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldlength, + { "Field Length", "r3.upstreamfield.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldtype, + { "Field Type", "r3.upstreamfield.type", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_upstreamfieldnames_ext, 0x0, + NULL, HFILL } + }, +#if 0 + { &hf_r3_upstreamfielddatalen, + { "Data Length", "r3.upstreamfield.datalen", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, +#endif + { &hf_r3_upstreamfielderror, + { "Error", "r3.upstreamfield.error", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_SERIALNUMBER], + { "Serial Number", "r3.upstreamfield.serialnumber", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_NAR], + { "Next Available Record", "r3.upstreamfield.nar", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_ENTRYDEVICE], + { "Entry Device", "r3.upstreamfield.entrydevice", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_PPMIFIELDTYPE], + { "PPMI Field Type", "r3.upstreamfield.ppmifieldtype", + FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_PIN], + { "PIN", "r3.upstreamfield.pin", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_SEQUENCENUMBER], + { "Sequence Number", "r3.upstreamfield.sequencenumber", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_RESPONSEWINDOW], + { "Response Window", "r3.upstreamfield.responsewindow", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_USERNUMBER], + { "User Number", "r3.upstreamfield.usernumber", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_VERSION], + { "Version", "r3.upstreamfield.version", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_EVENTLOGRECORD], + { "Event Log Record", "r3.upstreamfield.eventlogrecord", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_DATETIME], + { "Date/Time", "r3.upstreamfield.datetime", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_EVENTLOGRECORDCOUNT], + { "Event Log Record Count", "r3.upstreamfield.eventlogrecordcount", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_DECLINEDRECORDCOUNT], + { "Declined Log Record", "r3.upstreamfield.declinedlogrecord", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_DECLINEDRECORD], + { "Declined Log", "r3.upstreamfield.declinedlog", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_USERTYPE], + { "User Type", "r3.upstreamfield.usertype", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_usertypenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_ACCESSALWAYS], + { "Access Always", "r3.upstreamfield.accessalways", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_CACHED], + { "Cached", "r3.upstreamfield.cached", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_PRIMARYFIELDTYPE], + { "Primary Field Type", "r3.upstreamfield.primaryfieldtype", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_AUXFIELDTYPE], + { "Aux Field Type", "r3.upstreamfield.auxfieldtype", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_ACCESSMODE], + { "Access Mode", "r3.upstreamfield.accessmode", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_accessmodenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_EXPIREON], + { "Expire On", "r3.upstreamfield.expireon", + FT_UINT24, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_USECOUNT], + { "Use Count", "r3.upstreamfield.usecount", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_TIMEZONE], + { "Timezone", "r3.upstreamfield.timezone", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_EXCEPTIONGROUP], + { "Exception Group", "r3.upstreamfield.exceptiongroup", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_PRIMARYPIN], + { "Primary PIN", "r3.upstreamfield.primarypin", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_AUXPIN], + { "Aux PIN", "r3.upstreamfield.auxpin", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_ALARMRECORDCOUNT], + { "Alarm Record Count", "r3.upstreamfield.alarmrecordcount", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_ALARMRECORD], + { "Alarm Record", "r3.upstreamfield.alarmrecord", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_upstreamfieldarray [UPSTREAMFIELD_AUXCTLRVERSION], + { "Aux Controller Version", "r3.upstreamfield.auxctlrversion", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_configitems, + { "Configuration Item List", "r3.configitems", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_configitem, + { "Configuration Item", "r3.configitem", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_configitemnames_ext, 0x0, + NULL, HFILL } + }, +#if 0 + { &hf_r3_configfield, + { "Config Field", "r3.configfield", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, +#endif + { &hf_r3_configitemlength, + { "Configuration Item Length", "r3.configitem.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_configitemtype, + { "Configuration Item Type", "r3.configitem.type", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_configtypenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_configitemdata, + { "Configuration Item Data", "r3.configitem.data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_configitemdata_bool, + { "Configuration Item Boolean", "r3.configitem.data_boolean", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_configitemdata_8, + { "Configuration Item 8-bit", "r3.configitem.data_8", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_configitemdata_16, + { "Configuration Item 16-bit", "r3.configitem.data_16", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_configitemdata_32, + { "Configuration Item 32-bit", "r3.configitem.data_32", + FT_UINT32, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_configitemdata_string, + { "Configuration Item String", "r3.configitem.data_string", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_timezonearray [ 0], + { "Timezone 0", "r3.timezone.0", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000001, + NULL, HFILL } + }, + { &hf_r3_timezonearray [ 1], + { "Timezone 1", "r3.timezone.1", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000002, + NULL, HFILL } + }, + { &hf_r3_timezonearray [ 2], + { "Timezone 2", "r3.timezone.2", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000004, + NULL, HFILL } + }, + { &hf_r3_timezonearray [ 3], + { "Timezone 3", "r3.timezone.3", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000008, + NULL, HFILL } + }, + { &hf_r3_timezonearray [ 4], + { "Timezone 4", "r3.timezone.4", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000010, + NULL, HFILL } + }, + { &hf_r3_timezonearray [ 5], + { "Timezone 5", "r3.timezone.5", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000020, + NULL, HFILL } + }, + { &hf_r3_timezonearray [ 6], + { "Timezone 6", "r3.timezone.6", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000040, + NULL, HFILL } + }, + { &hf_r3_timezonearray [ 7], + { "Timezone 7", "r3.timezone.7", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000080, + NULL, HFILL } + }, + { &hf_r3_timezonearray [ 8], + { "Timezone 8", "r3.timezone.8", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000100, + NULL, HFILL } + }, + { &hf_r3_timezonearray [ 9], + { "Timezone 9", "r3.timezone.9", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000200, + NULL, HFILL } + }, + { &hf_r3_timezonearray [10], + { "Timezone 10", "r3.timezone.10", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000400, + NULL, HFILL } + }, + { &hf_r3_timezonearray [11], + { "Timezone 11", "r3.timezone.11", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00000800, + NULL, HFILL } + }, + { &hf_r3_timezonearray [12], + { "Timezone 12", "r3.timezone.12", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00001000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [13], + { "Timezone 13", "r3.timezone.13", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00002000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [14], + { "Timezone 14", "r3.timezone.14", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00004000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [15], + { "Timezone 15", "r3.timezone.15", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00008000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [16], + { "Timezone 16", "r3.timezone.16", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00010000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [17], + { "Timezone 17", "r3.timezone.17", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00020000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [18], + { "Timezone 18", "r3.timezone.18", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00040000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [19], + { "Timezone 19", "r3.timezone.19", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00080000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [20], + { "Timezone 20", "r3.timezone.20", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00100000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [21], + { "Timezone 21", "r3.timezone.21", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00200000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [22], + { "Timezone 22", "r3.timezone.22", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00400000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [23], + { "Timezone 23", "r3.timezone.23", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x00800000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [24], + { "Timezone 24", "r3.timezone.24", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x01000000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [25], + { "Timezone 25", "r3.timezone.25", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x02000000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [26], + { "Timezone 26", "r3.timezone.26", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x04000000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [27], + { "Timezone 27", "r3.timezone.27", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x08000000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [28], + { "Timezone 28", "r3.timezone.28", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x10000000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [29], + { "Timezone 29", "r3.timezone.29", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x20000000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [30], + { "Timezone 30", "r3.timezone.30", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x40000000, + NULL, HFILL } + }, + { &hf_r3_timezonearray [31], + { "Timezone 31", "r3.timezone.31", + FT_BOOLEAN, 32, TFS (&tfs_enabled_disabled), 0x80000000, + NULL, HFILL } + }, + + { &hf_r3_expireon_year, + { "Expiration Year", "r3.expireon.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_expireon_month, + { "Expiration Month", "r3.expireon.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_expireon_day, + { "Expiration Day", "r3.expireon.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_datetime_year, + { "Date/Time Year", "r3.datetime.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_datetime_month, + { "Date/Time Month", "r3.datetime.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_datetime_day, + { "Date/Time Day", "r3.datetime.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_datetime_dow, + { "Date/Time DOW", "r3.datetime.dow", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_daynames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_datetime_hours, + { "Date/Time Hours", "r3.datetime.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_datetime_minutes, + { "Date/Time Minutes", "r3.datetime.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_datetime_seconds, + { "Date/Time Seconds", "r3.datetime.seconds", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_datetime_dst, + { "Date/Time DST", "r3.datetime.dst", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_eventlog_recordnumber, + { "Record Number", "r3.eventlog.recordnumber", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlog_year, + { "Year", "r3.eventlog.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlog_month, + { "Month", "r3.eventlog.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlog_day, + { "Day", "r3.eventlog.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlog_hour, + { "Hours", "r3.eventlog.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlog_minute, + { "Minutes", "r3.eventlog.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlog_second, + { "Seconds", "r3.eventlog.seconds", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlog_usernumber, + { "User Number", "r3.eventlog.usernumber", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlog_event, + { "ID", "r3.eventlog.id", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_eventnames_ext, 0x0, + NULL, HFILL } + }, + + { &hf_r3_declinedlog_recordnumber, + { "Record Number", "r3.declinedlog.recordnumber", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_year, + { "Year", "r3.declinedlog.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_month, + { "Month", "r3.declinedlog.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_day, + { "Day", "r3.declinedlog.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_hour, + { "Hours", "r3.declinedlog.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_minute, + { "Minutes", "r3.declinedlog.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_second, + { "Seconds", "r3.declinedlog.seconds", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_usernumber, + { "User Number", "r3.declinedlog.usernumber", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_cred1type, + { "Credential 1 Type", "r3.declinedlog.cred1type", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_fieldtypenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_cred2type, + { "Credential 2 Type", "r3.declinedlog.cred2type", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_fieldtypenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_cred1, + { "Credential 1", "r3.declinedlog.cred1", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlog_cred2, + { "Credential 2", "r3.declinedlog.cred2", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_alarmlog_recordnumber, + { "Record Number", "r3.alarmlog.recordnumber", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlog_year, + { "Year", "r3.alarmlog.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlog_month, + { "Month", "r3.alarmlog.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlog_day, + { "Day", "r3.alarmlog.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlog_hour, + { "Hours", "r3.alarmlog.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlog_minute, + { "Minutes", "r3.alarmlog.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlog_second, + { "Seconds", "r3.alarmlog.seconds", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlog_id, + { "ID", "r3.alarmlog.id", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_alarmidnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlog_usernumber, + { "User Number", "r3.alarmlog.usernumber", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_debugmsg, + { "Debug Message", "r3.debug", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_setdate_year, + { "Year", "r3.setdate.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_setdate_month, + { "Month", "r3.setdate.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_setdate_day, + { "Day", "r3.setdate.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_setdate_dow, + { "Day-Of-Week", "r3.setdate.dow", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_daynames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_setdate_hours, + { "Hours", "r3.setdate.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_setdate_minutes, + { "Minutes", "r3.setdate.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_setdate_seconds, + { "Seconds", "r3.setdate.seconds", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_deleteusers, + { "Delete Users", "r3.deleteusers", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_deleteusersnames_ext, 0x0, + NULL, HFILL } + }, + + { &hf_r3_defineexception_number, + { "Exception Number", "r3.defineexception.number", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_defineexception_startdate_month, + { "Start Month", "r3.defineexception.start.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_defineexception_startdate_day, + { "Start Day", "r3.defineexception.start.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_defineexception_startdate_hours, + { "Start Hours", "r3.defineexception.start.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_defineexception_startdate_minutes, + { "Start Minutes", "r3.defineexception.start.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_defineexception_enddate_month, + { "End Month", "r3.defineexception.end.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_defineexception_enddate_day, + { "End Day", "r3.defineexception.end.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_defineexception_enddate_hours, + { "End Hours", "r3.defineexception.end.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_defineexception_enddate_minutes, + { "End Minutes", "r3.defineexception.end.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_defineexceptiongroup_number, + { "Define Exception Group Number", "r3.defineexceptiongroup.number", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_defineexceptiongroup_bits, + { "Define Exception Group Bit Field", "r3.defineexceptiongroup.field", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_definecalendar_number, + { "Define Calendar Number", "r3.definecalendar.number", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_definecalendar_bits, + { "Define Calendar Bit Field", "r3.definecalendar.field", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_definetimezone_number, + { "Timezone Number", "r3.definetimezone.number", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_definetimezone_starttime_hours, + { "Start Hours", "r3.definetimezone.start.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_definetimezone_starttime_minutes, + { "Start Minutes", "r3.definetimezone.start.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_definetimezone_endtime_hours, + { "End Hours", "r3.definetimezone.end.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_definetimezone_endtime_minutes, + { "End Minutes", "r3.definetimezone.end.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_definetimezone_daymap [0], + { "Sunday", "r3.definetimezone.daymap.sunday", + FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000001, + NULL, HFILL } + }, + { &hf_r3_definetimezone_daymap [1], + { "Monday", "r3.definetimezone.daymap.monday", + FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000002, + NULL, HFILL } + }, + { &hf_r3_definetimezone_daymap [2], + { "Tuesday", "r3.definetimezone.daymap.tuesday", + FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000004, + NULL, HFILL } + }, + { &hf_r3_definetimezone_daymap [3], + { "Wednesday", "r3.definetimezone.daymap.wednesday", + FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000008, + NULL, HFILL } + }, + { &hf_r3_definetimezone_daymap [4], + { "Thursday", "r3.definetimezone.daymap.thursday", + FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000010, + NULL, HFILL } + }, + { &hf_r3_definetimezone_daymap [5], + { "Friday", "r3.definetimezone.daymap.friday", + FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000020, + NULL, HFILL } + }, + { &hf_r3_definetimezone_daymap [6], + { "Saturday", "r3.definetimezone.daymap.saturday", + FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x00000040, + NULL, HFILL } + }, + { &hf_r3_definetimezone_exceptiongroup, + { "Exception Group", "r3.definetimezone.exceptiongroup", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_definetimezone_mode, + { "Mode", "r3.definetimezone.mode", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_timezonemodenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_definetimezone_calendar, + { "Calendar", "r3.definetimezone.calendar", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_rmtauthretry_sequence, + { "Remote Auth Retry Sequence", "r3.rmtauthretry.sequence", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_rmtauthretry_retry, + { "Remote Auth Retry Mode", "r3.rmtauthretry.mode", + FT_BOOLEAN, BASE_NONE, TFS (&tfs_rmtauthretry_flags), 0x0, + NULL, HFILL } + }, + + { &hf_r3_eventlogdump_starttime_year, + { "Start Year", "r3.eventlogdump.start.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlogdump_starttime_month, + { "Start Month", "r3.eventlogdump.start.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlogdump_starttime_day, + { "Start Day", "r3.eventlogdump.start.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlogdump_starttime_hours, + { "Start Hours", "r3.eventlogdump.start.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlogdump_starttime_minutes, + { "Start Minutes", "r3.eventlogdump.start.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlogdump_endtime_year, + { "End Year", "r3.eventlogdump.end.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlogdump_endtime_month, + { "End Month", "r3.eventlogdump.end.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlogdump_endtime_day, + { "End Day", "r3.eventlogdump.end.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlogdump_endtime_hours, + { "End Hours", "r3.eventlogdump.end.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlogdump_endtime_minutes, + { "End Minutes", "r3.eventlogdump.end.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_eventlogdump_user, + { "Filter User", "r3.eventlogdump.user", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_declinedlogdump_starttime_year, + { "Start Year", "r3.declinedlogdump.start.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlogdump_starttime_month, + { "Start Month", "r3.declinedlogdump.start.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlogdump_starttime_day, + { "Start Day", "r3.declinedlogdump.start.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlogdump_starttime_hours, + { "Start Hours", "r3.declinedlogdump.start.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlogdump_starttime_minutes, + { "Start Minutes", "r3.declinedlogdump.start.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlogdump_endtime_year, + { "End Year", "r3.declinedlogdump.end.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlogdump_endtime_month, + { "End Month", "r3.declinedlogdump.end.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlogdump_endtime_day, + { "End Day", "r3.declinedlogdump.end.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlogdump_endtime_hours, + { "End Hours", "r3.declinedlogdump.end.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_declinedlogdump_endtime_minutes, + { "End Minutes", "r3.declinedlogdump.end.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_alarmlogdump_starttime_year, + { "Start Year", "r3.alarmlogdump.start.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlogdump_starttime_month, + { "Start Month", "r3.alarmlogdump.start.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlogdump_starttime_day, + { "Start Day", "r3.alarmlogdump.start.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlogdump_starttime_hours, + { "Start Hours", "r3.alarmlogdump.start.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlogdump_starttime_minutes, + { "Start Minutes", "r3.alarmlogdump.start.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlogdump_endtime_year, + { "End Year", "r3.alarmlogdump.end.year", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlogdump_endtime_month, + { "End Month", "r3.alarmlogdump.end.month", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlogdump_endtime_day, + { "End Day", "r3.alarmlogdump.end.day", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlogdump_endtime_hours, + { "End Hours", "r3.alarmlogdump.end.hours", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarmlogdump_endtime_minutes, + { "End Minutes", "r3.alarmlogdump.end.minutes", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_nvramclearoptions [ 0], + { "NVRAMCLEAROPTIONS_CFGINSTALLER", "r3.nvramclear.cfginstaller", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000001, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [ 1], + { "NVRAMCLEAROPTIONS_CFGADMIN", "r3.nvramclear.cfgadmin", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000002, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [ 2], + { "NVRAMCLEAROPTIONS_EXCEPTIONS", "r3.nvramclear.exceptions", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000004, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [ 3], + { "NVRAMCLEAROPTIONS_EXCEPTIONGROUPS", "r3.nvramclear.exceptiongroups", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000008, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [ 4], + { "NVRAMCLEAROPTIONS_CALENDARS", "r3.nvramclear.calendars", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000010, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [ 5], + { "NVRAMCLEAROPTIONS_TIMEZONES", "r3.nvramclear.timezones", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000020, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [ 6], + { "NVRAMCLEAROPTIONS_FILTERS", "r3.nvramclear.filters", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000040, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [ 7], + { "NVRAMCLEAROPTIONS_EVENTLOG", "r3.nvramclear.eventlog", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000080, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [ 8], + { "NVRAMCLEAROPTIONS_USERDATA", "r3.nvramclear.userdata", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000100, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [ 9], + { "NVRAMCLEAROPTIONS_DECLINEDLOG", "r3.nvramclear.declinedlog", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000200, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [10], + { "NVRAMCLEAROPTIONS_ALARMLOG", "r3.nvramclear.alarmlog", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000400, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [11], + { "NVRAMCLEAROPTIONS_LRUCACHE", "r3.nvramclear.lrucache", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00000800, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [12], + { "NVRAMCLEAROPTIONS_DBHASH", "r3.nvramclear.dbhash", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00001000, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [13], + { "NVRAMCLEAROPTIONS_CFGSYSTEM", "r3.nvramclear.cfgsystem", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00002000, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [14], + { "NVRAMCLEAROPTIONS_UNUSED", "r3.nvramclear.unused", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00004000, + NULL, HFILL } + }, + { &hf_r3_nvramclearoptions [15], + { "NVRAMCLEAROPTIONS_USEBACKUP", "r3.nvramclear.usebackup", + FT_BOOLEAN, 16, TFS (&tfs_enabled_disabled), 0x00008000, + NULL, HFILL } + }, + + { &hf_r3_writeeventlog_user, + { "User", "r3.writeeventlog.user", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_writeeventlog_event, + { "Event", "r3.writeeventlog.event", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_eventnames_ext, 0x0, + NULL, HFILL } + }, + + { &hf_r3_powertableselection, + { "Table", "r3.powertableselection", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_powertablenames_ext, 0x0, + NULL, HFILL } + }, + + { &hf_r3_filter_type, + { "Type", "r3.filter.type", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_filtertypenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_filter_list, + { "Event", "r3.filter.event", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_filtereventnames_ext, 0x0, + NULL, HFILL } + }, + + { &hf_r3_alarm_length, + { "Length", "r3.alarm.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarm_id, + { "ID", "r3.alarm.id", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_alarmidnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_alarm_state, + { "State", "r3.alarm.state", + FT_BOOLEAN, BASE_NONE, TFS (&tfs_enabled_disabled), 0x0, + NULL, HFILL } + }, + + /* XXX: start: Originally missing: Best guess */ + { &hf_r3_dpac_action, + { "Dpac Action", "r3.dpac.action", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_dpac_waittime, + { "Dpac Waittime", "r3.dpac.waittime", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_dpac_command, + { "Dpac Command", "r3.dpac.command", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_dpacreply_stuff, + { "Dpac Reply Stuff", "r3.dpacreply.stuff", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_dpacreply_length, + { "Dpac Reply Length", "r3.dpacreply.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_dpacreply_reply, + { "Dpac Reply", "r3.dpacreply.reply", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + /* XXX: end: Originally missing --- */ + + { &hf_r3_mfgfield_length, + { "Field Length", "r3.mfgfield.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_mfgfield, + { "Field", "r3.mfgfield.field", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_mfgfieldnames_ext, 0x0, + NULL, HFILL } + }, +#if 0 + { &hf_r3_mfgfield_data, + { "Field Data", "r3.mfgfield.data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, +#endif + + { &hf_r3_mfgsetserialnumber, + { "Serial Number", "r3.mfgsetserialnumber", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_mfgsetcryptkey, + { "Crypt Key", "r3.mfgsetcryptkey", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_mfgdumpnvram, + { "NVRAM Section", "r3.mfgnvramdump", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_mfgnvramdumpnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_mfgremoteunlock, + { "Remote Unlock", "r3.mfgremoteunlock", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_mfgremoteunlocknames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_mfgtestpreserve, + { "Preserve Mode", "r3.mfgtestpreserve", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_mfgtestpreservenames_ext, 0x0, + NULL, HFILL } + }, + + { &hf_r3_adc [0], + { "ADC 0", "r3.adc.0", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adc [1], + { "ADC 1", "r3.adc.1", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adc [2], + { "ADC 2", "r3.adc.2", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adc [3], + { "ADC 3", "r3.adc.3", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adc [4], + { "ADC 4", "r3.adc.4", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adc [5], + { "ADC 5", "r3.adc.5", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adc [6], + { "ADC 6", "r3.adc.6", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adc [7], + { "ADC 7", "r3.adc.7", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_hardwareid_board, + { "Board ID", "r3.hardwareid.board", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_hardwareid_cpuid, + { "CPU ID", "r3.hardwareid.cpuid", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_hardwareid_cpurev, + { "CPU Rev", "r3.hardwareid.cpurev", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_testkeypad, + { "Keypad Char", "r3.test.keypad", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_testmagcard, + { "Mag Card", "r3.test.magcard", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_testproxcard, + { "Prox Card", "r3.test.proxcard", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_nvramdump_record, + { "Record Number", "r3.nvramdump.record", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_nvramdump_length, + { "Record Length", "r3.nvramdump.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_nvramdump_data, + { "Record Data", "r3.nvramdump.data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_nvramdumprle_record, + { "Record Number", "r3.nvramdumprle.record", + FT_UINT24, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_nvramdumprle_length, + { "Record Length", "r3.nvramdumprle.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_nvramdumprle_data, + { "Record Data", "r3.nvramdumprle.data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_iopins_lat, + { "LAT", "r3.iopins.lat", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_iopins_port, + { "PORT", "r3.iopins.port", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_iopins_tris, + { "TRIS", "r3.iopins.tris", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_mortisepins_s1, + { "Mortise Pin S1", "r3.mortisepins.s1", + FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000001, + NULL, HFILL } + }, + { &hf_r3_mortisepins_s2, + { "Mortise Pin S2", "r3.mortisepins.s2", + FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000002, + NULL, HFILL } + }, + { &hf_r3_mortisepins_s3, + { "Mortise Pin S3", "r3.mortisepins.s3", + FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000004, + NULL, HFILL } + }, + { &hf_r3_mortisepins_s4, + { "Mortise Pin S4", "r3.mortisepins.s4", + FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000008, + NULL, HFILL } + }, + + { &hf_r3_checksumresults , + { "Checksum Results", "r3.checksumresults", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_checksumresults_field, + { "Field", "r3.checksumresults.field", + FT_UINT8, BASE_HEX|BASE_EXT_STRING, & r3_checksumresultnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_checksumresults_length, + { "Length", "r3.checksumresults.length", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_checksumresults_state, + { "State", "r3.checksumresults.state", + FT_BOOLEAN, BASE_NONE, TFS (&tfs_errornoerror_flags), 0x0, + NULL, HFILL } + }, + + { &hf_r3_forceoptions_item, + { "Item", "r3.forceoptions.item", + FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_forceitemnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_forceoptions_length, + { "Length", "r3.forceoptions.length", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_forceoptions_state_8, + { "State", "r3.forceoptions.state", + FT_BOOLEAN, BASE_NONE, TFS (&tfs_enabled_disabled), 0x0, + NULL, HFILL } + }, + { &hf_r3_forceoptions_state_16, + { "State", "r3.forceoptions.state", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_forceoptions_state_24, + { "State", "r3.forceoptions.state", + FT_UINT24, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_forceoptions_state_32, + { "State", "r3.forceoptions.state", + FT_UINT32, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_peekpoke_operation, + { "Operation", "r3.peekpoke.operation", + FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_peekpokenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_peekpoke_address, + { "Address", "r3.peekpoke.address", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_peekpoke_length, + { "Length", "r3.peekpoke.length", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_peekpoke_poke8, + { "8 Bit Value", "r3.peekpoke.poke8", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_peekpoke_poke16, + { "16 Bit Value", "r3.peekpoke.poke16", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_peekpoke_poke24, + { "24 Bit Value", "r3.peekpoke.poke24", + FT_UINT24, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_peekpoke_poke32, + { "32 Bit Value", "r3.peekpoke.poke32", + FT_UINT32, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_peekpoke_pokestring, + { "String Value", "r3.peekpoke.pokestring", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_firmwaredownload_length, + { "Length", "r3.firmwaredownload.length", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_firmwaredownload_record, + { "Record Number", "r3.firmwaredownload.record", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_firmwaredownload_action, + { "Action", "r3.firmwaredownload.action", + FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_downloadfirmwarenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_firmwaredownload_timeout, + { "Timeout", "r3.firmwaredownload.timeout", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_firmwaredownload_nvram, + { "NVRAM", "r3.firmwaredownload.nvram", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_firmwaredownload_address, + { "Address", "r3.firmwaredownload.address", + FT_UINT32, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_firmwaredownload_bytes, + { "Bytes", "r3.firmwaredownload.bytes", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_firmwaredownload_data, + { "Data", "r3.firmwaredownload.data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_firmwaredownload_crc, + { "CRC", "r3.firmwaredownload.crc", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_firmwaredownload_crc_bad, + { "Bad CRC", "r3.firmwaredownload.crc_bad", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_nvramchecksumvalue, + { "Value", "r3.nvramchecksum.value", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_nvramchecksumvalue_fixup, + { "Fixup", "r3.nvramchecksum.fixup", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_capabilities, + { "Capability", "r3.capabilities", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_capabilities_length, + { "Length", "r3.capabilities.length", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_capabilities_type, + { "Type", "r3.capabilities.type", + FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_capabilitiesnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_capabilities_value, + { "Value", "r3.capabilities.value", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_lockstate_passage, + { "Passage", "r3.lockstate.passage", + FT_BOOLEAN, 24, NULL, 0x00000001, + NULL, HFILL } + }, + { &hf_r3_lockstate_panic, + { "Panic", "r3.lockstate.panic", + FT_BOOLEAN, 24, NULL, 0x00000002, + NULL, HFILL } + }, + { &hf_r3_lockstate_lockout, + { "Lockout", "r3.lockstate.lockout", + FT_BOOLEAN, 24, NULL, 0x00000004, + NULL, HFILL } + }, + { &hf_r3_lockstate_relock, + { "Relock", "r3.lockstate.relock", + FT_BOOLEAN, 24, NULL, 0x00000008, + NULL, HFILL } + }, + { &hf_r3_lockstate_autoopen, + { "Auto Open", "r3.lockstate.autoopen", + FT_BOOLEAN, 24, NULL, 0x00000010, + NULL, HFILL } + }, + { &hf_r3_lockstate_nextauto, + { "Next Auto", "r3.lockstate.nextauto", + FT_BOOLEAN, 24, NULL, 0x00000020, + NULL, HFILL } + }, + { &hf_r3_lockstate_lockstate, + { "Lock State", "r3.lockstate.lockstate", + FT_BOOLEAN, 24, NULL, 0x00000040, + NULL, HFILL } + }, + { &hf_r3_lockstate_wantstate, + { "Want State", "r3.lockstate.wantstate", + FT_BOOLEAN, 24, NULL, 0x00000080, + NULL, HFILL } + }, + { &hf_r3_lockstate_remote, + { "Remote", "r3.lockstate.remote", + FT_BOOLEAN, 24, NULL, 0x00000100, + NULL, HFILL } + }, + { &hf_r3_lockstate_update, + { "Update", "r3.lockstate.update", + FT_BOOLEAN, 24, NULL, 0x00000200, + NULL, HFILL } + }, + { &hf_r3_lockstate_exceptionspresent, + { "Exceptions Present", "r3.lockstate.exceptionspresent", + FT_BOOLEAN, 24, NULL, 0x00000400, + NULL, HFILL } + }, + { &hf_r3_lockstate_exceptionsactive, + { "Exceptions Active", "r3.lockstate.exceptionsactive", + FT_BOOLEAN, 24, NULL, 0x00000800, + NULL, HFILL } + }, + { &hf_r3_lockstate_timezonespresent, + { "Timezones Presents", "r3.lockstate.timezonespresent", + FT_BOOLEAN, 24, NULL, 0x00001000, + NULL, HFILL } + }, + { &hf_r3_lockstate_timezonesactive, + { "Timezones Active", "r3.lockstate.timezonesactive", + FT_BOOLEAN, 24, NULL, 0x00002000, + NULL, HFILL } + }, + { &hf_r3_lockstate_autounlockspresent, + { "Auto Unlocks Present", "r3.lockstate.autounlockspresent", + FT_BOOLEAN, 24, NULL, 0x00004000, + NULL, HFILL } + }, + { &hf_r3_lockstate_autounlocksactive, + { "Auto Unlocks Active", "r3.lockstate.autounlocksactive", + FT_BOOLEAN, 24, NULL, 0x00008000, + NULL, HFILL } + }, + { &hf_r3_lockstate_uapmspresent, + { "UAPMs Present", "r3.lockstate.uapmspresent", + FT_BOOLEAN, 24, NULL, 0x00010000, + NULL, HFILL } + }, + { &hf_r3_lockstate_uapmsactive, + { "UAPMs Active", "r3.lockstate.uapmsactive", + FT_BOOLEAN, 24, NULL, 0x00020000, + NULL, HFILL } + }, + { &hf_r3_lockstate_uapmrelockspresent, + { "UAPM Relocks Present", "r3.lockstate.uapmrelockspresent", + FT_BOOLEAN, 24, NULL, 0x00040000, + NULL, HFILL } + }, + { &hf_r3_lockstate_uapmreslocksactive, + { "UAPM Relocks Active", "r3.lockstate.uapmreslocksactive", + FT_BOOLEAN, 24, NULL, 0x00080000, + NULL, HFILL } + }, + { &hf_r3_lockstate_nvramprotect, + { "NVRAM Protect", "r3.lockstate.nvramprotect", + FT_BOOLEAN, 24, NULL, 0x00100000, + NULL, HFILL } + }, + { &hf_r3_lockstate_nvramchecksum, + { "MVRAM Checksum", "r3.lockstate.nvramchecksum", + FT_BOOLEAN, 24, NULL, 0x00200000, + NULL, HFILL } + }, + +#if 0 + { &hf_r3_mortisestatelog, + { "Mortise State Log", "r3.mortisestatelog", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, +#endif + { &hf_r3_mortisestatelog_pointer, + { "Event Pointer", "r3.mortisestatelog.pointer", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_mortisestatelog_mortisetype, + { "Mortise Type", "r3.mortisestatelog.mortisetype", + FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_mortisetypenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_mortisestatelog_waiting, + { "Waiting For Door Closed", "r3.mortisestatelog.waiting", + FT_BOOLEAN, BASE_NONE, TFS (&tfs_true_false ), 0x00, + NULL, HFILL } + }, + { &hf_r3_mortisestatelog_state, + { "State", "r3.mortisestatelog.state", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_mortisestatelog_last, + { "Last State", "r3.mortisestatelog.laststate", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_mortisestatelog_event, + { "Event", "r3.mortisestatelog.event", + FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_mortiseeventnames_ext, 0x0, + NULL, HFILL } + }, + + { &hf_r3_timerchain_newtick, + { "New Tick", "r3.timerchain.newtick", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_timerchain_currentboundary, + { "Current Boundary", "r3.timerchain.currentboundary", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_timerchain_tasktag, + { "Task Tag", "r3.timerchain.tasktag", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_timerchain_address, + { "Address", "r3.timerchain.address", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_timerchain_reload, + { "Reload", "r3.timerchain.reload", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_timerchain_boundary, + { "Boundary", "r3.timerchain.boundary", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_timerchain_count, + { "Count", "r3.timerchain.count", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_timerchain_flags, + { "Flags", "r3.timerchain.flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_taskflags_taskid, + { "Task ID", "r3.taskflags.taskid", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_taskflags_flags, + { "Flags", "r3.taskflags.flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_checkpointlog_entryptr, + { "Entry Pointer", "r3.checkpointlog.entrypointer", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_checkpointlog_rcon, + { "RCON", "r3.checkpointlog.rcon", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_checkpointlog_checkpoint, + { "Checkpoint", "r3.checkpointlog.checkpoint", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_cpuregisters_intcon, + { "INTCON", "r3.cpuregisters.intcon", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon2, + { "INTCON2", "r3.cpuregisters.intcon2", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon3, + { "INTCON3", "r3.cpuregisters.intcon3", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir1, + { "PIR1", "r3.cpuregisters.pir1", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir2, + { "PIR2", "r3.cpuregisters.pir2", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir3, + { "PIR3", "r3.cpuregisters.pir3", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie1, + { "PIE1", "r3.cpuregisters.pie1", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie2, + { "PIE2", "r3.cpuregisters.pie2", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie3, + { "PIE3", "r3.cpuregisters.pie3", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr1, + { "IPR1", "r3.cpuregisters.ipr1", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr2, + { "IPR2", "r3.cpuregisters.ipr2", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr3, + { "IPR3", "r3.cpuregisters.ipr3", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcon, + { "RCON", "r3.cpuregisters.rcon", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_osccon, + { "OSCCON", "r3.cpuregisters.osccon", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta, + { "RCSTA", "r3.cpuregisters.rcsta", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta, + { "TXSTA", "r3.cpuregisters.txsta", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta2, + { "RCSTA2", "r3.cpuregisters.rcsta2", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta2, + { "TXSTA2", "r3.cpuregisters.txsta2", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_wdtcon, + { "WDTCON", "r3.cpuregisters.wdtcon", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_cpuregisters_intcon_rbif, + { "INTCON.RBIF", "r3.cpuregisters.intcon.rbif", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon_int0if, + { "INTCON.INT0IF", "r3.cpuregisters.intcon.int0if", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon_tmr0if, + { "INTCON.TMR0IF", "r3.cpuregisters.intcon.tmr0if", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon_rbie, + { "INTCON.RBIE", "r3.cpuregisters.intcon.rbie", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon_int0ie, + { "INTCON.INT0IE", "r3.cpuregisters.intcon.int0ie", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon_tmr0ie, + { "INTCON.TMR0IE", "r3.cpuregisters.intcon.tmr0ie", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon_giel, + { "INTCON.GIEL", "r3.cpuregisters.intcon.giel", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon_gieh, + { "INTCON.GIEH", "r3.cpuregisters.intcon.gieh", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon2_rbip, + { "INTCON2.RBIP", "r3_cpuregisters_intcon2_rbip", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon2_int3ip, + { "INTCON2.INT3IP", "r3_cpuregisters_intcon2_int3ip", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon2_tmr0ip, + { "INTCON2.TMR0IP", "r3_cpuregisters_intcon2_tmr0ip", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon2_intedg3, + { "INTCON2.INTEDG3", "r3_cpuregisters_intcon2_intedg3", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon2_intedg2, + { "INTCON2.INTEDG2", "r3_cpuregisters_intcon2_intedg2", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon2_intedg1, + { "INTCON2.INTEDG1", "r3_cpuregisters_intcon2_intedg1", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon2_intedg0, + { "INTCON2.INTEDG0", "r3_cpuregisters_intcon2_intedg0", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon2_rbpu, + { "INTCON2.RBPU", "r3_cpuregisters_intcon2_rbpu", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon3_int1if, + { "INTCON3.INT1IF", "r3.cpuregisters.intcon3.int1if", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon3_int2if, + { "INTCON3.INT2IF", "r3.cpuregisters.intcon3.int2if", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon3_int3if, + { "INTCON3.INT3IF", "r3.cpuregisters.intcon3.int3if", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon3_int1ie, + { "INTCON3.INT1IE", "r3.cpuregisters.intcon3.int1ie", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon3_int2ie, + { "INTCON3.INT2IE", "r3.cpuregisters.intcon3.int2ie", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon3_int3ie, + { "INTCON3.INT3IE", "r3.cpuregisters.intcon3.int3ie", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon3_int1ip, + { "INTCON3.INT1IP", "r3.cpuregisters.intcon3.int1ip", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_intcon3_int2ip, + { "INTCON3.INT2IP", "r3.cpuregisters.intcon3.int2ip", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir1_tmr1if, + { "PIR1.TMR1IF", "r3.cpuregisters.pir1.tmr1if", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir1_tmr2if, + { "PIR1.TMR2IF", "r3.cpuregisters.pir1.tmr2if", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir1_ccp1if, + { "PIR1.CCP1IF", "r3.cpuregisters.pir1.ccp1if", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir1_ssp1if, + { "PIR1.SSP1IF", "r3.cpuregisters.pir1.ssp1if", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir1_tx1if, + { "PIR1.TX1IF", "r3.cpuregisters.pir1.tx1if", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir1_rc1if, + { "PIR1.RC1IF", "r3.cpuregisters.pir1.rc1if", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir1_adif, + { "PIR1.ADIF", "r3.cpuregisters.pir1.adif", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir1_pspif, + { "PIR1.PSPIF", "r3.cpuregisters.pir1.pspif", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir2_ccp2if, + { "PIR2.CCP2IF", "r3.cpuregisters.pir2.ccp2if", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir2_tmr3if, + { "PIR2.TMR3IF", "r3.cpuregisters.pir2.tmr3if", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir2_hlvdif, + { "PIR2.HLVDIF", "r3.cpuregisters.pir2.hlvdif", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir2_bcl1if, + { "PIR2.BCL1IF", "r3.cpuregisters.pir2.bcl1if", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir2_eeif, + { "PIR2.EEIF", "r3.cpuregisters.pir2.eeif", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir2_unused5, + { "PIR2.UNUSED5", "r3.cpuregisters.pir2.unused5", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir2_cmif, + { "PIR2.CMIF", "r3.cpuregisters.pir2.cmif", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir2_oscfif, + { "PIR2.OSCFIF", "r3.cpuregisters.pir2.oscfif", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir3_ccp3if, + { "PIR3.CCP3IF", "r3.cpuregisters.pir3.ccp3if", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir3_ccp4if, + { "PIR3.CCP4IF", "r3.cpuregisters.pir3.ccp4if", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir3_ccp5if, + { "PIR3.CCP5IF", "r3.cpuregisters.pir3.ccp5if", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir3_tmr4if, + { "PIR3.TMR4IF", "r3.cpuregisters.pir3.tmr4if", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir3_tx2if, + { "PIR3.TX2IF", "r3.cpuregisters.pir3.tx2if", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir3_rc2if, + { "PIR3.RC2IF", "r3.cpuregisters.pir3.rc2if", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir3_bcl2if, + { "PIR3.BCL2IF", "r3.cpuregisters.pir3.bcl2if", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pir3_ssp2if, + { "PIR3.SSP2IF", "r3.cpuregisters.pir3.ssp2if", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie1_tmr1ie, + { "PIE1.TMR1IE", "r3.cpuregisters.pie1.tmr1ie", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie1_tmr2ie, + { "PIE1.TMR2IE", "r3.cpuregisters.pie1.tmr2ie", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie1_ccp1ie, + { "PIE1.CCP1IE", "r3.cpuregisters.pie1.ccp1ie", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie1_ssp1ie, + { "PIE1.SSP1IE", "r3.cpuregisters.pie1.ssp1ie", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie1_tx1ie, + { "PIE1.TX1IE", "r3.cpuregisters.pie1.tx1ie", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie1_rc1ie, + { "PIE1.RC1IE", "r3.cpuregisters.pie1.rc1ie", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie1_adie, + { "PIE1.ADIE", "r3.cpuregisters.pie1.adie", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie1_pspie, + { "PIE1.PSPIE", "r3.cpuregisters.pie1.pspie", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie2_oscfie, + { "PIE2.OSCFIE", "r3.cpuregisters.pie2.oscfie", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie2_cmie, + { "PIE2.CMIE", "r3.cpuregisters.pie2.cmie", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie2_unused2, + { "PIE2.UNUSED2", "r3.cpuregisters.pie2.unused2", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie2_eeie, + { "PIE2.EEIE", "r3.cpuregisters.pie2.eeie", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie2_bcl1ie, + { "PIE2.BCL1IE", "r3.cpuregisters.pie2.bcl1ie", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie2_hlvdie, + { "PIE2.HLVDIE", "r3.cpuregisters.pie2.hlvdie", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie2_tmr3ie, + { "PIE2.TMR3IE", "r3.cpuregisters.pie2.tmr3ie", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie2_ccp2ie, + { "PIE2.CCP2IE", "r3.cpuregisters.pie2.ccp2ie", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie3_ccp3ie, + { "PIE3.CCP3IE", "r3.cpuregisters.pie3.ccp3ie", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie3_ccp4ie, + { "PIE3.CCP4IE", "r3.cpuregisters.pie3.ccp4ie", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie3_ccp5ie, + { "PIE3.CCP5IE", "r3.cpuregisters.pie3.ccp5ie", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie3_tmr4ie, + { "PIE3.TMR4IE", "r3.cpuregisters.pie3.tmr4ie", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie3_tx2ie, + { "PIE3.TX2IE", "r3.cpuregisters.pie3.tx2ie", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie3_rc2ie, + { "PIE3.RC2IE", "r3.cpuregisters.pie3.rc2ie", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie3_bcl2ie, + { "PIE3.BCL2IE", "r3.cpuregisters.pie3.bcl2ie", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_pie3_ssp2ie, + { "PIE3.SSP2IE", "r3.cpuregisters.pie3.ssp2ie", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr1_tmr1ip, + { "IPR1.TMR1IP", "r3.cpuregisters.ipr1.tmr1ip", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr1_tmr2ip, + { "IPR1.TMR2IP", "r3.cpuregisters.ipr1.tmr2ip", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr1_ccp1ip, + { "IPR1.CCP1IP", "r3.cpuregisters.ipr1.ccp1ip", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr1_ssp1ip, + { "IPR1.SSP1IP", "r3.cpuregisters.ipr1.ssp1ip", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr1_tx1ip, + { "IPR1.TX1IP", "r3.cpuregisters.ipr1.tx1ip", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr1_rc1ip, + { "IPR1.RC1IP", "r3.cpuregisters.ipr1.rc1ip", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr1_adip, + { "IPR1.ADIP", "r3.cpuregisters.ipr1.adip", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr1_pspip, + { "IPR1.PSPIP", "r3.cpuregisters.ipr1.pspip", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr2_ccp2ip, + { "IPR2.CCP2IP", "r3.cpuregisters.ipr2.ccp2ip", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr2_tmr3ip, + { "IPR2.TMR3IP", "r3.cpuregisters.ipr2.tmr3ip", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr2_hlvdip, + { "IPR2.HLVDIP", "r3.cpuregisters.ipr2.hlvdip", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr2_bcl1ip, + { "IPR2.BCL1IP", "r3.cpuregisters.ipr2.bcl1ip", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr2_eeip, + { "IPR2.EEIP", "r3.cpuregisters.ipr2.eeip", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr2_unused5, + { "IPR2.UNUSED5", "r3.cpuregisters.ipr2.unused5", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr2_cmip, + { "IPR2.CMIP", "r3.cpuregisters.ipr2.cmip", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr2_oscfip, + { "IPR2.OSCFIP", "r3.cpuregisters.ipr2.oscfip", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr3_ccp2ip, + { "IPR3.CCP2IP", "r3.cpuregisters.ipr3.ccp2ip", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr3_ccp4ip, + { "IPR3.CCP4IP", "r3.cpuregisters.ipr3.ccp4ip", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr3_ccp5ip, + { "IPR3.CCP5IP", "r3.cpuregisters.ipr3.ccp5ip", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr3_tmr4ip, + { "IPR3.TMR4IP", "r3.cpuregisters.ipr3.tmr4ip", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr3_tx2ip, + { "IPR3.TX2IP", "r3.cpuregisters.ipr3.tx2ip", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr3_rc2ip, + { "IPR3.RC2IP", "r3.cpuregisters.ipr3.rc2ip", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr3_bcl2ip, + { "IPR3.BCL2IP", "r3.cpuregisters.ipr3.bcl2ip", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_ipr3_ssp2ip, + { "IPR3.SSP2IP", "r3.cpuregisters.ipr3.ssp2ip", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcon_bor, + { "RCON./BOR", "r3.cpuregisters.rcon.bor", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcon_por, + { "RCON./POR", "r3.cpuregisters.rcon.por", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcon_pd, + { "RCON./PD", "r3.cpuregisters.rcon.pd", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcon_to, + { "RCON./TO", "r3.cpuregisters.rcon.to", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcon_unused4, + { "RCON.UNUSED4", "r3.cpuregisters.rcon.unused4", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcon_ri, + { "RCON./RI", "r3.cpuregisters.rcon.ri", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcon_sboren, + { "RCON.SBOREN", "r3.cpuregisters.rcon.sboren", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcon_ipen, + { "RCON.IPEN", "r3.cpuregisters.rcon.ipen", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_osccon_scs0, + { "OSCCON.SCS0", "r3.cpuregisters.osccon.scs0", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_osccon_scs1, + { "OSCCON.SCS1", "r3.cpuregisters.osccon.scs1", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_osccon_iofs, + { "OSCCON.IOFS", "r3.cpuregisters.osccon.iofs", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_osccon_osts, + { "OSCCON.OSTS", "r3.cpuregisters.osccon.osts", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_osccon_ircf0, + { "OSCCON.IRCF0", "r3.cpuregisters.osccon.ircf0", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_osccon_ircf1, + { "OSCCON.IRCF1", "r3.cpuregisters.osccon.ircf1", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_osccon_ircf2, + { "OSCCON.IRCF2", "r3.cpuregisters.osccon.ircf2", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_osccon_idlen, + { "OSCCON.IDLEN", "r3.cpuregisters.osccon.idlen", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta_rx9d, + { "RCSTA.RX9D", "r3.cpuregisters.rcsta.rx9d", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta_oerr, + { "RCSTA.OERR", "r3.cpuregisters.rcsta.oerr", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta_ferr, + { "RCSTA.FERR", "r3.cpuregisters.rcsta.ferr", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta_adden, + { "RCSTA.ADDEN", "r3.cpuregisters.rcsta.adden", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta_cren, + { "RCSTA.CREN", "r3.cpuregisters.rcsta.cren", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta_sren, + { "RCSTA.SREN", "r3.cpuregisters.rcsta.sren", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta_rx9, + { "RCSTA.RX9", "r3.cpuregisters.rcsta.rx9", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta_spen, + { "RCSTA.SPEN", "r3.cpuregisters.rcsta.spen", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta_tx9d, + { "TXSTA.TX9D", "r3.cpuregisters.txsta.tx9d", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta_trmt, + { "TXSTA.TRMT", "r3.cpuregisters.txsta.trmt", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta_brgh, + { "TXSTA.BRGH", "r3.cpuregisters.txsta.brgh", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta_sendb, + { "TXSTA.SENDB", "r3.cpuregisters.txsta.sendb", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta_sync, + { "TXSTA.SYNC", "r3.cpuregisters.txsta.sync", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta_txen, + { "TXSTA.TXEN", "r3.cpuregisters.txsta.txen", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta_tx9, + { "TXSTA.TX9", "r3.cpuregisters.txsta.tx9", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta_csrc, + { "TXSTA.CSRC", "r3.cpuregisters.txsta.csrc", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta2_rx9d, + { "RCSTA2.RX9D", "r3.cpuregisters.rcsta2.rx9d", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta2_oerr, + { "RCSTA2.OERR", "r3.cpuregisters.rcsta2.oerr", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta2_ferr, + { "RCSTA2.FERR", "r3.cpuregisters.rcsta2.ferr", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta2_adden, + { "RCSTA2.ADDEN", "r3.cpuregisters.rcsta2.adden", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta2_cren, + { "RCSTA2.CREN", "r3.cpuregisters.rcsta2.cren", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta2_sren, + { "RCSTA2.SREN", "r3.cpuregisters.rcsta2.sren", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta2_rx9, + { "RCSTA2.RX9", "r3.cpuregisters.rcsta2.rx9", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_rcsta2_spen, + { "RCSTA2.SPEN", "r3.cpuregisters.rcsta2.spen", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta2_tx9d, + { "TXSTA2.TX9D", "r3.cpuregisters.txsta2.tx9d", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta2_trmt, + { "TXSTA2.TRMT", "r3.cpuregisters.txsta2.trmt", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta2_brgh, + { "TXSTA2.BRGH", "r3.cpuregisters.txsta2.brgh", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta2_sendb, + { "TXSTA2.SENDB", "r3.cpuregisters.txsta2.sendb", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta2_sync, + { "TXSTA2.SYNC", "r3.cpuregisters.txsta2.sync", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta2_txen, + { "TXSTA2.TXEN", "r3.cpuregisters.txsta2.txen", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta2_tx9, + { "TXSTA2.TX9", "r3.cpuregisters.txsta2.tx9", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_txsta2_csrc, + { "TXSTA2.CSRC", "r3.cpuregisters.txsta2.csrc", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_wdtcon_swdten, + { "WDTCON.SWDTEN", "r3.cpuregisters.wdtcon.swdten", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_wdtcon_unused1, + { "WDTCON.UNUSED1", "r3.cpuregisters.wdtcon.unused1", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_wdtcon_unused2, + { "WDTCON.UNUSED2", "r3.cpuregisters.wdtcon.unused2", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_wdtcon_unused3, + { "WDTCON.UNUSED3", "r3.cpuregisters.wdtcon.unused3", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_wdtcon_unused4, + { "WDTCON.UNUSED4", "r3.cpuregisters.wdtcon.unused4", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_wdtcon_unused5, + { "WDTCON.UNUSED5", "r3.cpuregisters.wdtcon.unused5", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_wdtcon_unused6, + { "WDTCON.UNUSED6", "r3.cpuregisters.wdtcon.unused6", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL } + }, + { &hf_r3_cpuregisters_wdtcon_unused7, + { "WDTCON.UNUSED7", "r3.cpuregisters.wdtcon.unused7", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL } + }, + + { &hf_r3_dumpm41t81_reg00, + { "REG 0x00", "r3.m41t81.reg00", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg01, + { "REG 0x01", "r3.m41t81.reg01", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg02, + { "REG 0x02", "r3.m41t81.reg02", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg03, + { "REG 0x03", "r3.m41t81.reg03", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg04, + { "REG 0x04", "r3.m41t81.reg04", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg05, + { "REG 0x05", "r3.m41t81.reg05", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg06, + { "REG 0x06", "r3.m41t81.reg06", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg07, + { "REG 0x07", "r3.m41t81.reg07", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg08, + { "REG 0x08", "r3.m41t81.reg08", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg09, + { "REG 0x09", "r3.m41t81.reg09", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0a, + { "REG 0x0a", "r3.m41t81.reg0a", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0b, + { "REG 0x0b", "r3.m41t81.reg0b", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0c, + { "REG 0x0c", "r3.m41t81.reg0c", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0d, + { "REG 0x0d", "r3.m41t81.reg0d", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0e, + { "REG 0x0e", "r3.m41t81.reg0e", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0f, + { "REG 0x0f", "r3.m41t81.reg0f", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg10, + { "REG 0x10", "r3.m41t81.reg10", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg11, + { "REG 0x11", "r3.m41t81.reg11", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg12, + { "REG 0x12", "r3.m41t81.reg12", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg13, + { "REG 0x13", "r3.m41t81.reg13", + FT_UINT8, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_dumpm41t81_reg00_sec1, + { ".1 Seconds", "r3.m41t81.reg00.sec1", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg00_sec01, + { ".01 Seconds", "r3.m41t81.reg00.sec01", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg01_st, + { "ST", "r3.m41t81.reg01.st", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg01_10sec, + { "10 Seconds", "r3.m41t81.reg01.10sec", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg01_1sec, + { "1 Seconds", "r3.m41t81.reg01.1sec", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg02_notused, + { "(not used)", "r3.m41t81.reg02.notused", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg02_10min, + { "10 Minutes", "r3.m41t81.reg02.10min", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg02_1min, + { "1 Minutes", "r3.m41t81.reg02.1min", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg03_cbe, + { "CBE", "r3.m41t81.reg03.cbe", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg03_cb, + { "CB", "r3.m41t81.reg03.cb", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg03_10hour, + { "10 Hours", "r3.m41t81.reg03.10hour", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg03_1hour, + { "1 Hours", "r3.m41t81.reg03.1hour", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg04_notused, + { "(not used)", "r3.m41t81.reg04.notused", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg04_dow, + { "DOW", "r3.m41t81.reg04.dow", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg05_notused, + { "(not used)", "r3.m41t81.reg05.notused", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg05_10day, + { "10 Day", "r3.m41t81.reg05.10day", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg05_1day, + { "1 Day", "r3.m41t81.reg05.1day", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg06_notused, + { "(not used)", "r3.m41t81.reg06.notused", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg06_10month, + { "10 Month", "r3.m41t81.reg06.10month", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg06_1month, + { "1 Month", "r3.m41t81.reg06.1month", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg07_10year, + { "10 Year", "r3.m41t81.reg07.10year", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg07_1year, + { "1 Year", "r3.m41t81.reg07.1year", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg08_out, + { "OUT", "r3.m41t81.reg08.out", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg08_ft, + { "FT", "r3.m41t81.reg08.ft", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg08_s, + { "S", "r3.m41t81.reg08.s", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg08_cal, + { "CAL", "r3.m41t81.reg08.cal", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg09_notused, + { "(not used)", "r3.m41t81.reg09.notused", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg09_bmb, + { "BMB", "r3.m41t81.reg09.bmb", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg09_rb, + { "RB", "r3.m41t81.reg09.rb", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0a_afe, + { "AFE", "r3.m41t81.reg0a.afe", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0a_sqwe, + { "SQWE", "r3.m41t81.reg0a.sqwe", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0a_abe, + { "ABE", "r3.m41t81.reg0a.abe", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0a_10monthalm, + { "10 Month Alarm", "r3.m41t81.reg0a.10monthalm", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0a_1monthalm, + { "1 Month Alarm", "r3.m41t81.reg0a.1monthalm", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0b_rpt5, + { "RPT5", "r3.m41t81.reg0b.rpt5", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0b_rpt4, + { "RPT4", "r3.m41t81.reg0b.rpt4", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0b_10dayalm, + { "10 Day Alarm", "r3.m41t81.reg0b.10dayalm", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0b_1dayalm, + { "1 Day Alarm", "r3.m41t81.reg0b.1dayalm", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0c_rpt3, + { "RPT3", "r3.m41t81.reg0c.rpt3", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0c_ht, + { "HT", "r3.m41t81.reg0c.ht", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0c_10houralm, + { "10 Hour Alarm", "r3.m41t81.reg0c.10houralm", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0c_1houralm, + { "1 Hour Alarm", "r3.m41t81.reg0c.1houralm", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0d_rpt2, + { "RPT2", "r3.m41t81.reg0d.rpt2", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0d_10minalm, + { "10 Min Alarm", "r3.m41t81.reg0d.10minalm", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0d_1minalm, + { "1 Min Alarm", "r3.m41t81.reg0d.1minalm", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0e_rpt1, + { "RPT1", "r3.m41t81.reg0e.rpt1", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0e_10secalm, + { "10 Sec Alarm", "r3.m41t81.reg0e.10secalm", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0e_1secalm, + { "1 Sec Alarm", "r3.m41t81.reg0e.1secalm", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0f_wdf, + { "WDF", "r3.m41t81.reg0f.wdf", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0f_af, + { "AF", "r3.m41t81.reg0f.af", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg0f_notused, + { "(not used)", "r3.m41t81.reg0f.notused", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg10_notused, + { "(not used)", "r3.m41t81.reg10.notused", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg11_notused, + { "(not used)", "r3.m41t81.reg11.notused", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg12_notused, + { "(not used)", "r3.m41t81.reg12.notused", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg13_rs, + { "RS", "r3.m41t81.reg13.rs", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_dumpm41t81_reg13_notused, + { "(not used)", "r3.m41t81.reg13.notused", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_debuglog_recordnumber, + { "Record Number", "r3.debuglog.recordnumber", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_debuglog_flags, + { "Flags", "r3.debuglog.flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_debuglog_tick, + { "Tick", "r3.debuglog.tick", + FT_UINT16, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL } + }, + + { &hf_r3_adduserparamtype, + { "Upstream Field", "r3.manageuser", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypelength, + { "Field Length", "r3.manageuser.length", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypetype, + { "Field Type", "r3.manageuser.type", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_adduserparamtypenames_ext, 0x0, + NULL, HFILL } + }, +#if 0 + { &hf_r3_adduserparamtypedatalen, + { "Data Length", "r3.manageuser.datalen", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypeerror, + { "Error", "r3.manageuser.error", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, +#endif + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_DISPOSITION], + { "Disposition", "r3.manageuser.disposition", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_dispositionnames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_USERNO], + { "User Number", "r3.manageuser.usernumber", + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_ACCESSALWAYS], + { "Access Always", "r3.manageuser.accessalways", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_ACCESSMODE], + { "Access Mode", "r3.manageuser.accessmode", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_accessmodenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_CACHED], + { "Cached", "r3.manageuser.cached", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_USERTYPE], + { "User Type", "r3.manageuser.usertype", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_usertypenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_PRIMARYFIELD], + { "Primary Field", "r3.manageuser.primaryfield", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_PRIMARYFIELDTYPE], + { "Primary Field Type", "r3.manageuser.primaryfieldtype", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_AUXFIELD], + { "Aux Field", "r3.manageuser.auxfield", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_AUXFIELDTYPE], + { "Aux Field Type", "r3.manageuser.auxfieldtype", + FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_ppmisourcenames_ext, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_USECOUNT], + { "Use Count", "r3.manageuser.usecount", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_EXCEPTIONGROUP], + { "Exception Group", "r3.manageuser.exceptiongroup", + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_EXPIREON], + { "Expire On", "r3.manageuser.expireon", + FT_UINT24, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_TIMEZONE], + { "Timezone", "r3.manageuser.timezone", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + } + }; /* Setup protocol subtree array */ static gint *ett [] = - { - &ett_r3, - &ett_r3header, - &ett_r3tail, - &ett_r3payload, - &ett_r3cmd, - &ett_r3configitem, - &ett_r3upstreamcommand, - &ett_r3upstreamfield, - &ett_r3timezone, - &ett_r3expireon, - &ett_r3datetime, - &ett_r3eventlogrecord, - &ett_r3declinedlogrecord, - &ett_r3alarmlogrecord, - &ett_r3debugmsg, - &ett_r3defineexceptionstartdate, - &ett_r3defineexceptionenddate, - &ett_r3defineexceptiongroupbits, - &ett_r3definecalendarmonth [1], - &ett_r3definecalendarmonth [2], - &ett_r3definecalendarmonth [3], - &ett_r3definecalendarmonth [4], - &ett_r3definecalendarmonth [5], - &ett_r3definecalendarmonth [6], - &ett_r3definecalendarmonth [7], - &ett_r3definecalendarmonth [8], - &ett_r3definecalendarmonth [9], - &ett_r3definecalendarmonth [10], - &ett_r3definecalendarmonth [11], - &ett_r3definecalendarmonth [12], - &ett_r3definetimezonestarttime, - &ett_r3definetimezoneendtime, - &ett_r3definetimezonedaymap, - &ett_r3eventlogdumpstarttime, - &ett_r3eventlogdumpendtime, - &ett_r3declinedlogdumpstarttime, - &ett_r3declinedlogdumpendtime, - &ett_r3alarmlogdumpstarttime, - &ett_r3alarmlogdumpendtime, - &ett_r3clearnvram, - &ett_r3filters, - &ett_r3alarmlist, - &ett_r3alarmcfg, - &ett_r3commandmfg, - &ett_r3serialnumber, - &ett_r3iopins, - &ett_r3checksumresults, - &ett_r3checksumresultsfield, - &ett_r3forceoptions, - &ett_r3peekpoke, - &ett_r3downloadfirmware, - &ett_r3capabilities, - &ett_r3lockstate, - &ett_r3mortisestatelog, - &ett_r3timerchain, - &ett_r3taskflags, - &ett_r3taskflagsentry, - &ett_r3checkpointlog, - &ett_r3checkpointlogentry, - &ett_r3cpuregisters, - &ett_r3cpuregister, - &ett_r3m41t81registers, - &ett_r3m41t81register, - &ett_r3debuglogrecord, - &ett_r3setdatetime, - &ett_r3manageuser - }; + { + &ett_r3, + &ett_r3header, + &ett_r3tail, + &ett_r3payload, + &ett_r3cmd, + &ett_r3configitem, + &ett_r3upstreamcommand, + &ett_r3upstreamfield, + &ett_r3timezone, + &ett_r3expireon, + &ett_r3datetime, + &ett_r3eventlogrecord, + &ett_r3declinedlogrecord, + &ett_r3alarmlogrecord, + &ett_r3debugmsg, + &ett_r3defineexceptionstartdate, + &ett_r3defineexceptionenddate, + &ett_r3defineexceptiongroupbits, + &ett_r3definecalendarmonth [1], + &ett_r3definecalendarmonth [2], + &ett_r3definecalendarmonth [3], + &ett_r3definecalendarmonth [4], + &ett_r3definecalendarmonth [5], + &ett_r3definecalendarmonth [6], + &ett_r3definecalendarmonth [7], + &ett_r3definecalendarmonth [8], + &ett_r3definecalendarmonth [9], + &ett_r3definecalendarmonth [10], + &ett_r3definecalendarmonth [11], + &ett_r3definecalendarmonth [12], + &ett_r3definetimezonestarttime, + &ett_r3definetimezoneendtime, + &ett_r3definetimezonedaymap, + &ett_r3eventlogdumpstarttime, + &ett_r3eventlogdumpendtime, + &ett_r3declinedlogdumpstarttime, + &ett_r3declinedlogdumpendtime, + &ett_r3alarmlogdumpstarttime, + &ett_r3alarmlogdumpendtime, + &ett_r3clearnvram, + &ett_r3filters, + &ett_r3alarmlist, + &ett_r3alarmcfg, + &ett_r3commandmfg, + &ett_r3serialnumber, + &ett_r3iopins, + &ett_r3checksumresults, + &ett_r3checksumresultsfield, + &ett_r3forceoptions, + &ett_r3peekpoke, + &ett_r3downloadfirmware, + &ett_r3capabilities, + &ett_r3lockstate, + &ett_r3mortisestatelog, + &ett_r3timerchain, + &ett_r3taskflags, + &ett_r3taskflagsentry, + &ett_r3checkpointlog, + &ett_r3checkpointlogentry, + &ett_r3cpuregisters, + &ett_r3cpuregister, + &ett_r3m41t81registers, + &ett_r3m41t81register, + &ett_r3debuglogrecord, + &ett_r3setdatetime, + &ett_r3manageuser + }; static ei_register_info ei[] = { - { &ei_r3_malformed_length, { "r3.malformed_length", PI_MALFORMED, PI_ERROR, "Malformed length", EXPFILL }}, - { &ei_r3_reserved_upstream_command_value, { "r3.reserved_upstream_command_value", PI_UNDECODED, PI_WARN, "\"Reserved\" Upstream Command value", EXPFILL }}, - { &ei_r3_mfgfield, { "r3.mfgfield.field.unknown", PI_UNDECODED, PI_WARN, "Unknown manufacturing command value", EXPFILL }}, - { &ei_r3_mfgfield_too_many_adc_values, { "r3.mfgfield.too_many_adc_values", PI_PROTOCOL, PI_WARN, "MFG Field: too many adc values", EXPFILL }}, - { &ei_r3_peekpoke_operation, { "r3.peekpoke.operation.unknown", PI_UNDECODED, PI_WARN, "Unknown peekpoke operation value", EXPFILL }}, - { &ei_r3_response_hasdata_octet_1, { "r3.response_hasdata.octet_1_not_cmd_response", PI_PROTOCOL, PI_WARN, "Octet 1 not CMD_RESPONSE", EXPFILL }}, - { &ei_r3_response_hasdata_octet_2, { "r3.response_hasdata.octet_2_not_response_hasdata", PI_PROTOCOL, PI_WARN, "Octet 2 not RESPONSE_HASDATA", EXPFILL }}, - { &ei_r3_response_hasdata_octet_3, { "r3.response_hasdata.octet_3_ge_upstreamcommand_last", PI_PROTOCOL, PI_WARN, "Octet 3 >= UPSTREAMCOMMAND_LAST", EXPFILL }}, - { &ei_r3_firmwaredownload_action, { "r3.firmwaredownload.action.unknown", PI_PROTOCOL, PI_WARN, "Unknown Firmware download action", EXPFILL }}, - { &ei_r3_cmd_downloadfirmwaretimeout, { "r3.r3.command.downloadfirmwaretimeout", PI_UNDECODED, PI_WARN, "Download Firmware Timeout", EXPFILL }}, - { &ei_r3_unknown_command_value, { "r3.command.unknown", PI_UNDECODED, PI_WARN, "Unknown command value", EXPFILL }}, + { &ei_r3_malformed_length, { "r3.malformed_length", PI_MALFORMED, PI_ERROR, "Malformed length", EXPFILL }}, + { &ei_r3_reserved_upstream_command_value, { "r3.reserved_upstream_command_value", PI_UNDECODED, PI_WARN, "\"Reserved\" Upstream Command value", EXPFILL }}, + { &ei_r3_mfgfield, { "r3.mfgfield.field.unknown", PI_UNDECODED, PI_WARN, "Unknown manufacturing command value", EXPFILL }}, + { &ei_r3_mfgfield_too_many_adc_values, { "r3.mfgfield.too_many_adc_values", PI_PROTOCOL, PI_WARN, "MFG Field: too many adc values", EXPFILL }}, + { &ei_r3_peekpoke_operation, { "r3.peekpoke.operation.unknown", PI_UNDECODED, PI_WARN, "Unknown peekpoke operation value", EXPFILL }}, + { &ei_r3_response_hasdata_octet_1, { "r3.response_hasdata.octet_1_not_cmd_response", PI_PROTOCOL, PI_WARN, "Octet 1 not CMD_RESPONSE", EXPFILL }}, + { &ei_r3_response_hasdata_octet_2, { "r3.response_hasdata.octet_2_not_response_hasdata", PI_PROTOCOL, PI_WARN, "Octet 2 not RESPONSE_HASDATA", EXPFILL }}, + { &ei_r3_response_hasdata_octet_3, { "r3.response_hasdata.octet_3_ge_upstreamcommand_last", PI_PROTOCOL, PI_WARN, "Octet 3 >= UPSTREAMCOMMAND_LAST", EXPFILL }}, + { &ei_r3_firmwaredownload_action, { "r3.firmwaredownload.action.unknown", PI_PROTOCOL, PI_WARN, "Unknown Firmware download action", EXPFILL }}, + { &ei_r3_cmd_downloadfirmwaretimeout, { "r3.r3.command.downloadfirmwaretimeout", PI_UNDECODED, PI_WARN, "Download Firmware Timeout", EXPFILL }}, + { &ei_r3_unknown_command_value, { "r3.command.unknown", PI_UNDECODED, PI_WARN, "Unknown command value", EXPFILL }}, }; expert_module_t* expert_r3; diff --git a/epan/dissectors/packet-atmtcp.c b/epan/dissectors/packet-atmtcp.c index 23af488242..2353eb4814 100644 --- a/epan/dissectors/packet-atmtcp.c +++ b/epan/dissectors/packet-atmtcp.c @@ -92,7 +92,7 @@ dissect_atmtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ length = tvb_get_ntohl(tvb, offset); if(length == ATMTCP_HDR_MAGIC) { - col_append_str(pinfo->cinfo, COL_INFO, " Command"); + col_append_str(pinfo->cinfo, COL_INFO, " Command"); } else { diff --git a/epan/dissectors/packet-cip.h b/epan/dissectors/packet-cip.h index bc3a437cef..1d71f572d2 100644 --- a/epan/dissectors/packet-cip.h +++ b/epan/dissectors/packet-cip.h @@ -263,13 +263,13 @@ typedef int attribute_dissector_func(packet_info *pinfo, proto_tree *tree, proto int offset, int total_len); typedef struct attribute_info { - guint class_id; - gboolean class_instance; - guint attribute; - const char *text; - enum cip_datatype datatype; - int* phf; - attribute_dissector_func* pdissect; + guint class_id; + gboolean class_instance; + guint attribute; + const char *text; + enum cip_datatype datatype; + int* phf; + attribute_dissector_func *pdissect; } attribute_info_t; typedef struct cip_connID_info { @@ -287,25 +287,25 @@ typedef struct cip_safety_epath_info { } cip_safety_epath_info_t; typedef struct cip_conn_info { - guint16 ConnSerialNumber; - guint16 VendorID; - guint32 DeviceSerialNumber; - cip_connID_info_t O2T; - cip_connID_info_t T2O; - guint8 TransportClass_trigger; + guint16 ConnSerialNumber; + guint16 VendorID; + guint32 DeviceSerialNumber; + cip_connID_info_t O2T; + cip_connID_info_t T2O; + guint8 TransportClass_trigger; cip_safety_epath_info_t safety; - gboolean motion; + gboolean motion; } cip_conn_info_t; typedef struct cip_req_info { - dissector_handle_t dissector; - guint8 bService; - guint IOILen; - void *pIOI; - void *pData; - cip_simple_request_info_t* ciaData; - cip_conn_info_t* connInfo; - gboolean isUnconnectedSend; + dissector_handle_t dissector; + guint8 bService; + guint IOILen; + void *pIOI; + void *pData; + cip_simple_request_info_t *ciaData; + cip_conn_info_t* connInfo; + gboolean isUnconnectedSend; } cip_req_info_t; /* diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 6fd3bcdaaa..77f1b5eaea 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -735,7 +735,7 @@ decode_dcerpc_binding_free(void *binding_in) g_free((void *) binding->addr_a.data); g_free((void *) binding->addr_b.data); - if(binding->ifname) + if (binding->ifname) g_string_free(binding->ifname, TRUE); g_free(binding); } @@ -754,7 +754,7 @@ decode_dcerpc_reset_all(void) { decode_dcerpc_bind_values_t *binding; - while(decode_dcerpc_bindings) { + while (decode_dcerpc_bindings) { binding = (decode_dcerpc_bind_values_t *)decode_dcerpc_bindings->data; decode_dcerpc_binding_free(binding); @@ -778,7 +778,7 @@ dcerpc_prompt(packet_info *pinfo, gchar* result) *address_str = g_string_new(""); dcerpc_decode_as_data* decode_data = dcerpc_get_decode_data(pinfo); - switch(pinfo->ptype) { + switch (pinfo->ptype) { case(PT_TCP): g_string_append(address_str, "Address: ToBeDone TCP port"); break; @@ -837,7 +837,7 @@ decode_dcerpc_add_to_list(gpointer key, gpointer value, gpointer user_data) /*dcerpc_uuid_key *k = key;*/ dcerpc_uuid_value *v = (dcerpc_uuid_value *)value; - if(strcmp(v->name, "(none)")) + if (strcmp(v->name, "(none)")) populate->add_to_list("DCE-RPC", v->name, key, populate->ui_element); } @@ -861,7 +861,7 @@ decode_dcerpc_binding_cmp(gconstpointer a, gconstpointer b) /* don't compare uuid and ver! */ - if( + if ( ADDRESSES_EQUAL(&binding_a->addr_a, &binding_b->addr_a) && ADDRESSES_EQUAL(&binding_a->addr_b, &binding_b->addr_b) && binding_a->ptype == binding_b->ptype && @@ -890,7 +890,7 @@ decode_dcerpc_binding_reset(const char *name _U_, const gpointer pattern) le = g_slist_find_custom(decode_dcerpc_bindings, binding, decode_dcerpc_binding_cmp); - if(le == NULL) + if (le == NULL) return FALSE; old_binding = (decode_dcerpc_bind_values_t *)le->data; @@ -912,9 +912,9 @@ dcerpc_decode_as_change(const char *name, const gpointer pattern, gpointer handl dcerpc_uuid_key *key = *((dcerpc_uuid_key**)handle); - binding->ifname = g_string_new(list_name); - binding->uuid = key->uuid; - binding->ver = key->ver; + binding->ifname = g_string_new(list_name); + binding->uuid = key->uuid; + binding->ver = key->ver; /* remove a probably existing old binding */ decode_dcerpc_binding_reset(name, binding); @@ -987,43 +987,43 @@ static reassembly_table dcerpc_co_reassembly_table; static reassembly_table dcerpc_cl_reassembly_table; typedef struct _dcerpc_fragment_key { - address src; - address dst; - guint32 id; - e_uuid_t act_id; + address src; + address dst; + guint32 id; + e_uuid_t act_id; } dcerpc_fragment_key; static guint dcerpc_fragment_hash(gconstpointer k) { - const dcerpc_fragment_key* key = (const dcerpc_fragment_key*) k; - guint hash_val; + const dcerpc_fragment_key* key = (const dcerpc_fragment_key*) k; + guint hash_val; - hash_val = 0; + hash_val = 0; - hash_val += key->id; - hash_val += key->act_id.Data1; - hash_val += key->act_id.Data2 << 16; - hash_val += key->act_id.Data3; + hash_val += key->id; + hash_val += key->act_id.Data1; + hash_val += key->act_id.Data2 << 16; + hash_val += key->act_id.Data3; - return hash_val; + return hash_val; } static gint dcerpc_fragment_equal(gconstpointer k1, gconstpointer k2) { - const dcerpc_fragment_key* key1 = (const dcerpc_fragment_key*) k1; - const dcerpc_fragment_key* key2 = (const dcerpc_fragment_key*) k2; - - /*key.id is the first item to compare since item is most - likely to differ between sessions, thus shortcircuiting - the comparison of addresses. - */ - return (((key1->id == key2->id) - && (ADDRESSES_EQUAL(&key1->src, &key2->src)) - && (ADDRESSES_EQUAL(&key1->dst, &key2->dst)) - && (memcmp (&key1->act_id, &key2->act_id, sizeof (e_uuid_t)) == 0)) - ? TRUE : FALSE); + const dcerpc_fragment_key* key1 = (const dcerpc_fragment_key*) k1; + const dcerpc_fragment_key* key2 = (const dcerpc_fragment_key*) k2; + + /*key.id is the first item to compare since item is most + likely to differ between sessions, thus shortcircuiting + the comparison of addresses. + */ + return (((key1->id == key2->id) + && (ADDRESSES_EQUAL(&key1->src, &key2->src)) + && (ADDRESSES_EQUAL(&key1->dst, &key2->dst)) + && (memcmp (&key1->act_id, &key2->act_id, sizeof (e_uuid_t)) == 0)) + ? TRUE : FALSE); } /* allocate a persistent dcerpc fragment key to insert in the hash */ @@ -1031,15 +1031,15 @@ static void * dcerpc_fragment_temporary_key(const packet_info *pinfo, const guint32 id, const void *data) { - dcerpc_fragment_key *key = g_slice_new(dcerpc_fragment_key); - e_dce_dg_common_hdr_t *hdr = (e_dce_dg_common_hdr_t *)data; + dcerpc_fragment_key *key = g_slice_new(dcerpc_fragment_key); + e_dce_dg_common_hdr_t *hdr = (e_dce_dg_common_hdr_t *)data; - key->src = pinfo->src; - key->dst = pinfo->dst; - key->id = id; - key->act_id = hdr->act_id; + key->src = pinfo->src; + key->dst = pinfo->dst; + key->id = id; + key->act_id = hdr->act_id; - return key; + return key; } /* allocate a persistent dcerpc fragment key to insert in the hash */ @@ -1047,49 +1047,49 @@ static void * dcerpc_fragment_persistent_key(const packet_info *pinfo, const guint32 id, const void *data) { - dcerpc_fragment_key *key = g_slice_new(dcerpc_fragment_key); - e_dce_dg_common_hdr_t *hdr = (e_dce_dg_common_hdr_t *)data; + dcerpc_fragment_key *key = g_slice_new(dcerpc_fragment_key); + e_dce_dg_common_hdr_t *hdr = (e_dce_dg_common_hdr_t *)data; - COPY_ADDRESS(&key->src, &pinfo->src); - COPY_ADDRESS(&key->dst, &pinfo->dst); - key->id = id; - key->act_id = hdr->act_id; + COPY_ADDRESS(&key->src, &pinfo->src); + COPY_ADDRESS(&key->dst, &pinfo->dst); + key->id = id; + key->act_id = hdr->act_id; - return key; + return key; } static void dcerpc_fragment_free_temporary_key(gpointer ptr) { - dcerpc_fragment_key *key = (dcerpc_fragment_key *)ptr; + dcerpc_fragment_key *key = (dcerpc_fragment_key *)ptr; - if(key) - g_slice_free(dcerpc_fragment_key, key); + if (key) + g_slice_free(dcerpc_fragment_key, key); } static void dcerpc_fragment_free_persistent_key(gpointer ptr) { - dcerpc_fragment_key *key = (dcerpc_fragment_key *)ptr; + dcerpc_fragment_key *key = (dcerpc_fragment_key *)ptr; - if(key){ - /* - * Free up the copies of the addresses from the old key. - */ - g_free((gpointer)key->src.data); - g_free((gpointer)key->dst.data); + if (key) { + /* + * Free up the copies of the addresses from the old key. + */ + g_free((gpointer)key->src.data); + g_free((gpointer)key->dst.data); - g_slice_free(dcerpc_fragment_key, key); - } + g_slice_free(dcerpc_fragment_key, key); + } } static const reassembly_table_functions dcerpc_cl_reassembly_table_functions = { - dcerpc_fragment_hash, - dcerpc_fragment_equal, - dcerpc_fragment_temporary_key, - dcerpc_fragment_persistent_key, - dcerpc_fragment_free_temporary_key, - dcerpc_fragment_free_persistent_key + dcerpc_fragment_hash, + dcerpc_fragment_equal, + dcerpc_fragment_temporary_key, + dcerpc_fragment_persistent_key, + dcerpc_fragment_free_temporary_key, + dcerpc_fragment_free_persistent_key }; static void @@ -1767,7 +1767,7 @@ dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree_add_uint(tree, hf_dcerpc_array_max_count, tvb, di->array_max_count_offset, conformance_size, di->array_max_count); /* real run, dissect the elements */ - for(i=0; i<di->array_max_count; i++) { + for (i=0; i<di->array_max_count; i++) { offset = (*fnct)(tvb, offset, pinfo, tree, di, drep); } } @@ -1826,7 +1826,7 @@ dissect_ndr_ucvarray_core(tvbuff_t *tvb, gint offset, packet_info *pinfo, if (fnct_block) { offset = (*fnct_block)(tvb, offset, di->array_actual_count, pinfo, tree, drep); } else { - for(i=0 ;i<di->array_actual_count; i++) { + for (i=0 ;i<di->array_actual_count; i++) { old_offset = offset; offset = (*fnct_bytes)(tvb, offset, pinfo, tree, di, drep); if (offset <= old_offset) @@ -1891,7 +1891,7 @@ dissect_ndr_uvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree_add_uint(tree, hf_dcerpc_array_actual_count, tvb, di->array_actual_count_offset, conformance_size, di->array_actual_count); /* real run, dissect the elements */ - for(i=0; i<di->array_actual_count; i++) { + for (i=0; i<di->array_actual_count; i++) { offset = (*fnct)(tvb, offset, pinfo, tree, di, drep); } } @@ -2327,7 +2327,7 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, dcerpc_ found_new_pointer = 0; len = g_slist_length(ndr_pointer_list); - for(i=next_pointer; i<len; i++) { + for (i=next_pointer; i<len; i++) { ndr_pointer_data_t *tnpd = (ndr_pointer_data_t *)g_slist_nth_data(ndr_pointer_list, i); if (tnpd->fnct) { dcerpc_dissect_fnct_t *fnct; @@ -2463,7 +2463,7 @@ find_pointer_index(guint32 id) int i,len; len = g_slist_length(ndr_pointer_list); - for(i=0; i<len; i++) { + for (i=0; i<len; i++) { npd = (ndr_pointer_data_t *)g_slist_nth_data(ndr_pointer_list, i); if (npd) { if (npd->id == id) { diff --git a/epan/dissectors/packet-dvb-data-mpe.c b/epan/dissectors/packet-dvb-data-mpe.c index e7ac2cd666..5569d0eb38 100644 --- a/epan/dissectors/packet-dvb-data-mpe.c +++ b/epan/dissectors/packet-dvb-data-mpe.c @@ -96,18 +96,18 @@ dissect_dvb_data_mpe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mac_bytes_tvb[4] = tvb_new_subset(tvb, offset, 1, 1); offset += 1; - proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_payload_scrambling_control, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_address_scrambling_control, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_llc_snap_flag, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_current_next_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_llc_snap_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_current_next_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); llc_snap_flag = tvb_get_guint8(tvb, offset) & DVB_DATA_MPE_LLC_SNAP_FLAG_MASK; offset += 1; - proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_section_number, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_section_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_last_section_number, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dvb_data_mpe_tree, hf_dvb_data_mpe_last_section_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; for (i = 3; i >= 0; i--) { diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c index 93502a3317..9beea94b81 100644 --- a/epan/dissectors/packet-dvb-s2-bb.c +++ b/epan/dissectors/packet-dvb-s2-bb.c @@ -640,7 +640,7 @@ static int dissect_dvb_s2_gse(tvbuff_t *tvb, int cur_off, proto_tree *tree, pack col_append_str(pinfo->cinfo, COL_INFO, "0 "); } if (gse_proto < 0x0600 && gse_proto >= 0x100) { - /* Only display optional extension headers */ + /* Only display optional extension headers */ /* TODO: needs to be tested */ /* TODO: implementation needs to be checked (len of ext-header??) */ diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index ed022bc552..de05566c20 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -4684,9 +4684,9 @@ dissect_gtpv2_rfsp_index(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree int offset = 0; if(instance == 0){ - proto_tree_add_item(tree, hf_gtpv2_subscriber_rfsp, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_subscriber_rfsp, tvb, offset, 2, ENC_BIG_ENDIAN); }else if(instance == 1){ - proto_tree_add_item(tree, hf_gtpv2_rfsp_inuse, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_rfsp_inuse, tvb, offset, 2, ENC_BIG_ENDIAN); } } @@ -5653,38 +5653,38 @@ void proto_register_gtpv2(void) {"MSV (MS Validated)", "gtpv2.msv", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL} }, - {&hf_gtpv2_spare1, - {"Spare", "gtpv2.spare", - FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL} - }, - {&hf_gtpv2_spare2, - {"Spare", "gtpv2.spare", - FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL} - }, - {&hf_gtpv2_spare3, - {"Spare", "gtpv2.spare", - FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL} - }, - {&hf_gtpv2_s6af, - {"S6AF (Static IPv6 Address Flag)", "gtpv2.s6af", - FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL} - }, - {&hf_gtpv2_s4af, - {"S4AF (Static IPv4 Address Flag))", "gtpv2.s4af", - FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL} - }, - {&hf_gtpv2_mbmdt, - {"MBMDT (Management Based MDT allowed flag)", "gtpv2.mbmdt", - FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL} - }, - {&hf_gtpv2_israu, - {"ISRAU (ISR is activated for the UE)", "gtpv2.israu", - FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL} - }, - {&hf_gtpv2_ccrsi, - {"CCRSI (CSG Change Reporting support indication)", "gtpv2.ccrsi", - FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL} - }, + {&hf_gtpv2_spare1, + {"Spare", "gtpv2.spare", + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL} + }, + {&hf_gtpv2_spare2, + {"Spare", "gtpv2.spare", + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL} + }, + {&hf_gtpv2_spare3, + {"Spare", "gtpv2.spare", + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL} + }, + {&hf_gtpv2_s6af, + {"S6AF (Static IPv6 Address Flag)", "gtpv2.s6af", + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL} + }, + {&hf_gtpv2_s4af, + {"S4AF (Static IPv4 Address Flag))", "gtpv2.s4af", + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL} + }, + {&hf_gtpv2_mbmdt, + {"MBMDT (Management Based MDT allowed flag)", "gtpv2.mbmdt", + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL} + }, + {&hf_gtpv2_israu, + {"ISRAU (ISR is activated for the UE)", "gtpv2.israu", + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL} + }, + {&hf_gtpv2_ccrsi, + {"CCRSI (CSG Change Reporting support indication)", "gtpv2.ccrsi", + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL} + }, { &hf_gtpv2_pdn_type, {"PDN Type", "gtpv2.pdn_type", FT_UINT8, BASE_DEC, VALS(gtpv2_pdn_type_vals), 0x07, @@ -6556,9 +6556,9 @@ void proto_register_gtpv2(void) NULL, HFILL} }, { &hf_gtpv2_ue_time_zone_dst, - {"Daylight Saving Time", "gtpv2.ue_time_zone_dst", - FT_UINT8, BASE_DEC, VALS(gtpv2_ue_time_zone_dst_vals), 0x03, - NULL, HFILL} + {"Daylight Saving Time", "gtpv2.ue_time_zone_dst", + FT_UINT8, BASE_DEC, VALS(gtpv2_ue_time_zone_dst_vals), 0x03, + NULL, HFILL} }, { &hf_gtpv2_fq_csid_type, {"Node-ID Type", "gtpv2.fq_csid_type", @@ -6757,38 +6757,38 @@ void proto_register_gtpv2(void) }, { &hf_gtpv2_mbms_service_area_nr, {"Number of MBMS Service Area codes", "gtpv2.mbms_service_area_nr", - FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL} + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL} }, { &hf_gtpv2_mbms_service_area_id, {"MBMS Service Area code (Service Area Identity)", "gtpv2.mbms_service_area_id", - FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL} + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL} }, { &hf_gtpv2_mbms_session_id, {"MBMS Session Identifier", "gtpv2.mbms_session_id", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, { &hf_gtpv2_mbms_flow_id, {"MBMS Flow Identifier", "gtpv2.mbms_flow_id", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, { &hf_gtpv2_cteid, {"Common Tunnel Endpoint Identifier", "gtpv2.cetid", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL} + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL} }, { &hf_gtpv2_ip_addr_type, {"IP Address Type", "gtpv2.ip_addr_type", - FT_UINT8, BASE_DEC, NULL, 0xc0, - NULL, HFILL} + FT_UINT8, BASE_DEC, NULL, 0xc0, + NULL, HFILL} }, { &hf_gtpv2_ip_addr_len, {"IP Address Length", "gtpv2.ip_addr_len", - FT_UINT8, BASE_DEC, NULL, 0x3f, - NULL, HFILL} + FT_UINT8, BASE_DEC, NULL, 0x3f, + NULL, HFILL} }, { &hf_gtpv2_mbms_ip_mc_dist_addrv4, {"MBMS IP Multicast Distribution Address (IPv4)", "gtpv2.mbms_ip_mc_dist_addrv4", @@ -6812,43 +6812,43 @@ void proto_register_gtpv2(void) }, { &hf_gtpv2_mbms_hc_indicator, {"MBMS HC Indicator", "gtpv2.mbms_hc_indicator", - FT_UINT8, BASE_DEC, VALS(gtpv2_mbms_hc_indicator_vals), 0x0, - NULL, HFILL} + FT_UINT8, BASE_DEC, VALS(gtpv2_mbms_hc_indicator_vals), 0x0, + NULL, HFILL} }, { &hf_gtpv2_mbms_dist_indication, {"MBMS Distribution Indication", "gtpv2.mbms_dist_indication", - FT_UINT8, BASE_DEC, VALS(gtpv2_mbms_dist_indication_vals), 0x03, - NULL, HFILL} + FT_UINT8, BASE_DEC, VALS(gtpv2_mbms_dist_indication_vals), 0x03, + NULL, HFILL} }, { &hf_gtpv2_subscriber_rfsp, {"Subscribed RFSP Index", "gtpv2.subscriber_rfsp", - FT_INT16, BASE_DEC, NULL, 0x0, - NULL, HFILL} + FT_INT16, BASE_DEC, NULL, 0x0, + NULL, HFILL} }, { &hf_gtpv2_rfsp_inuse, {"RFSP Index in Use", "gtpv2.rfsp_inuse", - FT_INT16, BASE_DEC, NULL, 0x0, - NULL, HFILL} + FT_INT16, BASE_DEC, NULL, 0x0, + NULL, HFILL} }, { &hf_gtpv2_mbms_service_id, {"MBMS Service ID", "gtpv2.mbms_service_id", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, { &hf_gtpv2_add_flags_for_srvcc_ics, {"ICS (IMS Centralized Service)", "gtpv2.add_flags_for_srvcc_ics", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL} + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL} }, { &hf_gtpv2_vsrvcc_flag, {"VF (vSRVCC Flag)", "gtpv2.vsrvcc_flag", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL} + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL} }, { &hf_gtpv2_henb_info_report_fti, {"FTI", "gtpv2.henb_info_report_fti", - FT_BOOLEAN, 8, TFS(>pv2_henb_info_report_fti_vals), 0x01, - NULL, HFILL} + FT_BOOLEAN, 8, TFS(>pv2_henb_info_report_fti_vals), 0x01, + NULL, HFILL} }, { &hf_gtpv2_ip4cp_subnet_prefix_len, {"Subnet Prefix Length", "gtpv2.ip4cp_subnet_prefix_len", @@ -6862,13 +6862,13 @@ void proto_register_gtpv2(void) }, { &hf_gtpv2_change_report_flags_sncr, {"SNCR (Service Network Change to Report)", "gtpv2.change_report_flags_sncr", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL} + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL} }, { &hf_gtpv2_change_report_flags_tzcr, {"TZCR (Time Zone Change to Report)", "gtpv2.change_report_flags_tzcr", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL} + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL} }, {&hf_gtpv2_action_indication_val, {"Action Indication", "gtpv2.action_indication_val", @@ -6877,88 +6877,88 @@ void proto_register_gtpv2(void) }, { &hf_gtpv2_abs_time_mbms_data, {"Absolute Time of MBMS Data Transfer", "gtpv2.abs_time_mbms_data", - FT_STRING, BASE_NONE, NULL, 0, - NULL, HFILL} + FT_STRING, BASE_NONE, NULL, 0, + NULL, HFILL} }, { &hf_gtpv2_mbms_session_duration_days, {"MBMS Session Duration (days)", "gtpv2.mbms_session_duration_days", - FT_UINT24, BASE_DEC, NULL, 0x00007F, - NULL, HFILL} + FT_UINT24, BASE_DEC, NULL, 0x00007F, + NULL, HFILL} }, { &hf_gtpv2_mbms_session_duration_secs, {"MBMS Session Duration (seconds)", "gtpv2.mbms_session_duration_secs", - FT_UINT24, BASE_DEC, NULL, 0xFFFF80, - NULL, HFILL} + FT_UINT24, BASE_DEC, NULL, 0xFFFF80, + NULL, HFILL} }, { &hf_gtpv2_node_features_prn, {"PGW Restart Notification (PRN)", "gtpv2.node_features_prn", - FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, - NULL, HFILL} + FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, + NULL, HFILL} }, { &hf_gtpv2_node_features_mabr, {"Modify Access Bearers Request (MABR)", "gtpv2.node_features_mabr", - FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, - NULL, HFILL} + FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, + NULL, HFILL} }, { &hf_gtpv2_node_features_ntsr, {"Network Triggered Service Restoration (NTSR)", "gtpv2.node_features_ntsr", - FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, - NULL, HFILL} + FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, + NULL, HFILL} }, { &hf_gtpv2_time_to_data_xfer, {"MBMS Time to Data Transfer", "gtpv2.time_to_data_xfer", - FT_STRING, BASE_NONE, NULL, 0, - NULL, HFILL} + FT_STRING, BASE_NONE, NULL, 0, + NULL, HFILL} }, { &hf_gtpv2_arp_pvi, {"Pre-emption Vulnerability (PVI)", "gtpv2.arp_pvi", - FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01, - NULL, HFILL} + FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01, + NULL, HFILL} }, { &hf_gtpv2_arp_pl, {"Priority Level", "gtpv2.arp_pl", - FT_UINT8, BASE_DEC, NULL, 0x3c, - NULL, HFILL} + FT_UINT8, BASE_DEC, NULL, 0x3c, + NULL, HFILL} }, { &hf_gtpv2_arp_pci, {"Pre-emption Capability (PCI)", "gtpv2.arp_pci", - FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40, - NULL, HFILL} + FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40, + NULL, HFILL} }, { &hf_gtpv2_timer_unit, {"Timer unit", "gtpv2.timer_unit", - FT_UINT8, BASE_DEC, VALS(gtpv2_timer_unit_vals), 0xe0, - NULL, HFILL} + FT_UINT8, BASE_DEC, VALS(gtpv2_timer_unit_vals), 0xe0, + NULL, HFILL} }, { &hf_gtpv2_timer_value, {"Timer value", "gtpv2.timer_value", - FT_UINT8, BASE_DEC, NULL, 0x1f, - NULL, HFILL} + FT_UINT8, BASE_DEC, NULL, 0x1f, + NULL, HFILL} }, { &hf_gtpv2_lapi, {"LAPI (Low Access Priority Indication)", "gtpv2.lapi", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL} + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL} }, { &hf_gtpv2_mm_context_higher_br_16mb_flg_len, {"Length of Higher bitrates than 16 Mbps flag", "gtpv2.mm_context_higher_br_16mb_flg_len", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL} + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL} }, { &hf_gtpv2_mm_context_higher_br_16mb_flg, {"Higher bitrates than 16 Mbps flag", "gtpv2.mm_context_higher_br_16mb_flg", - FT_UINT8, BASE_DEC, VALS(gtpv2_mm_context_higher_br_16mb_flg_vals), 0x0, - NULL, HFILL} + FT_UINT8, BASE_DEC, VALS(gtpv2_mm_context_higher_br_16mb_flg_vals), 0x0, + NULL, HFILL} }, { &hf_gtpv2_mmbr_ul, - {"Max MBR/APN-AMBR for uplink", "gtpv2.mmbr_ul", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL} + {"Max MBR/APN-AMBR for uplink", "gtpv2.mmbr_ul", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL} }, { &hf_gtpv2_mmbr_dl, - {"Max MBR/APN-AMBR for downlink", "gtpv2.mmbr_dl", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL} + {"Max MBR/APN-AMBR for downlink", "gtpv2.mmbr_dl", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL} }, }; diff --git a/epan/dissectors/packet-hazelcast.c b/epan/dissectors/packet-hazelcast.c index 73533e5c5b..b5517ac29b 100644 --- a/epan/dissectors/packet-hazelcast.c +++ b/epan/dissectors/packet-hazelcast.c @@ -71,14 +71,14 @@ static int hf_hazelcast_values = -1; /* flags */ static int hf_hazelcast_flags = -1; -#define HAZELCAST_LOCKCOUNT_FLAG (1 << 0) -#define HAZELCAST_TIMEOUT_FLAG (1 << 1) -#define HAZELCAST_TTL_FLAG (1 << 2) -#define HAZELCAST_TXN_FLAG (1 << 3) -#define HAZELCAST_LONGVALUE_FLAG (1 << 4) -#define HAZELCAST_VERSION_FLAG (1 << 5) -#define HAZELCAST_CLIENT_FLAG (1 << 6) -#define HAZELCAST_LOCKADDRNULL_FLAG (1 << 7) +#define HAZELCAST_LOCKCOUNT_FLAG (1 << 0) +#define HAZELCAST_TIMEOUT_FLAG (1 << 1) +#define HAZELCAST_TTL_FLAG (1 << 2) +#define HAZELCAST_TXN_FLAG (1 << 3) +#define HAZELCAST_LONGVALUE_FLAG (1 << 4) +#define HAZELCAST_VERSION_FLAG (1 << 5) +#define HAZELCAST_CLIENT_FLAG (1 << 6) +#define HAZELCAST_LOCKADDRNULL_FLAG (1 << 7) static int hf_hazelcast_flags_lockCount = -1; static int hf_hazelcast_flags_timeout = -1; @@ -98,137 +98,137 @@ static gboolean hazelcast_desegment = TRUE; static guint gPORT_PREF = 5701; static const value_string operationTypes[] = { - {0, "NONE"}, - {1, "RESPONSE"}, - {2, "LOG"}, - {3, "HEARTBEAT"}, - {4, "JOIN_CHECK"}, - {5, "REMOTELY_PROCESS"}, - {6, "REMOTELY_PROCESS_AND_RESPOND"}, - {7, "REMOTELY_CALLABLE_BOOLEAN"}, - {8, "REMOTELY_CALLABLE_OBJECT"}, - {9, "EVENT"}, - {10, "EXECUTE"}, - {11, "CANCEL_EXECUTION"}, - {12, "ADD_LISTENER"}, - {13, "ADD_LISTENER_NO_RESPONSE"}, - {14, "REMOVE_LISTENER"}, - {15, "BLOCKING_ADD_KEY"}, - {16, "BLOCKING_REMOVE_KEY"}, - {17, "BLOCKING_OFFER_KEY"}, - {18, "BLOCKING_GENERATE_KEY"}, - {19, "BLOCKING_ITERATE"}, - {20, "BLOCKING_SIZE"}, - {21, "BLOCKING_TAKE_KEY"}, - {22, "BLOCKING_CANCEL_TAKE_KEY"}, - {23, "BLOCKING_SET"}, - {24, "BLOCKING_PEEK_KEY"}, - {25, "BLOCKING_GET_KEY_BY_INDEX"}, - {26, "BLOCKING_GET_INDEX_BY_KEY"}, - {27, "BLOCKING_QUEUE_POLL"}, - {28, "BLOCKING_QUEUE_OFFER"}, - {29, "BLOCKING_QUEUE_SIZE"}, - {30, "BLOCKING_QUEUE_PEEK"}, - {31, "BLOCKING_QUEUE_REMOVE"}, - {32, "TOPIC_PUBLISH"}, - {33, "ATOMIC_NUMBER_ADD_AND_GET"}, - {34, "ATOMIC_NUMBER_GET_AND_ADD"}, - {35, "ATOMIC_NUMBER_GET_AND_SET"}, - {36, "ATOMIC_NUMBER_COMPARE_AND_SET"}, - {37, "CONCURRENT_MAP_PUT"}, - {38, "CONCURRENT_MAP_PUT_ALL"}, - {39, "CONCURRENT_MAP_PUT_TRANSIENT"}, - {40, "CONCURRENT_MAP_SET"}, - {41, "CONCURRENT_MAP_MERGE"}, - {42, "CONCURRENT_MAP_ASYNC_MERGE"}, - {43, "CONCURRENT_MAP_WAN_MERGE"}, - {44, "CONCURRENT_MAP_TRY_PUT"}, - {45, "CONCURRENT_MAP_PUT_AND_UNLOCK"}, - {46, "CONCURRENT_MAP_GET"}, - {47, "CONCURRENT_MAP_GET_ALL"}, - {48, "CONCURRENT_MAP_REMOVE"}, - {49, "CONCURRENT_MAP_TRY_REMOVE"}, - {50, "CONCURRENT_MAP_REMOVE_ITEM"}, - {51, "CONCURRENT_MAP_GET_MAP_ENTRY"}, - {52, "CONCURRENT_MAP_GET_DATA_RECORD_ENTRY"}, - {53, "CONCURRENT_MAP_BLOCK_INFO"}, - {54, "CONCURRENT_MAP_BLOCK_MIGRATION_CHECK"}, - {55, "CONCURRENT_MAP_SIZE"}, - {56, "CONCURRENT_MAP_CONTAINS_KEY"}, - {57, "CONCURRENT_MAP_CONTAINS_ENTRY"}, - {58, "CONCURRENT_MAP_ITERATE_ENTRIES"}, - {59, "CONCURRENT_MAP_ITERATE_KEYS"}, - {60, "CONCURRENT_MAP_ITERATE_KEYS_ALL"}, - {61, "CONCURRENT_MAP_ITERATE_VALUES"}, - {62, "CONCURRENT_MAP_LOCK"}, - {63, "CONCURRENT_MAP_LOCK_MAP"}, - {64, "CONCURRENT_MAP_UNLOCK"}, - {65, "CONCURRENT_MAP_FORCE_UNLOCK"}, - {66, "CONCURRENT_MAP_UNLOCK_MAP"}, - {67, "CONCURRENT_MAP_BLOCKS"}, - {68, "CONCURRENT_MAP_CONTAINS_VALUE"}, - {69, "CONCURRENT_MAP_PUT_IF_ABSENT"}, - {70, "CONCURRENT_MAP_REMOVE_IF_SAME"}, - {71, "CONCURRENT_MAP_REPLACE_IF_NOT_NULL"}, - {72, "CONCURRENT_MAP_REPLACE_IF_SAME"}, - {73, "CONCURRENT_MAP_TRY_LOCK_AND_GET"}, - {74, "CONCURRENT_MAP_ADD_TO_LIST"}, - {75, "CONCURRENT_MAP_ADD_TO_SET"}, - {76, "CONCURRENT_MAP_MIGRATE_RECORD"}, - {77, "CONCURRENT_MAP_PUT_MULTI"}, - {78, "CONCURRENT_MAP_REMOVE_MULTI"}, - {79, "CONCURRENT_MAP_VALUE_COUNT"}, - {80, "CONCURRENT_MAP_BACKUP_PUT"}, - {81, "CONCURRENT_MAP_BACKUP_REMOVE"}, - {82, "CONCURRENT_MAP_BACKUP_REMOVE_MULTI"}, - {83, "CONCURRENT_MAP_BACKUP_LOCK"}, - {84, "CONCURRENT_MAP_BACKUP_ADD"}, - {85, "CONCURRENT_MAP_INVALIDATE"}, - {86, "CONCURRENT_MAP_EVICT"}, - {87, "CONCURRENT_MAP_FLUSH"}, - {88, "TRANSACTION_BEGIN"}, - {89, "TRANSACTION_COMMIT"}, - {90, "TRANSACTION_ROLLBACK"}, - {91, "DESTROY"}, - {92, "GET_ID"}, - {93, "NEW_ID"}, - {94, "ADD_INDEX"}, - {95, "GET_INSTANCES"}, - {96, "GET_MEMBERS"}, - {97, "GET_CLUSTER_TIME"}, - {98, "CLIENT_AUTHENTICATE"}, - {99, "CLIENT_ADD_INSTANCE_LISTENER"}, - {100, "CLIENT_GET_PARTITIONS"}, - {101, "BLOCKING_QUEUE_REMAINING_CAPACITY"}, - {102, "BLOCKING_QUEUE_ENTRIES"}, - {103, "COUNT_DOWN_LATCH_AWAIT"}, - {104, "COUNT_DOWN_LATCH_COUNT_DOWN"}, - {105, "COUNT_DOWN_LATCH_DESTROY"}, - {106, "COUNT_DOWN_LATCH_GET_COUNT"}, - {107, "COUNT_DOWN_LATCH_GET_OWNER"}, - {108, "COUNT_DOWN_LATCH_SET_COUNT"}, - {109, "SEMAPHORE_ATTACH_DETACH_PERMITS"}, - {110, "SEMAPHORE_CANCEL_ACQUIRE"}, - {111, "SEMAPHORE_DESTROY"}, - {112, "SEMAPHORE_DRAIN_PERMITS"}, - {113, "SEMAPHORE_GET_ATTACHED_PERMITS"}, - {114, "SEMAPHORE_GET_AVAILABLE_PERMITS"}, - {115, "SEMAPHORE_REDUCE_PERMITS"}, - {116, "SEMAPHORE_RELEASE"}, - {117, "SEMAPHORE_TRY_ACQUIRE"}, - {118, "LOCK_LOCK"}, - {119, "LOCK_UNLOCK"}, - {120, "LOCK_FORCE_UNLOCK"}, - {0 , NULL} + {0, "NONE"}, + {1, "RESPONSE"}, + {2, "LOG"}, + {3, "HEARTBEAT"}, + {4, "JOIN_CHECK"}, + {5, "REMOTELY_PROCESS"}, + {6, "REMOTELY_PROCESS_AND_RESPOND"}, + {7, "REMOTELY_CALLABLE_BOOLEAN"}, + {8, "REMOTELY_CALLABLE_OBJECT"}, + {9, "EVENT"}, + {10, "EXECUTE"}, + {11, "CANCEL_EXECUTION"}, + {12, "ADD_LISTENER"}, + {13, "ADD_LISTENER_NO_RESPONSE"}, + {14, "REMOVE_LISTENER"}, + {15, "BLOCKING_ADD_KEY"}, + {16, "BLOCKING_REMOVE_KEY"}, + {17, "BLOCKING_OFFER_KEY"}, + {18, "BLOCKING_GENERATE_KEY"}, + {19, "BLOCKING_ITERATE"}, + {20, "BLOCKING_SIZE"}, + {21, "BLOCKING_TAKE_KEY"}, + {22, "BLOCKING_CANCEL_TAKE_KEY"}, + {23, "BLOCKING_SET"}, + {24, "BLOCKING_PEEK_KEY"}, + {25, "BLOCKING_GET_KEY_BY_INDEX"}, + {26, "BLOCKING_GET_INDEX_BY_KEY"}, + {27, "BLOCKING_QUEUE_POLL"}, + {28, "BLOCKING_QUEUE_OFFER"}, + {29, "BLOCKING_QUEUE_SIZE"}, + {30, "BLOCKING_QUEUE_PEEK"}, + {31, "BLOCKING_QUEUE_REMOVE"}, + {32, "TOPIC_PUBLISH"}, + {33, "ATOMIC_NUMBER_ADD_AND_GET"}, + {34, "ATOMIC_NUMBER_GET_AND_ADD"}, + {35, "ATOMIC_NUMBER_GET_AND_SET"}, + {36, "ATOMIC_NUMBER_COMPARE_AND_SET"}, + {37, "CONCURRENT_MAP_PUT"}, + {38, "CONCURRENT_MAP_PUT_ALL"}, + {39, "CONCURRENT_MAP_PUT_TRANSIENT"}, + {40, "CONCURRENT_MAP_SET"}, + {41, "CONCURRENT_MAP_MERGE"}, + {42, "CONCURRENT_MAP_ASYNC_MERGE"}, + {43, "CONCURRENT_MAP_WAN_MERGE"}, + {44, "CONCURRENT_MAP_TRY_PUT"}, + {45, "CONCURRENT_MAP_PUT_AND_UNLOCK"}, + {46, "CONCURRENT_MAP_GET"}, + {47, "CONCURRENT_MAP_GET_ALL"}, + {48, "CONCURRENT_MAP_REMOVE"}, + {49, "CONCURRENT_MAP_TRY_REMOVE"}, + {50, "CONCURRENT_MAP_REMOVE_ITEM"}, + {51, "CONCURRENT_MAP_GET_MAP_ENTRY"}, + {52, "CONCURRENT_MAP_GET_DATA_RECORD_ENTRY"}, + {53, "CONCURRENT_MAP_BLOCK_INFO"}, + {54, "CONCURRENT_MAP_BLOCK_MIGRATION_CHECK"}, + {55, "CONCURRENT_MAP_SIZE"}, + {56, "CONCURRENT_MAP_CONTAINS_KEY"}, + {57, "CONCURRENT_MAP_CONTAINS_ENTRY"}, + {58, "CONCURRENT_MAP_ITERATE_ENTRIES"}, + {59, "CONCURRENT_MAP_ITERATE_KEYS"}, + {60, "CONCURRENT_MAP_ITERATE_KEYS_ALL"}, + {61, "CONCURRENT_MAP_ITERATE_VALUES"}, + {62, "CONCURRENT_MAP_LOCK"}, + {63, "CONCURRENT_MAP_LOCK_MAP"}, + {64, "CONCURRENT_MAP_UNLOCK"}, + {65, "CONCURRENT_MAP_FORCE_UNLOCK"}, + {66, "CONCURRENT_MAP_UNLOCK_MAP"}, + {67, "CONCURRENT_MAP_BLOCKS"}, + {68, "CONCURRENT_MAP_CONTAINS_VALUE"}, + {69, "CONCURRENT_MAP_PUT_IF_ABSENT"}, + {70, "CONCURRENT_MAP_REMOVE_IF_SAME"}, + {71, "CONCURRENT_MAP_REPLACE_IF_NOT_NULL"}, + {72, "CONCURRENT_MAP_REPLACE_IF_SAME"}, + {73, "CONCURRENT_MAP_TRY_LOCK_AND_GET"}, + {74, "CONCURRENT_MAP_ADD_TO_LIST"}, + {75, "CONCURRENT_MAP_ADD_TO_SET"}, + {76, "CONCURRENT_MAP_MIGRATE_RECORD"}, + {77, "CONCURRENT_MAP_PUT_MULTI"}, + {78, "CONCURRENT_MAP_REMOVE_MULTI"}, + {79, "CONCURRENT_MAP_VALUE_COUNT"}, + {80, "CONCURRENT_MAP_BACKUP_PUT"}, + {81, "CONCURRENT_MAP_BACKUP_REMOVE"}, + {82, "CONCURRENT_MAP_BACKUP_REMOVE_MULTI"}, + {83, "CONCURRENT_MAP_BACKUP_LOCK"}, + {84, "CONCURRENT_MAP_BACKUP_ADD"}, + {85, "CONCURRENT_MAP_INVALIDATE"}, + {86, "CONCURRENT_MAP_EVICT"}, + {87, "CONCURRENT_MAP_FLUSH"}, + {88, "TRANSACTION_BEGIN"}, + {89, "TRANSACTION_COMMIT"}, + {90, "TRANSACTION_ROLLBACK"}, + {91, "DESTROY"}, + {92, "GET_ID"}, + {93, "NEW_ID"}, + {94, "ADD_INDEX"}, + {95, "GET_INSTANCES"}, + {96, "GET_MEMBERS"}, + {97, "GET_CLUSTER_TIME"}, + {98, "CLIENT_AUTHENTICATE"}, + {99, "CLIENT_ADD_INSTANCE_LISTENER"}, + {100, "CLIENT_GET_PARTITIONS"}, + {101, "BLOCKING_QUEUE_REMAINING_CAPACITY"}, + {102, "BLOCKING_QUEUE_ENTRIES"}, + {103, "COUNT_DOWN_LATCH_AWAIT"}, + {104, "COUNT_DOWN_LATCH_COUNT_DOWN"}, + {105, "COUNT_DOWN_LATCH_DESTROY"}, + {106, "COUNT_DOWN_LATCH_GET_COUNT"}, + {107, "COUNT_DOWN_LATCH_GET_OWNER"}, + {108, "COUNT_DOWN_LATCH_SET_COUNT"}, + {109, "SEMAPHORE_ATTACH_DETACH_PERMITS"}, + {110, "SEMAPHORE_CANCEL_ACQUIRE"}, + {111, "SEMAPHORE_DESTROY"}, + {112, "SEMAPHORE_DRAIN_PERMITS"}, + {113, "SEMAPHORE_GET_ATTACHED_PERMITS"}, + {114, "SEMAPHORE_GET_AVAILABLE_PERMITS"}, + {115, "SEMAPHORE_REDUCE_PERMITS"}, + {116, "SEMAPHORE_RELEASE"}, + {117, "SEMAPHORE_TRY_ACQUIRE"}, + {118, "LOCK_LOCK"}, + {119, "LOCK_UNLOCK"}, + {120, "LOCK_FORCE_UNLOCK"}, + {0 , NULL} }; static value_string_ext operationTypes_ext = VALUE_STRING_EXT_INIT(operationTypes); static const value_string responseTypes[] = { - {2, "RESPONSE_NONE"}, - {3, "RESPONSE_SUCCESS"}, - {4, "RESPONSE_FAILURE"}, - {5, "RESPONSE_REDO"}, - {0, NULL} + {2, "RESPONSE_NONE"}, + {3, "RESPONSE_SUCCESS"}, + {4, "RESPONSE_FAILURE"}, + {5, "RESPONSE_REDO"}, + {0, NULL} }; static value_string_ext responseTypes_ext = VALUE_STRING_EXT_INIT(responseTypes); @@ -238,191 +238,191 @@ static value_string_ext responseTypes_ext = VALUE_STRING_EXT_INIT(responseTypes) /* Get the length of a single HAZELCAST message */ static guint get_hazelcast_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) { - guint messageLength; - guint headerKeyLength; - guint headerValueLength; + guint messageLength; + guint headerKeyLength; + guint headerValueLength; - messageLength = tvb_get_ntohl(tvb, offset); + messageLength = tvb_get_ntohl(tvb, offset); - headerKeyLength = tvb_get_ntohl(tvb, offset+4); + headerKeyLength = tvb_get_ntohl(tvb, offset+4); - headerValueLength = tvb_get_ntohl(tvb, offset+8); + headerValueLength = tvb_get_ntohl(tvb, offset+8); - /* - * * That length doesn't include the length of the header itself add that in. - */ - return messageLength + headerKeyLength + headerValueLength + 13; + /* + * * That length doesn't include the length of the header itself add that in. + */ + return messageLength + headerKeyLength + headerValueLength + 13; } static int dissect_hazelcast_message(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint8 version; + guint8 version; - guint8 flags; - guint8 operation; + guint8 flags; + guint8 operation; - guint8 lockCountFlag; - guint8 timeoutFlag; - guint8 ttlFlag; - guint8 txnFlag; - guint8 longValueFlag; - guint8 versionFlag; - guint8 lockAddrNullFlag; - - guint32 nameLength; - guint32 keyLength; - guint32 valueLength; - gint offset = 0; - - proto_tree *hcast_tree = NULL; - proto_tree *flag_tree = NULL; - - proto_item *tf = NULL; - - /* Make entries in Protocol column and Info column on summary display */ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HAZELCAST"); - col_set_str(pinfo->cinfo, COL_INFO, "Hazelcast distributed object goodness"); - - if (tree) { - - proto_item *ti = NULL; - ti = proto_tree_add_item(tree, proto_hazelcast, tvb, 0, -1, ENC_NA); - - hcast_tree = proto_item_add_subtree(ti, ett_hazelcast); - } - if (tvb_length_remaining(tvb, 0) < 13) { - col_set_str(pinfo->cinfo, COL_INFO, "Hazelcast too short"); - return 0; - } - - version = tvb_get_guint8(tvb, 12); - if ( version != 6 ) { - col_set_str(pinfo->cinfo, COL_INFO, "Hazelcast unsupported version"); - return 12; - } - - proto_tree_add_item(hcast_tree, hf_hazelcast_headerLength, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; - proto_tree_add_item(hcast_tree, hf_hazelcast_headerKeyLength, tvb, offset, 4, ENC_BIG_ENDIAN); - keyLength = tvb_get_ntohl(tvb, offset); - offset += 4; - proto_tree_add_item(hcast_tree, hf_hazelcast_headerValueLength, tvb, offset, 4, ENC_BIG_ENDIAN); - valueLength = tvb_get_ntohl(tvb, offset); - offset += 4; - proto_tree_add_item(hcast_tree, hf_hazelcast_headerVersion, tvb, offset, 1, ENC_BIG_ENDIAN); - offset += 1; - - - proto_tree_add_item(hcast_tree, hf_hazelcast_operation, tvb, offset, 1, ENC_BIG_ENDIAN); - operation = tvb_get_guint8(tvb, offset); - col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(operation, operationTypes, "Unknown (0x%02x)")); - offset += 1; - - proto_tree_add_item(hcast_tree, hf_hazelcast_blockID, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; - proto_tree_add_item(hcast_tree, hf_hazelcast_threadID, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; - - flags = tvb_get_guint8(tvb, offset); - - tf = proto_tree_add_item(hcast_tree, hf_hazelcast_flags, tvb, offset, 1, ENC_BIG_ENDIAN); - - flag_tree = proto_item_add_subtree(tf, ett_hazelcast_flags); - - proto_tree_add_item(flag_tree, hf_hazelcast_flags_lockCount, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(flag_tree, hf_hazelcast_flags_timeout, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(flag_tree, hf_hazelcast_flags_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(flag_tree, hf_hazelcast_flags_txn, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(flag_tree, hf_hazelcast_flags_longValue, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(flag_tree, hf_hazelcast_flags_version, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(flag_tree, hf_hazelcast_flags_client, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(flag_tree, hf_hazelcast_flags_lockAddrNull, tvb, offset, 1, ENC_BIG_ENDIAN); - - - lockCountFlag = flags & HAZELCAST_LOCKCOUNT_FLAG; - timeoutFlag = flags & HAZELCAST_TIMEOUT_FLAG; - ttlFlag = flags & HAZELCAST_TTL_FLAG; - txnFlag = flags & HAZELCAST_TXN_FLAG; - longValueFlag = flags & HAZELCAST_LONGVALUE_FLAG; - versionFlag = flags & HAZELCAST_VERSION_FLAG; - lockAddrNullFlag = flags & HAZELCAST_LOCKADDRNULL_FLAG; - - offset += 1; - - - if ( lockCountFlag ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_lockCount, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; - } - - if ( timeoutFlag ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_timeout, tvb, offset, 8, ENC_BIG_ENDIAN); - offset += 8; - } - - if ( ttlFlag ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_ttl, tvb, offset, 8, ENC_BIG_ENDIAN); - offset += 8; - } - - if ( txnFlag ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_txnID, tvb, offset, 8, ENC_BIG_ENDIAN); - offset += 8; - } - - if ( longValueFlag ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_longValue, tvb, offset, 8, ENC_BIG_ENDIAN); - offset += 8; - } - - if ( versionFlag ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_version, tvb, offset, 8, ENC_BIG_ENDIAN); - offset += 8; - } - - if ( lockAddrNullFlag == 0 ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_lockAddrIP, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; - proto_tree_add_item(hcast_tree, hf_hazelcast_lockAddrPort, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; - } - - proto_tree_add_item(hcast_tree, hf_hazelcast_callID, tvb, offset, 8, ENC_BIG_ENDIAN); - offset += 8; - - proto_tree_add_item(hcast_tree, hf_hazelcast_responseType, tvb, offset, 1, ENC_BIG_ENDIAN); - offset += 1; - - proto_tree_add_item(hcast_tree, hf_hazelcast_nameLength, tvb, offset, 4, ENC_BIG_ENDIAN); - nameLength = tvb_get_ntohl(tvb, offset); - offset += 4; - - if ( nameLength > 0 ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_name, tvb, offset, nameLength, ENC_ASCII); - offset += nameLength; - } - - proto_tree_add_item(hcast_tree, hf_hazelcast_indexCount, tvb, offset, 1, ENC_BIG_ENDIAN); - offset += 1; - - proto_tree_add_item(hcast_tree, hf_hazelcast_keyPartitionHash, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; + guint8 lockCountFlag; + guint8 timeoutFlag; + guint8 ttlFlag; + guint8 txnFlag; + guint8 longValueFlag; + guint8 versionFlag; + guint8 lockAddrNullFlag; + + guint32 nameLength; + guint32 keyLength; + guint32 valueLength; + gint offset = 0; + + proto_tree *hcast_tree = NULL; + proto_tree *flag_tree = NULL; + + proto_item *tf = NULL; + + /* Make entries in Protocol column and Info column on summary display */ + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HAZELCAST"); + col_set_str(pinfo->cinfo, COL_INFO, "Hazelcast distributed object goodness"); + + if (tree) { + + proto_item *ti = NULL; + ti = proto_tree_add_item(tree, proto_hazelcast, tvb, 0, -1, ENC_NA); + + hcast_tree = proto_item_add_subtree(ti, ett_hazelcast); + } + if (tvb_length_remaining(tvb, 0) < 13) { + col_set_str(pinfo->cinfo, COL_INFO, "Hazelcast too short"); + return 0; + } + + version = tvb_get_guint8(tvb, 12); + if ( version != 6 ) { + col_set_str(pinfo->cinfo, COL_INFO, "Hazelcast unsupported version"); + return 12; + } + + proto_tree_add_item(hcast_tree, hf_hazelcast_headerLength, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; + proto_tree_add_item(hcast_tree, hf_hazelcast_headerKeyLength, tvb, offset, 4, ENC_BIG_ENDIAN); + keyLength = tvb_get_ntohl(tvb, offset); + offset += 4; + proto_tree_add_item(hcast_tree, hf_hazelcast_headerValueLength, tvb, offset, 4, ENC_BIG_ENDIAN); + valueLength = tvb_get_ntohl(tvb, offset); + offset += 4; + proto_tree_add_item(hcast_tree, hf_hazelcast_headerVersion, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; + + + proto_tree_add_item(hcast_tree, hf_hazelcast_operation, tvb, offset, 1, ENC_BIG_ENDIAN); + operation = tvb_get_guint8(tvb, offset); + col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(operation, operationTypes, "Unknown (0x%02x)")); + offset += 1; + + proto_tree_add_item(hcast_tree, hf_hazelcast_blockID, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; + proto_tree_add_item(hcast_tree, hf_hazelcast_threadID, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; + + flags = tvb_get_guint8(tvb, offset); + + tf = proto_tree_add_item(hcast_tree, hf_hazelcast_flags, tvb, offset, 1, ENC_BIG_ENDIAN); + + flag_tree = proto_item_add_subtree(tf, ett_hazelcast_flags); + + proto_tree_add_item(flag_tree, hf_hazelcast_flags_lockCount, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flag_tree, hf_hazelcast_flags_timeout, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flag_tree, hf_hazelcast_flags_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flag_tree, hf_hazelcast_flags_txn, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flag_tree, hf_hazelcast_flags_longValue, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flag_tree, hf_hazelcast_flags_version, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flag_tree, hf_hazelcast_flags_client, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flag_tree, hf_hazelcast_flags_lockAddrNull, tvb, offset, 1, ENC_BIG_ENDIAN); + + + lockCountFlag = flags & HAZELCAST_LOCKCOUNT_FLAG; + timeoutFlag = flags & HAZELCAST_TIMEOUT_FLAG; + ttlFlag = flags & HAZELCAST_TTL_FLAG; + txnFlag = flags & HAZELCAST_TXN_FLAG; + longValueFlag = flags & HAZELCAST_LONGVALUE_FLAG; + versionFlag = flags & HAZELCAST_VERSION_FLAG; + lockAddrNullFlag = flags & HAZELCAST_LOCKADDRNULL_FLAG; + + offset += 1; + + + if ( lockCountFlag ) { + proto_tree_add_item(hcast_tree, hf_hazelcast_lockCount, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; + } + + if ( timeoutFlag ) { + proto_tree_add_item(hcast_tree, hf_hazelcast_timeout, tvb, offset, 8, ENC_BIG_ENDIAN); + offset += 8; + } + + if ( ttlFlag ) { + proto_tree_add_item(hcast_tree, hf_hazelcast_ttl, tvb, offset, 8, ENC_BIG_ENDIAN); + offset += 8; + } + + if ( txnFlag ) { + proto_tree_add_item(hcast_tree, hf_hazelcast_txnID, tvb, offset, 8, ENC_BIG_ENDIAN); + offset += 8; + } + + if ( longValueFlag ) { + proto_tree_add_item(hcast_tree, hf_hazelcast_longValue, tvb, offset, 8, ENC_BIG_ENDIAN); + offset += 8; + } + + if ( versionFlag ) { + proto_tree_add_item(hcast_tree, hf_hazelcast_version, tvb, offset, 8, ENC_BIG_ENDIAN); + offset += 8; + } + + if ( lockAddrNullFlag == 0 ) { + proto_tree_add_item(hcast_tree, hf_hazelcast_lockAddrIP, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; + proto_tree_add_item(hcast_tree, hf_hazelcast_lockAddrPort, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; + } + + proto_tree_add_item(hcast_tree, hf_hazelcast_callID, tvb, offset, 8, ENC_BIG_ENDIAN); + offset += 8; + + proto_tree_add_item(hcast_tree, hf_hazelcast_responseType, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; + + proto_tree_add_item(hcast_tree, hf_hazelcast_nameLength, tvb, offset, 4, ENC_BIG_ENDIAN); + nameLength = tvb_get_ntohl(tvb, offset); + offset += 4; + + if ( nameLength > 0 ) { + proto_tree_add_item(hcast_tree, hf_hazelcast_name, tvb, offset, nameLength, ENC_ASCII); + offset += nameLength; + } + + proto_tree_add_item(hcast_tree, hf_hazelcast_indexCount, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; + + proto_tree_add_item(hcast_tree, hf_hazelcast_keyPartitionHash, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; - proto_tree_add_item(hcast_tree, hf_hazelcast_valuePartitionHash, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; + proto_tree_add_item(hcast_tree, hf_hazelcast_valuePartitionHash, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; - if ( keyLength > 0 ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_keys, tvb, offset, keyLength, ENC_NA); - offset += keyLength; - } + if ( keyLength > 0 ) { + proto_tree_add_item(hcast_tree, hf_hazelcast_keys, tvb, offset, keyLength, ENC_NA); + offset += keyLength; + } - if ( valueLength > 0 ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_values, tvb, offset, valueLength, ENC_NA); - /*offset += valueLength;*/ - } + if ( valueLength > 0 ) { + proto_tree_add_item(hcast_tree, hf_hazelcast_values, tvb, offset, valueLength, ENC_NA); + /*offset += valueLength;*/ + } - return tvb_length(tvb); + return tvb_length(tvb); } /* @@ -430,171 +430,171 @@ static int dissect_hazelcast_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot * * this really just works in TCP reassembly and calls the real dissector * -*/ + */ static int dissect_hazelcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { - tcp_dissect_pdus(tvb, pinfo, tree, hazelcast_desegment, 13, get_hazelcast_message_len, dissect_hazelcast_message, data); - return tvb_length(tvb); + tcp_dissect_pdus(tvb, pinfo, tree, hazelcast_desegment, 13, get_hazelcast_message_len, dissect_hazelcast_message, data); + return tvb_length(tvb); } void proto_register_hazelcast(void) { - static hf_register_info hf[] = { - - { &hf_hazelcast_headerLength, - { "Hazelcast hdr length", "hazelcast.hdr.length", FT_UINT32, BASE_DEC, NULL, 0x0, "header length", HFILL } - }, - { &hf_hazelcast_headerKeyLength, - { "Hazelcast hdr key length", "hazelcast.hdr.keylength", FT_UINT32, BASE_DEC, NULL, 0x0, "header key length", HFILL } - }, - { &hf_hazelcast_headerValueLength, - { "Hazelcast hdr value length", "hazelcast.hdr.valuelength", FT_UINT32, BASE_DEC, NULL, 0x0, "header value length", HFILL } - }, - { &hf_hazelcast_headerVersion, - { "Hazelcast hdr version", "hazelcast.hdr.version", FT_UINT8, BASE_DEC, NULL, 0x0, "header version", HFILL } - }, - { &hf_hazelcast_operation, - { "Hazelcast operation", "hazelcast.operation", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &operationTypes_ext, 0x0, "operation", HFILL } - }, - { &hf_hazelcast_blockID, - { "Hazelcast blockID", "hazelcast.blockID", FT_UINT32, BASE_HEX, NULL, 0x0, "blockID", HFILL } - }, - { &hf_hazelcast_threadID, - { "Hazelcast threadID", "hazelcast.threadID", FT_UINT32, BASE_DEC, NULL, 0x0, "threadID", HFILL } - }, - { &hf_hazelcast_flags, - { "hazelcast flags", "hazelcast.flags", FT_UINT32, BASE_HEX, NULL, 0x0, "flags", HFILL } - }, - { &hf_hazelcast_flags_lockCount, - { "hazelcast lockCount flag", "hazelcast.flags.lockCount", FT_BOOLEAN, 8, NULL, HAZELCAST_LOCKCOUNT_FLAG, NULL, HFILL } - }, - { &hf_hazelcast_flags_timeout, - { "hazelcast timeout flag", "hazelcast.flags.timeout", FT_BOOLEAN, 8, NULL, HAZELCAST_TIMEOUT_FLAG, NULL, HFILL } - }, - { &hf_hazelcast_flags_ttl, - { "hazelcast ttl flag", "hazelcast.flags.ttl", FT_BOOLEAN, 8, NULL, HAZELCAST_TTL_FLAG, NULL, HFILL } - }, - { &hf_hazelcast_flags_txn, - { "hazelcast txn flag", "hazelcast.flags.txn", FT_BOOLEAN, 8, NULL, HAZELCAST_TXN_FLAG, NULL, HFILL } - }, - { &hf_hazelcast_flags_longValue, - { "hazelcast longValue flag", "hazelcast.flags.longValue", FT_BOOLEAN, 8, NULL, HAZELCAST_LONGVALUE_FLAG, NULL, HFILL } - }, - { &hf_hazelcast_flags_version, - { "hazelcast version flag", "hazelcast.flags.version", FT_BOOLEAN, 8, NULL, HAZELCAST_VERSION_FLAG, NULL, HFILL } - }, - { &hf_hazelcast_flags_client, - { "hazelcast client flag", "hazelcast.flags.client", FT_BOOLEAN, 8, NULL, HAZELCAST_CLIENT_FLAG, NULL, HFILL } - }, - { &hf_hazelcast_flags_lockAddrNull, - { "hazelcast lockAddrNull flag", "hazelcast.flags.lockAddrNull", FT_BOOLEAN, 8, NULL, HAZELCAST_LOCKADDRNULL_FLAG, NULL, HFILL } - }, - { &hf_hazelcast_timeout, - { "hazelcast timeout", "hazelcast.timeout", FT_UINT64, BASE_DEC, NULL, 0x0, "timeout", HFILL } - }, - { &hf_hazelcast_ttl, - { "hazelcast ttl", "hazelcast.ttl", FT_UINT64, BASE_DEC, NULL, 0x0, "ttl", HFILL } - }, - { &hf_hazelcast_longValue, - { "hazelcast longValue", "hazelcast.longValue", FT_UINT64, BASE_DEC, NULL, 0x0, "longValue", HFILL } - }, - { &hf_hazelcast_txnID, - { "hazelcast txnID", "hazelcast.txnID", FT_UINT64, BASE_DEC, NULL, 0x0, "txnID", HFILL } - }, - { &hf_hazelcast_version, - { "hazelcast version", "hazelcast.version", FT_UINT64, BASE_DEC, NULL, 0x0, "version", HFILL } - }, - { &hf_hazelcast_lockCount, - { "hazelcast lockCount", "hazelcast.lockCount", FT_UINT32, BASE_DEC, NULL, 0x0, "lockCount", HFILL } - }, - { &hf_hazelcast_lockAddrIP, - { "hazelcast lock address IP", "hazelcast.lockaddr.ip", FT_IPv4, BASE_NONE, NULL, 0x0, "lockAddrIP", HFILL } - }, - { &hf_hazelcast_lockAddrPort, - { "hazelcast lock address Port", "hazelcast.lockaddr.port", FT_UINT32, BASE_DEC, NULL, 0x0, "lockAddrPort", HFILL } - }, - { &hf_hazelcast_callID, - { "hazelcast callID", "hazelcast.callID", FT_INT64, BASE_DEC, NULL, 0x0, "callID", HFILL } - }, - { &hf_hazelcast_responseType, - { "hazelcast response type", "hazelcast.responseType", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &responseTypes_ext, 0x0, "responseType", HFILL } - }, - { &hf_hazelcast_nameLength, - { "hazelcast name length", "hazelcast.nameLength", FT_UINT32, BASE_DEC, NULL, 0x0, "nameLength", HFILL } - }, - { &hf_hazelcast_name, - { "hazelcast name", "hazelcast.name", FT_STRING, BASE_NONE, NULL, 0x0, "name", HFILL } - }, - { &hf_hazelcast_indexCount, - { "hazelcast indexCount", "hazelcast.indexCount", FT_UINT8, BASE_DEC, NULL, 0x0, "indexCount", HFILL } - }, - { &hf_hazelcast_keyPartitionHash, - { "hazelcast keyPartitionHash", "hazelcast.keyPartitionHash", FT_UINT32, BASE_HEX, NULL, 0x0, "keyPartitionHash", HFILL } - }, - { &hf_hazelcast_valuePartitionHash, - { "hazelcast valuePartitionHash", "hazelcast.valuePartitionHash", FT_UINT32, BASE_HEX, NULL, 0x0, "valuePartitionHash", HFILL } - }, - { &hf_hazelcast_keys, - { "hazelcast keys", "hazelcast.keys", FT_BYTES, BASE_NONE, NULL, 0x0, "keys", HFILL } - }, - { &hf_hazelcast_values, - { "hazelcast values", "hazelcast.values", FT_BYTES, BASE_NONE, NULL, 0x0, "values", HFILL } - } - - }; - - /* Setup protocol subtree array */ - static gint *ett[] = { - &ett_hazelcast, - &ett_hazelcast_flags - }; - - module_t *hazelcast_module; - - - proto_hazelcast = proto_register_protocol ( - "Hazelcast Wire Protocol", /* name */ - "HAZELCAST", /* short name */ - "hzlcst" /* abbrev */ - ); - - proto_register_field_array(proto_hazelcast, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); - - hazelcast_module = prefs_register_protocol(proto_hazelcast, NULL); - - prefs_register_bool_preference(hazelcast_module, "desegment", - "Reassemble hazelcast messages spanning multiple TCP segments", - "Whether the hazel dissector should reassemble messages spanning multiple TCP segments." - " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", - &hazelcast_desegment); - - prefs_register_uint_preference(hazelcast_module, "tcp.port", - "Hazelcast TCP Port", - " Hazelcast TCP port if other than the default", - 10, - &gPORT_PREF); - - hazelcast_tap = register_tap("hzlcst"); + static hf_register_info hf[] = { + + { &hf_hazelcast_headerLength, + { "Hazelcast hdr length", "hazelcast.hdr.length", FT_UINT32, BASE_DEC, NULL, 0x0, "header length", HFILL } + }, + { &hf_hazelcast_headerKeyLength, + { "Hazelcast hdr key length", "hazelcast.hdr.keylength", FT_UINT32, BASE_DEC, NULL, 0x0, "header key length", HFILL } + }, + { &hf_hazelcast_headerValueLength, + { "Hazelcast hdr value length", "hazelcast.hdr.valuelength", FT_UINT32, BASE_DEC, NULL, 0x0, "header value length", HFILL } + }, + { &hf_hazelcast_headerVersion, + { "Hazelcast hdr version", "hazelcast.hdr.version", FT_UINT8, BASE_DEC, NULL, 0x0, "header version", HFILL } + }, + { &hf_hazelcast_operation, + { "Hazelcast operation", "hazelcast.operation", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &operationTypes_ext, 0x0, "operation", HFILL } + }, + { &hf_hazelcast_blockID, + { "Hazelcast blockID", "hazelcast.blockID", FT_UINT32, BASE_HEX, NULL, 0x0, "blockID", HFILL } + }, + { &hf_hazelcast_threadID, + { "Hazelcast threadID", "hazelcast.threadID", FT_UINT32, BASE_DEC, NULL, 0x0, "threadID", HFILL } + }, + { &hf_hazelcast_flags, + { "hazelcast flags", "hazelcast.flags", FT_UINT32, BASE_HEX, NULL, 0x0, "flags", HFILL } + }, + { &hf_hazelcast_flags_lockCount, + { "hazelcast lockCount flag", "hazelcast.flags.lockCount", FT_BOOLEAN, 8, NULL, HAZELCAST_LOCKCOUNT_FLAG, NULL, HFILL } + }, + { &hf_hazelcast_flags_timeout, + { "hazelcast timeout flag", "hazelcast.flags.timeout", FT_BOOLEAN, 8, NULL, HAZELCAST_TIMEOUT_FLAG, NULL, HFILL } + }, + { &hf_hazelcast_flags_ttl, + { "hazelcast ttl flag", "hazelcast.flags.ttl", FT_BOOLEAN, 8, NULL, HAZELCAST_TTL_FLAG, NULL, HFILL } + }, + { &hf_hazelcast_flags_txn, + { "hazelcast txn flag", "hazelcast.flags.txn", FT_BOOLEAN, 8, NULL, HAZELCAST_TXN_FLAG, NULL, HFILL } + }, + { &hf_hazelcast_flags_longValue, + { "hazelcast longValue flag", "hazelcast.flags.longValue", FT_BOOLEAN, 8, NULL, HAZELCAST_LONGVALUE_FLAG, NULL, HFILL } + }, + { &hf_hazelcast_flags_version, + { "hazelcast version flag", "hazelcast.flags.version", FT_BOOLEAN, 8, NULL, HAZELCAST_VERSION_FLAG, NULL, HFILL } + }, + { &hf_hazelcast_flags_client, + { "hazelcast client flag", "hazelcast.flags.client", FT_BOOLEAN, 8, NULL, HAZELCAST_CLIENT_FLAG, NULL, HFILL } + }, + { &hf_hazelcast_flags_lockAddrNull, + { "hazelcast lockAddrNull flag", "hazelcast.flags.lockAddrNull", FT_BOOLEAN, 8, NULL, HAZELCAST_LOCKADDRNULL_FLAG, NULL, HFILL } + }, + { &hf_hazelcast_timeout, + { "hazelcast timeout", "hazelcast.timeout", FT_UINT64, BASE_DEC, NULL, 0x0, "timeout", HFILL } + }, + { &hf_hazelcast_ttl, + { "hazelcast ttl", "hazelcast.ttl", FT_UINT64, BASE_DEC, NULL, 0x0, "ttl", HFILL } + }, + { &hf_hazelcast_longValue, + { "hazelcast longValue", "hazelcast.longValue", FT_UINT64, BASE_DEC, NULL, 0x0, "longValue", HFILL } + }, + { &hf_hazelcast_txnID, + { "hazelcast txnID", "hazelcast.txnID", FT_UINT64, BASE_DEC, NULL, 0x0, "txnID", HFILL } + }, + { &hf_hazelcast_version, + { "hazelcast version", "hazelcast.version", FT_UINT64, BASE_DEC, NULL, 0x0, "version", HFILL } + }, + { &hf_hazelcast_lockCount, + { "hazelcast lockCount", "hazelcast.lockCount", FT_UINT32, BASE_DEC, NULL, 0x0, "lockCount", HFILL } + }, + { &hf_hazelcast_lockAddrIP, + { "hazelcast lock address IP", "hazelcast.lockaddr.ip", FT_IPv4, BASE_NONE, NULL, 0x0, "lockAddrIP", HFILL } + }, + { &hf_hazelcast_lockAddrPort, + { "hazelcast lock address Port", "hazelcast.lockaddr.port", FT_UINT32, BASE_DEC, NULL, 0x0, "lockAddrPort", HFILL } + }, + { &hf_hazelcast_callID, + { "hazelcast callID", "hazelcast.callID", FT_INT64, BASE_DEC, NULL, 0x0, "callID", HFILL } + }, + { &hf_hazelcast_responseType, + { "hazelcast response type", "hazelcast.responseType", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &responseTypes_ext, 0x0, "responseType", HFILL } + }, + { &hf_hazelcast_nameLength, + { "hazelcast name length", "hazelcast.nameLength", FT_UINT32, BASE_DEC, NULL, 0x0, "nameLength", HFILL } + }, + { &hf_hazelcast_name, + { "hazelcast name", "hazelcast.name", FT_STRING, BASE_NONE, NULL, 0x0, "name", HFILL } + }, + { &hf_hazelcast_indexCount, + { "hazelcast indexCount", "hazelcast.indexCount", FT_UINT8, BASE_DEC, NULL, 0x0, "indexCount", HFILL } + }, + { &hf_hazelcast_keyPartitionHash, + { "hazelcast keyPartitionHash", "hazelcast.keyPartitionHash", FT_UINT32, BASE_HEX, NULL, 0x0, "keyPartitionHash", HFILL } + }, + { &hf_hazelcast_valuePartitionHash, + { "hazelcast valuePartitionHash", "hazelcast.valuePartitionHash", FT_UINT32, BASE_HEX, NULL, 0x0, "valuePartitionHash", HFILL } + }, + { &hf_hazelcast_keys, + { "hazelcast keys", "hazelcast.keys", FT_BYTES, BASE_NONE, NULL, 0x0, "keys", HFILL } + }, + { &hf_hazelcast_values, + { "hazelcast values", "hazelcast.values", FT_BYTES, BASE_NONE, NULL, 0x0, "values", HFILL } + } + + }; + + /* Setup protocol subtree array */ + static gint *ett[] = { + &ett_hazelcast, + &ett_hazelcast_flags + }; + + module_t *hazelcast_module; + + + proto_hazelcast = proto_register_protocol ( + "Hazelcast Wire Protocol", /* name */ + "HAZELCAST", /* short name */ + "hzlcst" /* abbrev */ + ); + + proto_register_field_array(proto_hazelcast, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + + hazelcast_module = prefs_register_protocol(proto_hazelcast, NULL); + + prefs_register_bool_preference(hazelcast_module, "desegment", + "Reassemble hazelcast messages spanning multiple TCP segments", + "Whether the hazel dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", + &hazelcast_desegment); + + prefs_register_uint_preference(hazelcast_module, "tcp.port", + "Hazelcast TCP Port", + " Hazelcast TCP port if other than the default", + 10, + &gPORT_PREF); + + hazelcast_tap = register_tap("hzlcst"); } void proto_reg_handoff_hazelcast(void) { - static gboolean initialized = FALSE; - static dissector_handle_t hazelcast_handle; - static int currentPort; - - if (!initialized) { - hazelcast_handle = new_create_dissector_handle(dissect_hazelcast, proto_hazelcast); - initialized = TRUE; - } else { - dissector_delete_uint("tcp.port", currentPort, hazelcast_handle); - } - - currentPort = gPORT_PREF; - dissector_add_uint("tcp.port", currentPort, hazelcast_handle); + static gboolean initialized = FALSE; + static dissector_handle_t hazelcast_handle; + static int currentPort; + + if (!initialized) { + hazelcast_handle = new_create_dissector_handle(dissect_hazelcast, proto_hazelcast); + initialized = TRUE; + } else { + dissector_delete_uint("tcp.port", currentPort, hazelcast_handle); + } + + currentPort = gPORT_PREF; + dissector_add_uint("tcp.port", currentPort, hazelcast_handle); } /* diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index e06238c8bb..cace426134 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -8681,17 +8681,17 @@ enum vs_nintendo_type { }; static const value_string ieee80211_vs_nintendo_type_vals[] = { - { NINTENDO_SERVICES, "Services"}, - { NINTENDO_CONSOLEID, "ConsoleID"}, - { 0, NULL } + { NINTENDO_SERVICES, "Services"}, + { NINTENDO_CONSOLEID, "ConsoleID"}, + { 0, NULL } }; static proto_tree* dissect_vendor_ie_nintendo_tlv(const int hfindex, proto_tree *ietree, tvbuff_t *tvb, int offset, guint32 sublen) { - proto_item *nintendo_item; - proto_tree *nintendo_tree; + proto_item *nintendo_item; + proto_tree *nintendo_tree; nintendo_item = proto_tree_add_item(ietree, hfindex, tvb, offset, sublen, ENC_NA); nintendo_tree = proto_item_add_subtree(nintendo_item, ett_nintendo); @@ -8706,11 +8706,11 @@ static void dissect_vendor_ie_nintendo(proto_item *item _U_, proto_tree *ietree, tvbuff_t *tvb, int offset, guint32 tag_len) { - proto_tree *nintendo_tree; + proto_tree *nintendo_tree; - guint8 subtype; - guint8 sublength; - guint32 length = tag_len; + guint8 subtype; + guint8 sublength; + guint32 length = tag_len; /* Skip OUI type for now - the code is for type 1 (StreetPass) only */ /* http://3dbrew.org/wiki/StreetPass */ @@ -12951,26 +12951,26 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset case TAG_MESH_CONFIGURATION: { - proto_item *item; - proto_tree *subtree; + proto_item *item; + proto_tree *subtree; offset += 2; proto_tree_add_item (tree, hf_ieee80211_mesh_config_path_sel_protocol, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_ieee80211_mesh_config_path_sel_metric, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_ieee80211_mesh_config_congestion_control, tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_ieee80211_mesh_config_sync_method, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_ieee80211_mesh_config_auth_protocol, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN); - item = proto_tree_add_item (tree, hf_ieee80211_mesh_config_formation_info, tvb, offset + 5, 1, ENC_LITTLE_ENDIAN); - subtree = proto_item_add_subtree(item, ett_mesh_formation_info_tree); - proto_tree_add_item (subtree, hf_ieee80211_mesh_form_info_num_of_peerings, tvb, offset + 5, 1, ENC_LITTLE_ENDIAN); - item = proto_tree_add_item (tree, hf_ieee80211_mesh_config_capability, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); - subtree = proto_item_add_subtree(item, ett_mesh_config_cap_tree); - proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_accepting, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_mcca_support, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_mcca_enabled, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_forwarding, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_mbca_enabled, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_tbtt_adjusting, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_power_save_level, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); + item = proto_tree_add_item (tree, hf_ieee80211_mesh_config_formation_info, tvb, offset + 5, 1, ENC_LITTLE_ENDIAN); + subtree = proto_item_add_subtree(item, ett_mesh_formation_info_tree); + proto_tree_add_item (subtree, hf_ieee80211_mesh_form_info_num_of_peerings, tvb, offset + 5, 1, ENC_LITTLE_ENDIAN); + item = proto_tree_add_item (tree, hf_ieee80211_mesh_config_capability, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); + subtree = proto_item_add_subtree(item, ett_mesh_config_cap_tree); + proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_accepting, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_mcca_support, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_mcca_enabled, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_forwarding, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_mbca_enabled, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_tbtt_adjusting, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (subtree, hf_ieee80211_mesh_config_cap_power_save_level, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); break; } diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 9f679c63bb..e4b4104c85 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -3859,12 +3859,12 @@ dissect_isup_range_and_status_parameter(tvbuff_t *parameter_tvb, proto_tree *par actual_status_length = tvb_reported_length_remaining(parameter_tvb, offset); if (actual_status_length > 0) { item = proto_tree_add_text(parameter_tree, parameter_tvb , offset, -1, "Status subfield"); - range_tree = proto_item_add_subtree(item, ett_isup_range); - if (range<9) { - proto_tree_add_text(range_tree, parameter_tvb , offset, 1, "Bit %u %s bit 1", - range, - decode_bits_in_field(8-range, range, tvb_get_guint8(parameter_tvb, offset))); - } + range_tree = proto_item_add_subtree(item, ett_isup_range); + if (range<9) { + proto_tree_add_text(range_tree, parameter_tvb , offset, 1, "Bit %u %s bit 1", + range, + decode_bits_in_field(8-range, range, tvb_get_guint8(parameter_tvb, offset))); + } } else { proto_tree_add_text(parameter_tree, parameter_tvb , 0, 0, "Status subfield is not present with this message type"); } @@ -5808,7 +5808,7 @@ dissect_isup_generic_notification_indicator_parameter(tvbuff_t *parameter_tvb, p proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_isup_notification_indicator, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); proto_item_set_text(parameter_item, "Generic notification indicator: %s", - val_to_str_ext((indicators&0x7f), &q763_generic_notification_indicator_vals_ext, "Reserved (0x%X)")); + val_to_str_ext((indicators&0x7f), &q763_generic_notification_indicator_vals_ext, "Reserved (0x%X)")); } /* ------------------------------------------------------------------ Dissector Parameter Call history information @@ -7046,22 +7046,22 @@ dissect_isup_unknown_parameter(tvbuff_t *parameter_tvb, proto_item *parameter_it static void dissect_japan_isup_called_dir_num(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - int offset = 0; - int parameter_length; + int offset = 0; + int parameter_length; - parameter_length = tvb_length_remaining(parameter_tvb, offset); + parameter_length = tvb_length_remaining(parameter_tvb, offset); - proto_tree_add_item(parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(parameter_tree, hf_isup_called_party_nature_of_address_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); - offset += 1; + proto_tree_add_item(parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_isup_called_party_nature_of_address_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; - proto_tree_add_item(parameter_tree, hf_isup_inn_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); - offset += 1; + proto_tree_add_item(parameter_tree, hf_isup_inn_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; - proto_tree_add_text(parameter_tree, parameter_tvb, offset, parameter_length-offset, "Number not dissected yet"); + proto_tree_add_text(parameter_tree, parameter_tvb, offset, parameter_length-offset, "Number not dissected yet"); - proto_item_set_text(parameter_item, "Called Directory Number"); + proto_item_set_text(parameter_item, "Called Directory Number"); } @@ -7423,15 +7423,15 @@ dissect_japan_isup_network_poi_cad(tvbuff_t *parameter_tvb, proto_tree *paramete } static const range_string jpn_isup_add_user_cat_type_vals[] = { - { 0, 0, "Spare" }, - { 1, 0x80, "Reserved for network specific use" }, - { 0x81, 0xfa, "Spare" }, - { 0xfb, 0xfb, "Type 3 of additional mobile service information" }, - { 0xfc, 0xfc, "Type 2 of additional mobile service information" }, - { 0xfd, 0xfd, "Type 1 of additional mobile service information" }, - { 0xfe, 0xfe, "Type 1 of additional fixed service information" }, - { 0xff, 0xff, "Spare" }, - { 0, 0, NULL } }; + { 0, 0, "Spare" }, + { 1, 0x80, "Reserved for network specific use" }, + { 0x81, 0xfa, "Spare" }, + { 0xfb, 0xfb, "Type 3 of additional mobile service information" }, + { 0xfc, 0xfc, "Type 2 of additional mobile service information" }, + { 0xfd, 0xfd, "Type 1 of additional mobile service information" }, + { 0xfe, 0xfe, "Type 1 of additional fixed service information" }, + { 0xff, 0xff, "Spare" }, + { 0, 0, NULL } }; static const value_string jpn_isup_type_1_add_fixed_serv_inf_vals[] = { { 0, "Spare" }, @@ -7798,13 +7798,13 @@ dissect_japan_isup_carrier_information(tvbuff_t *parameter_tvb, proto_tree *para static const range_string japan_isup_charge_delay_type_value[] = { - { 0, 0, "Spare" }, - { 1, 0xfc, "Reserved for network specific use" }, - { 0x81, 0xfa, "Spare" }, - { 0xfd, 0xfd, "Charge rate transfer" }, - { 0xfe, 0xfe, "Terminating charge area information" }, - { 0xff, 0xff, "Spare" }, - { 0, 0, NULL } }; + { 0, 0, "Spare" }, + { 1, 0xfc, "Reserved for network specific use" }, + { 0x81, 0xfa, "Spare" }, + { 0xfd, 0xfd, "Charge rate transfer" }, + { 0xfe, 0xfe, "Terminating charge area information" }, + { 0xff, 0xff, "Spare" }, + { 0, 0, NULL } }; static void dissect_japan_isup_charge_inf_delay(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) @@ -9919,9 +9919,9 @@ dissect_japan_chg_inf(tvbuff_t *message_tvb, proto_tree *isup_tree) parameter_type, val_to_str_ext_const(parameter_type, &japan_isup_parameter_type_value_ext, "unknown")); proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, - PARAMETER_POINTER_LENGTH, parameter_pointer); + PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, - PARAMETER_LENGTH_IND_LENGTH, parameter_length); + PARAMETER_LENGTH_IND_LENGTH, parameter_length); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, @@ -9930,17 +9930,17 @@ dissect_japan_chg_inf(tvbuff_t *message_tvb, proto_tree *isup_tree) /* TODO: Dissect the parameter here, switch on type */ switch (chg_inf_type) { - case 3: - /* Advanced Charge Rate Transfer (TDS service) */ - dissect_japan_chg_inf_type_acr(parameter_tvb, parameter_tree, parameter_item); - break; - case 254: - /* Charge rate transfer (flexible charging) */ - dissect_japan_chg_inf_type_crt(parameter_tvb, parameter_tree, parameter_item); - break; - default: + case 3: + /* Advanced Charge Rate Transfer (TDS service) */ + dissect_japan_chg_inf_type_acr(parameter_tvb, parameter_tree, parameter_item); + break; + case 254: + /* Charge rate transfer (flexible charging) */ + dissect_japan_chg_inf_type_crt(parameter_tvb, parameter_tree, parameter_item); + break; + default: proto_tree_add_text(parameter_tree, parameter_tvb, 0, -1, "Charge information data, not dissected yet"); - break; + break; } @@ -9963,7 +9963,7 @@ dissect_ansi_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree gint offset, bufferlength; guint8 message_type, opt_parameter_pointer; gint opt_part_possible = FALSE; /* default setting - for message types allowing optional - params explicitely set to TRUE in case statement */ + params explicitely set to TRUE in case statement */ tap_calling_number = NULL; offset = 0; @@ -9971,254 +9971,254 @@ dissect_ansi_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree message_type = tvb_get_guint8(message_tvb, 0); proto_tree_add_uint_format(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type, "Message type: %s (%u)", - val_to_str_ext_const(message_type, &ansi_isup_message_type_value_ext, "reserved"), message_type); + val_to_str_ext_const(message_type, &ansi_isup_message_type_value_ext, "reserved"), message_type); offset += MESSAGE_TYPE_LENGTH; - tap_rec = (isup_tap_rec_t *)wmem_alloc(wmem_packet_scope(), sizeof(isup_tap_rec_t)); - tap_rec->message_type = message_type; - tap_rec->calling_number = NULL; - tap_rec->called_number = NULL; + tap_rec = (isup_tap_rec_t *)wmem_alloc(wmem_packet_scope(), sizeof(isup_tap_rec_t)); + tap_rec->message_type = message_type; + tap_rec->calling_number = NULL; + tap_rec->called_number = NULL; - parameter_tvb = tvb_new_subset_remaining(message_tvb, offset); + parameter_tvb = tvb_new_subset_remaining(message_tvb, offset); - /* distinguish between message types:*/ - switch (message_type) { - case MESSAGE_TYPE_INITIAL_ADDR: - offset += dissect_isup_initial_address_message(parameter_tvb, isup_tree, itu_isup_variant); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_SUBSEQ_ADDR: - offset += dissect_isup_subsequent_address_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_INFO_REQ: - offset += dissect_isup_information_request_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_INFO: - offset += dissect_isup_information_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_CONTINUITY: - offset += dissect_isup_continuity_message(parameter_tvb, isup_tree); - break; - case MESSAGE_TYPE_ADDR_CMPL: - offset += dissect_isup_address_complete_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_CONNECT: - offset += dissect_isup_connect_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_FORW_TRANS: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_ANSWER: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_RELEASE: - offset += dissect_isup_release_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_SUSPEND: - offset += dissect_isup_suspend_resume_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_RESUME: - offset += dissect_isup_suspend_resume_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_REL_CMPL: - /* no dissector necessary since no mandatory parameters included */ - break; - case MESSAGE_TYPE_CONT_CHECK_REQ: - /* no dissector necessary since no mandatory parameters included */ - break; - case MESSAGE_TYPE_RESET_CIRCUIT: - /* no dissector necessary since no mandatory parameters included */ - break; - case MESSAGE_TYPE_BLOCKING: - /* no dissector necessary since no mandatory parameters included */ - break; - case MESSAGE_TYPE_UNBLOCKING: - /* no dissector necessary since no mandatory parameters included */ - break; - case MESSAGE_TYPE_BLOCK_ACK: - /* no dissector necessary since no mandatory parameters included */ - break; - case MESSAGE_TYPE_UNBLOCK_ACK: - /* no dissector necessary since no mandatory parameters included */ - break; - case MESSAGE_TYPE_CIRC_GRP_RST: - offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, isup_tree); - break; - case MESSAGE_TYPE_CIRC_GRP_BLCK: - offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree); - break; - case MESSAGE_TYPE_CIRC_GRP_UNBL: - offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree); - break; - case MESSAGE_TYPE_CIRC_GRP_BL_ACK: - offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree); - break; - case MESSAGE_TYPE_CIRC_GRP_UNBL_ACK: - offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree); - break; - case MESSAGE_TYPE_FACILITY_REQ: - offset += dissect_isup_facility_request_accepted_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_FACILITY_ACC: - offset += dissect_isup_facility_request_accepted_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_FACILITY_REJ: - offset += dissect_isup_facility_reject_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_LOOP_BACK_ACK: - /* no dissector necessary since no mandatory parameters included */ - break; - case MESSAGE_TYPE_PASS_ALONG: - /* call dissect_isup_message recursively */ - { - guint8 pa_message_type; - pa_message_type = tvb_get_guint8(parameter_tvb, 0); - pass_along_item = proto_tree_add_text(isup_tree, parameter_tvb, offset, -1, - "Pass-along: %s Message (%u)", - val_to_str_ext_const(pa_message_type, &isup_message_type_value_acro_ext, "reserved"), - pa_message_type); - pass_along_tree = proto_item_add_subtree(pass_along_item, ett_isup_pass_along_message); - dissect_ansi_isup_message(parameter_tvb, pinfo, pass_along_tree, itu_isup_variant); - break; - } - case MESSAGE_TYPE_CIRC_GRP_RST_ACK: - offset += dissect_isup_circuit_group_reset_acknowledgement_message(parameter_tvb, isup_tree); - break; - case MESSAGE_TYPE_CIRC_GRP_QRY: - offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, isup_tree); - break; - case MESSAGE_TYPE_CIRC_GRP_QRY_RSP: - offset += dissect_isup_circuit_group_query_response_message(parameter_tvb, isup_tree); - break; - case MESSAGE_TYPE_CALL_PROGRSS: - offset += dissect_isup_call_progress_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_USER2USER_INFO: - offset += dissect_isup_user_to_user_information_message(parameter_tvb, pinfo, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_UNEQUIPPED_CIC: - /* no dissector necessary since no mandatory parameters included */ - break; - case MESSAGE_TYPE_CONFUSION: - offset += dissect_isup_confusion_message(parameter_tvb, isup_tree); - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_OVERLOAD: - /* no dissector necessary since no mandatory parameters included */ - break; - case MESSAGE_TYPE_CHARGE_INFO: - /* do nothing since format is a national matter */ - bufferlength = tvb_length_remaining(message_tvb, offset); - if (bufferlength != 0) - proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter"); - break; - case MESSAGE_TYPE_NETW_RESRC_MGMT: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_FACILITY: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_USER_PART_TEST: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_USER_PART_AVAIL: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_IDENT_REQ: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_IDENT_RSP: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_SEGMENTATION: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_LOOP_PREVENTION: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_APPLICATION_TRANS: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_PRE_RELEASE_INFO: - /* no dissector necessary since no mandatory parameters included */ - opt_part_possible = TRUE; - break; - case MESSAGE_TYPE_SUBSEQUENT_DIR_NUM: - /* do nothing since format is a national matter */ - bufferlength = tvb_length_remaining(message_tvb, offset); - if (bufferlength != 0) - proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter"); - break; - case ANSI_ISUP_MESSAGE_TYPE_CIRCUIT_RES_ACK: - /* no dissector necessary since no mandatory parameters included */ - break; - case ANSI_ISUP_MESSAGE_TYPE_CIRCUIT_RES: - offset += dissect_ansi_isup_circuit_reservation_message(parameter_tvb, isup_tree); - break; - case ANSI_ISUP_MESSAGE_TYPE_CCT_VAL_TEST_RSP: - opt_part_possible = TRUE; - offset += dissect_ansi_isup_circuit_validation_test_resp_message(parameter_tvb, isup_tree); - break; - case ANSI_ISUP_MESSAGE_TYPE_CCT_VAL_TEST: - /* no dissector necessary since no mandatory parameters included */ - break; - default: - bufferlength = tvb_length_remaining(message_tvb, offset); - if (bufferlength != 0) - proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, - "Unknown Message type (possibly reserved/used in former ISUP version)"); - break; + /* distinguish between message types:*/ + switch (message_type) { + case MESSAGE_TYPE_INITIAL_ADDR: + offset += dissect_isup_initial_address_message(parameter_tvb, isup_tree, itu_isup_variant); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_SUBSEQ_ADDR: + offset += dissect_isup_subsequent_address_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_INFO_REQ: + offset += dissect_isup_information_request_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_INFO: + offset += dissect_isup_information_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_CONTINUITY: + offset += dissect_isup_continuity_message(parameter_tvb, isup_tree); + break; + case MESSAGE_TYPE_ADDR_CMPL: + offset += dissect_isup_address_complete_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_CONNECT: + offset += dissect_isup_connect_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_FORW_TRANS: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_ANSWER: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_RELEASE: + offset += dissect_isup_release_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_SUSPEND: + offset += dissect_isup_suspend_resume_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_RESUME: + offset += dissect_isup_suspend_resume_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_REL_CMPL: + /* no dissector necessary since no mandatory parameters included */ + break; + case MESSAGE_TYPE_CONT_CHECK_REQ: + /* no dissector necessary since no mandatory parameters included */ + break; + case MESSAGE_TYPE_RESET_CIRCUIT: + /* no dissector necessary since no mandatory parameters included */ + break; + case MESSAGE_TYPE_BLOCKING: + /* no dissector necessary since no mandatory parameters included */ + break; + case MESSAGE_TYPE_UNBLOCKING: + /* no dissector necessary since no mandatory parameters included */ + break; + case MESSAGE_TYPE_BLOCK_ACK: + /* no dissector necessary since no mandatory parameters included */ + break; + case MESSAGE_TYPE_UNBLOCK_ACK: + /* no dissector necessary since no mandatory parameters included */ + break; + case MESSAGE_TYPE_CIRC_GRP_RST: + offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, isup_tree); + break; + case MESSAGE_TYPE_CIRC_GRP_BLCK: + offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree); + break; + case MESSAGE_TYPE_CIRC_GRP_UNBL: + offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree); + break; + case MESSAGE_TYPE_CIRC_GRP_BL_ACK: + offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree); + break; + case MESSAGE_TYPE_CIRC_GRP_UNBL_ACK: + offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree); + break; + case MESSAGE_TYPE_FACILITY_REQ: + offset += dissect_isup_facility_request_accepted_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_FACILITY_ACC: + offset += dissect_isup_facility_request_accepted_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_FACILITY_REJ: + offset += dissect_isup_facility_reject_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_LOOP_BACK_ACK: + /* no dissector necessary since no mandatory parameters included */ + break; + case MESSAGE_TYPE_PASS_ALONG: + /* call dissect_isup_message recursively */ + { + guint8 pa_message_type; + pa_message_type = tvb_get_guint8(parameter_tvb, 0); + pass_along_item = proto_tree_add_text(isup_tree, parameter_tvb, offset, -1, + "Pass-along: %s Message (%u)", + val_to_str_ext_const(pa_message_type, &isup_message_type_value_acro_ext, "reserved"), + pa_message_type); + pass_along_tree = proto_item_add_subtree(pass_along_item, ett_isup_pass_along_message); + dissect_ansi_isup_message(parameter_tvb, pinfo, pass_along_tree, itu_isup_variant); + break; } + case MESSAGE_TYPE_CIRC_GRP_RST_ACK: + offset += dissect_isup_circuit_group_reset_acknowledgement_message(parameter_tvb, isup_tree); + break; + case MESSAGE_TYPE_CIRC_GRP_QRY: + offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, isup_tree); + break; + case MESSAGE_TYPE_CIRC_GRP_QRY_RSP: + offset += dissect_isup_circuit_group_query_response_message(parameter_tvb, isup_tree); + break; + case MESSAGE_TYPE_CALL_PROGRSS: + offset += dissect_isup_call_progress_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_USER2USER_INFO: + offset += dissect_isup_user_to_user_information_message(parameter_tvb, pinfo, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_UNEQUIPPED_CIC: + /* no dissector necessary since no mandatory parameters included */ + break; + case MESSAGE_TYPE_CONFUSION: + offset += dissect_isup_confusion_message(parameter_tvb, isup_tree); + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_OVERLOAD: + /* no dissector necessary since no mandatory parameters included */ + break; + case MESSAGE_TYPE_CHARGE_INFO: + /* do nothing since format is a national matter */ + bufferlength = tvb_length_remaining(message_tvb, offset); + if (bufferlength != 0) + proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter"); + break; + case MESSAGE_TYPE_NETW_RESRC_MGMT: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_FACILITY: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_USER_PART_TEST: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_USER_PART_AVAIL: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_IDENT_REQ: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_IDENT_RSP: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_SEGMENTATION: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_LOOP_PREVENTION: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_APPLICATION_TRANS: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_PRE_RELEASE_INFO: + /* no dissector necessary since no mandatory parameters included */ + opt_part_possible = TRUE; + break; + case MESSAGE_TYPE_SUBSEQUENT_DIR_NUM: + /* do nothing since format is a national matter */ + bufferlength = tvb_length_remaining(message_tvb, offset); + if (bufferlength != 0) + proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter"); + break; + case ANSI_ISUP_MESSAGE_TYPE_CIRCUIT_RES_ACK: + /* no dissector necessary since no mandatory parameters included */ + break; + case ANSI_ISUP_MESSAGE_TYPE_CIRCUIT_RES: + offset += dissect_ansi_isup_circuit_reservation_message(parameter_tvb, isup_tree); + break; + case ANSI_ISUP_MESSAGE_TYPE_CCT_VAL_TEST_RSP: + opt_part_possible = TRUE; + offset += dissect_ansi_isup_circuit_validation_test_resp_message(parameter_tvb, isup_tree); + break; + case ANSI_ISUP_MESSAGE_TYPE_CCT_VAL_TEST: + /* no dissector necessary since no mandatory parameters included */ + break; + default: + bufferlength = tvb_length_remaining(message_tvb, offset); + if (bufferlength != 0) + proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, + "Unknown Message type (possibly reserved/used in former ISUP version)"); + break; + } + + /* extract pointer to start of optional part (if any) */ + if (opt_part_possible == TRUE) { + opt_parameter_pointer = tvb_get_guint8(message_tvb, offset); + if (opt_parameter_pointer > 0) { + proto_tree_add_uint_format(isup_tree, hf_isup_pointer_to_start_of_optional_part, message_tvb, offset, + PARAMETER_POINTER_LENGTH, opt_parameter_pointer, + "Pointer to start of optional part: %u", opt_parameter_pointer); + offset += opt_parameter_pointer; + optional_parameter_tvb = tvb_new_subset_remaining(message_tvb, offset); + dissect_ansi_isup_optional_parameter(optional_parameter_tvb, pinfo, isup_tree, itu_isup_variant); + } + else + proto_tree_add_uint_format(isup_tree, hf_isup_pointer_to_start_of_optional_part, message_tvb, offset, + PARAMETER_POINTER_LENGTH, opt_parameter_pointer, + "No optional parameter present (Pointer: %u)", opt_parameter_pointer); + } + else if (message_type != MESSAGE_TYPE_CHARGE_INFO) + proto_tree_add_text(isup_tree, message_tvb, 0, 0, "No optional parameters are possible with this message type"); - /* extract pointer to start of optional part (if any) */ - if (opt_part_possible == TRUE) { - opt_parameter_pointer = tvb_get_guint8(message_tvb, offset); - if (opt_parameter_pointer > 0) { - proto_tree_add_uint_format(isup_tree, hf_isup_pointer_to_start_of_optional_part, message_tvb, offset, - PARAMETER_POINTER_LENGTH, opt_parameter_pointer, - "Pointer to start of optional part: %u", opt_parameter_pointer); - offset += opt_parameter_pointer; - optional_parameter_tvb = tvb_new_subset_remaining(message_tvb, offset); - dissect_ansi_isup_optional_parameter(optional_parameter_tvb, pinfo, isup_tree, itu_isup_variant); - } - else - proto_tree_add_uint_format(isup_tree, hf_isup_pointer_to_start_of_optional_part, message_tvb, offset, - PARAMETER_POINTER_LENGTH, opt_parameter_pointer, - "No optional parameter present (Pointer: %u)", opt_parameter_pointer); - } - else if (message_type != MESSAGE_TYPE_CHARGE_INFO) - proto_tree_add_text(isup_tree, message_tvb, 0, 0, "No optional parameters are possible with this message type"); - - /* if there are calling/called number, we'll get them for the tap */ - tap_rec->calling_number = tap_calling_number ? tap_calling_number : wmem_strdup(wmem_packet_scope(), ""); - tap_rec->called_number = tap_called_number; - tap_rec->cause_value = tap_cause_value; - tap_queue_packet(isup_tap, pinfo, tap_rec); + /* if there are calling/called number, we'll get them for the tap */ + tap_rec->calling_number = tap_calling_number ? tap_calling_number : wmem_strdup(wmem_packet_scope(), ""); + tap_rec->called_number = tap_called_number; + tap_rec->cause_value = tap_cause_value; + tap_queue_packet(isup_tap, pinfo, tap_rec); } static void @@ -12184,7 +12184,7 @@ proto_register_isup(void) &ett_acs, &ett_isup_apm_msg_fragment, &ett_isup_apm_msg_fragments, - &ett_isup_range, + &ett_isup_range, }; static const enum_val_t isup_variants[] = { diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index 36b61f62ed..1e2e492de0 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -267,14 +267,14 @@ dissect_kafka_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int s if (raw) { payload = tvb_child_uncompress(tvb, raw, 0, tvb_length(raw)); - if (payload) { - add_new_data_source(pinfo, payload, "Uncompressed Message"); - proto_tree_add_item(subtree, hf_kafka_message_value, payload, 0, -1, ENC_NA); - } else { - /* TODO make this an expert item */ - proto_tree_add_text(subtree, tvb, 0, tvb_length(raw), "[Failed to decompress message!]"); - proto_tree_add_item(subtree, hf_kafka_message_value, raw, 0, -1, ENC_NA); - } + if (payload) { + add_new_data_source(pinfo, payload, "Uncompressed Message"); + proto_tree_add_item(subtree, hf_kafka_message_value, payload, 0, -1, ENC_NA); + } else { + /* TODO make this an expert item */ + proto_tree_add_text(subtree, tvb, 0, tvb_length(raw), "[Failed to decompress message!]"); + proto_tree_add_item(subtree, hf_kafka_message_value, raw, 0, -1, ENC_NA); + } offset += tvb_length(raw); } else { diff --git a/epan/dissectors/packet-knet.c b/epan/dissectors/packet-knet.c index 4098220888..bde958db5e 100644 --- a/epan/dissectors/packet-knet.c +++ b/epan/dissectors/packet-knet.c @@ -564,7 +564,7 @@ static int dissect_knet_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_knet(tvb, pinfo, tree, KNET_TCP_PACKET); - return tvb_length(tvb); + return tvb_length(tvb); } static int diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index b117facd57..00b9d7504f 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -278,9 +278,9 @@ static const gchar *get_type (guint8 value) /*Function checksum, found in ACP142 annex B-3 */ static guint16 checksum (guint8 *buffer, gint len, gint offset) { - guint16 c0 = 0, c1 = 0, ret, ctmp; - gint16 cs; - guint8 *hpp, *pls; + guint16 c0 = 0, c1 = 0, ret, ctmp; + gint16 cs; + guint8 *hpp, *pls; if (len < offset+2) { /* Buffer to small */ @@ -1615,14 +1615,14 @@ void proto_register_p_mul (void) void proto_reg_handoff_p_mul (void) { - static gboolean p_mul_prefs_initialized = FALSE; - static range_t *p_mul_port_range; + static gboolean p_mul_prefs_initialized = FALSE; + static range_t *p_mul_port_range; if (!p_mul_prefs_initialized) { p_mul_prefs_initialized = TRUE; data_handle = find_dissector ("data"); } else { - dissector_delete_uint_range ("udp.port", p_mul_port_range, p_mul_handle); + dissector_delete_uint_range ("udp.port", p_mul_port_range, p_mul_handle); g_free (p_mul_port_range); } diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 1469281b4d..dfd04841dc 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3757,35 +3757,35 @@ dissect_vsncp_addressalloc_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, static void dissect_vsncp_apn_ambr_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, - int offset, guint length, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) + int offset, guint length, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { proto_item *tf; proto_tree *field_tree; - if (tree) { + if (tree) { - tf = proto_tree_add_text(tree, tvb, offset, length, "%s: (%d byte%s)", - optp->name, length, plurality(length, "", "s")); - field_tree = proto_item_add_subtree(tf, ett_lcp_options); + tf = proto_tree_add_text(tree, tvb, offset, length, "%s: (%d byte%s)", + optp->name, length, plurality(length, "", "s")); + field_tree = proto_item_add_subtree(tf, ett_lcp_options); - /*de_esm_apn_aggr_max_br(tvb, field_tree, pinfo, offset, length, NULL, 0);*/ - proto_tree_add_text(field_tree, tvb, offset, length, "AMBR Data"); + /*de_esm_apn_aggr_max_br(tvb, field_tree, pinfo, offset, length, NULL, 0);*/ + proto_tree_add_text(field_tree, tvb, offset, length, "AMBR Data"); } } static void dissect_vsncp_ipv6_hsgw_lla_iid_opt(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, - int offset, guint length, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) + int offset, guint length, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { proto_item *tf; proto_tree *field_tree; - if (tree) { - tf = proto_tree_add_text(tree, tvb, offset, length, "%s: (%d byte%s)", - optp->name, length, plurality(length, "", "s")); - field_tree = proto_item_add_subtree(tf, ett_lcp_options); + if (tree) { + tf = proto_tree_add_text(tree, tvb, offset, length, "%s: (%d byte%s)", + optp->name, length, plurality(length, "", "s")); + field_tree = proto_item_add_subtree(tf, ett_lcp_options); - proto_tree_add_text(field_tree, tvb, offset, length, "IPv6 interface identifier"); + proto_tree_add_text(field_tree, tvb, offset, length, "IPv6 interface identifier"); } } @@ -4110,7 +4110,7 @@ dissect_vsncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str_const(code, cp_vals, "Unknown"), code); proto_tree_add_text(fh_tree, tvb, 1, 1, "Identifier: 0x%02x", id); proto_tree_add_text(fh_tree, tvb, 2, 2, "Length: %u", length); - proto_tree_add_item(fh_tree, hf_ppp_oui, tvb, 4, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_ppp_oui, tvb, 4, 3, ENC_BIG_ENDIAN); } offset = 7; |