diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c index 96ed98cfbf..cbe4290987 100644 --- a/asn1/cmp/packet-cmp-template.c +++ b/asn1/cmp/packet-cmp-template.c @@ -329,7 +329,7 @@ void proto_register_cmp(void) { "TCP transport Next Polling Reference", HFILL }}, { &hf_cmp_tcptrans_ttcb, { "Time to check Back", "cmp.tcptrans.ttcb", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "TCP transport Time to check Back", HFILL }}, { &hf_cmp_tcptrans10_version, { "Version", "cmp.tcptrans10.version", diff --git a/asn1/h235/h235.cnf b/asn1/h235/h235.cnf index 4ed1075ca7..816e823f4b 100644 --- a/asn1/h235/h235.cnf +++ b/asn1/h235/h235.cnf @@ -49,7 +49,7 @@ CryptoToken/cryptoEncryptedToken/token encryptedToken #.END #.TYPE_ATTR -TimeStamp TYPE = FT_ABSOLUTE_TIME DISPLAY = BASE_NONE +TimeStamp TYPE = FT_ABSOLUTE_TIME DISPLAY = ABSOLUTE_TIME_LOCAL #.END #.FIELD_ATTR diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 51c1f33bc1..2e3d08236c 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -1964,7 +1964,7 @@ void proto_register_snmp(void) { "Engine ID Data: Text", "snmp.engineid.text", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_snmp_engineid_time, { - "Engine ID Data: Creation Time", "snmp.engineid.time", FT_ABSOLUTE_TIME, BASE_NONE, + "Engine ID Data: Creation Time", "snmp.engineid.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_snmp_engineid_data, { "Engine ID Data", "snmp.engineid.data", FT_BYTES, BASE_NONE, diff --git a/doc/README.developer b/doc/README.developer index da73e951f4..730bfa8ad7 100644 --- a/doc/README.developer +++ b/doc/README.developer @@ -1088,9 +1088,18 @@ FIELDTYPE FT_NONE, FT_BOOLEAN, FT_UINT8, FT_UINT16, FT_UINT24, FT_RELATIVE_TIME, FT_STRING, FT_STRINGZ, FT_EBCDIC, FT_UINT_STRING, FT_ETHER, FT_BYTES, FT_UINT_BYTES, FT_IPv4, FT_IPv6, FT_IPXNET, FT_FRAMENUM, FT_PROTOCOL, FT_GUID, FT_OID -FIELDBASE BASE_NONE, BASE_DEC, BASE_HEX, BASE_OCT, BASE_DEC_HEX, - BASE_HEX_DEC, or BASE_CUSTOM, possibly ORed with - BASE_RANGE_STRING +FIELDBASE For FT_UINT{8,16,24,32} and FT_INT{8,16,24,32): + + BASE_DEC, BASE_HEX, BASE_OCT, BASE_DEC_HEX, BASE_HEX_DEC, + or BASE_CUSTOM, possibly ORed with BASE_RANGE_STRING + + For FT_ABSOLUTE_TIME: + + ABSOLUTE_TIME_LOCAL or ABSOLUTE_TIME_UTC + + For all other types: + + BASE_NONE FIELDCONVERT VALS(x), RVALS(x), TFS(x), NULL BITMASK Usually 0x0 unless using the TFS(x) field conversion. FIELDDESCR A brief description of the field, or NULL. @@ -1688,10 +1697,13 @@ signed integers; the number on the end represent how many bits are used to represent the number. Some constraints are imposed on the header fields depending on the type -(e.g. FT_BYTES) of the field. Non integral types (e.g. types that are _not_ -FT_INT* and FT_UINT*) must use 'BASE_NONE', NULL, 0x0' as values for the -'display', 'strings', 'bitmask' fields. The reason is simply that the type -itself implictly defines the nature of 'display', 'strings', 'bitmask'. +(e.g. FT_BYTES) of the field. Fields of type FT_ABSOLUTE_TIME must use +'ABSOLUTE_TIME_{LOCAL,UTC}, NULL, 0x0' as values for the 'display, +'strings', and 'bitmask' fields, and all other non-integral types (i.e.. +types that are _not_ FT_INT* and FT_UINT*) must use 'BASE_NONE, NULL, 0x0' +as values for the 'display', 'strings', 'bitmask' fields. The reason is +simply that the type itself implictly defines the nature of 'display', +'strings', 'bitmask'. display ------- @@ -1730,9 +1742,14 @@ With integers this is not needed since the type of integer itself (FT_UINT8, FT_UINT16, FT_UINT24, FT_UINT32, etc.) tells the proto_tree how wide the parent bitfield is. -Additionally, BASE_NONE is used for 'display' as a NULL-value. That is, -for non-integers and non-bitfield FT_BOOLEANs, you'll want to use BASE_NONE -in the 'display' field. You may not use BASE_NONE for integers. +For FT_ABSOLUTE_TIME fields, 'display' is used to indicate whether the +time is to be displayed as a time in the time zone for the machine on +which Wireshark/TShark is running or as UTC. + +Additionally, BASE_NONE is used for 'display' as a NULL-value. That is, for +for non-integers other than FT_ABSOLUTE_TIME fields, and non-bitfield +FT_BOOLEANs, you'll want to use BASE_NONE in the 'display' field. You may +not use BASE_NONE for integers. It is possible that in the future we will record the endianness of integers. If so, it is likely that we'll use a bitmask on the display field diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index 74636ddb0b..0a50688545 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -741,10 +741,10 @@ void proto_register_9P(void) {"Type", "9p.stattype", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}}, {&hf_9P_atime, - {"Atime", "9p.atime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + {"Atime", "9p.atime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "Access Time", HFILL}}, {&hf_9P_mtime, - {"Mtime", "9p.mtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + {"Mtime", "9p.mtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "Modified Time", HFILL}}, {&hf_9P_length, {"Length", "9p.length", FT_UINT64, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index e698570c7e..231d43db22 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -4948,17 +4948,17 @@ proto_register_afp(void) { &hf_afp_vol_creation_date, { "Creation date", "afp.vol_creation_date", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "Volume creation date", HFILL }}, { &hf_afp_vol_modification_date, { "Modification date", "afp.vol_modification_date", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "Volume modification date", HFILL }}, { &hf_afp_vol_backup_date, { "Backup date", "afp.vol_backup_date", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "Volume backup date", HFILL }}, { &hf_afp_vol_bytes_free, @@ -5013,17 +5013,17 @@ proto_register_afp(void) { &hf_afp_creation_date, { "Creation date", "afp.creation_date", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_afp_modification_date, { "Modification date", "afp.modification_date", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_afp_backup_date, { "Backup date", "afp.backup_date", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_afp_finder_info, @@ -5468,7 +5468,7 @@ proto_register_afp(void) { &hf_afp_server_time, { "Server time", "afp.server_time", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_afp_cat_req_matches, diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index 3dcd760efa..3c6ea7a7af 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -3085,7 +3085,7 @@ proto_register_afs(void) { &hf_afs_fs_volname, { "Volume Name", "afs.fs.volname", FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_fs_timestamp, { "Timestamp", "afs.fs.timestamp", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_fs_offlinemsg, { "Offline Message", "afs.fs.offlinemsg", FT_STRING, BASE_NONE, 0, 0, "Volume Name", HFILL }}, { &hf_afs_fs_motd, { "Message of the Day", "afs.fs.motd", @@ -3128,9 +3128,9 @@ proto_register_afs(void) FT_BOOLEAN, 32, 0, 0x00000400, NULL, HFILL }}, { &hf_afs_fs_status_clientmodtime, { "Client Modification Time", "afs.fs.status.clientmodtime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_fs_status_servermodtime, { "Server Modification Time", "afs.fs.status.servermodtime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_fs_status_owner, { "Owner", "afs.fs.status.owner", FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }}, { &hf_afs_fs_status_group, { "Group", "afs.fs.status.group", @@ -3172,7 +3172,7 @@ proto_register_afs(void) { &hf_afs_fs_volsync_spare1, { "Volume Creation Timestamp", "afs.fs.volsync.spare1", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_fs_volsync_spare2, { "Spare 2", "afs.fs.volsync.spare2", FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }}, { &hf_afs_fs_volsync_spare3, { "Spare 3", "afs.fs.volsync.spare3", @@ -3272,13 +3272,13 @@ proto_register_afs(void) { &hf_afs_bos_host, { "Host", "afs.bos.host", FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_bos_newtime, { "New Time", "afs.bos.newtime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_bos_baktime, { "Backup Time", "afs.bos.baktime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_bos_oldtime, { "Old Time", "afs.bos.oldtime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_bos_keymodtime, { "Key Modification Time", "afs.bos.keymodtime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_bos_keychecksum, { "Key Checksum", "afs.bos.keychecksum", FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }}, { &hf_afs_bos_keyspare2, { "Key Spare 2", "afs.bos.keyspare2", @@ -3391,7 +3391,7 @@ proto_register_afs(void) { &hf_afs_cb_callback_version, { "Version", "afs.cb.callback.version", FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }}, { &hf_afs_cb_callback_expires, { "Expires", "afs.cb.callback.expires", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_cb_callback_type, { "Type", "afs.cb.callback.type", FT_UINT32, BASE_DEC, VALS(cb_types), 0, NULL, HFILL }}, { &hf_afs_cb_fid_volume, { "FileID (Volume)", "afs.cb.fid.volume", @@ -3433,13 +3433,13 @@ proto_register_afs(void) { &hf_afs_ubik_state, { "State", "afs.ubik.state", FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_version_epoch, { "Epoch", "afs.ubik.version.epoch", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_version_counter, { "Counter", "afs.ubik.version.counter", FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_votestart, { "Vote Started", "afs.ubik.votestart", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_voteend, { "Vote Ends", "afs.ubik.voteend", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_file, { "File", "afs.ubik.file", FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_pos, { "Position", "afs.ubik.position", @@ -3456,29 +3456,29 @@ proto_register_afs(void) FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_now, { "Now", "afs.ubik.now", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_lastyestime, { "Last Yes Time", "afs.ubik.lastyesttime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_lastyeshost, { "Last Yes Host", "afs.ubik.lastyeshost", FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_lastyesstate, { "Last Yes State", "afs.ubik.lastyesstate", FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_lastyesclaim, { "Last Yes Claim", "afs.ubik.lastyesclaim", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_lowesthost, { "Lowest Host", "afs.ubik.lowesthost", FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_lowesttime, { "Lowest Time", "afs.ubik.lowesttime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_synchost, { "Sync Host", "afs.ubik.synchost", FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_addr, { "Address", "afs.ubik.addr", FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_synctime, { "Sync Time", "afs.ubik.synctime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_lastvotetime, { "Last Vote Time", "afs.ubik.lastvotetime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_lastbeaconsent, { "Last Beacon Sent", "afs.ubik.lastbeaconsent", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_lastvote, { "Last Vote", "afs.ubik.lastvote", FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_currentdb, { "Current DB", "afs.ubik.currentdb", @@ -3490,7 +3490,7 @@ proto_register_afs(void) { &hf_afs_ubik_amsyncsite, { "Am Sync Site", "afs.ubik.amsyncsite", FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_syncsiteuntil, { "Sync Site Until", "afs.ubik.syncsiteuntil", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_nservers, { "Number of Servers", "afs.ubik.nservers", FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_lockedpages, { "Locked Pages", "afs.ubik.lockedpages", @@ -3512,7 +3512,7 @@ proto_register_afs(void) { &hf_afs_ubik_writetrans, { "Write Transaction", "afs.ubik.writetran", FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_epochtime, { "Epoch Time", "afs.ubik.epochtime", - FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }}, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_isclone, { "Is Clone", "afs.ubik.isclone", FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }}, { &hf_afs_reqframe, { "Request Frame", "afs.reqframe", diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c index 63a344a85b..03d13a3e53 100644 --- a/epan/dissectors/packet-aim-ssi.c +++ b/epan/dissectors/packet-aim-ssi.c @@ -343,7 +343,7 @@ proto_register_aim_ssi(void) { "SSI Object count", "aim_ssi.fnac.numitems", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_aim_fnac_subtype_ssi_last_change_time, - { "SSI Last Change Time", "aim_ssi.fnac.last_change_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } + { "SSI Last Change Time", "aim_ssi.fnac.last_change_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_aim_fnac_subtype_ssi_buddyname_len, { "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c index 2e669f0a9f..95f729893a 100644 --- a/epan/dissectors/packet-ayiya.c +++ b/epan/dissectors/packet-ayiya.c @@ -181,7 +181,7 @@ proto_register_ayiya(void) }, { &hf_epoch, { "Epoch", "ayiya.epoch", FT_ABSOLUTE_TIME, - BASE_NONE, NULL, 0x0, NULL, HFILL + ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_identity, diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index de2c06e945..252abdbac1 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -1715,7 +1715,7 @@ void proto_register_cmp(void) { "TCP transport Next Polling Reference", HFILL }}, { &hf_cmp_tcptrans_ttcb, { "Time to check Back", "cmp.tcptrans.ttcb", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "TCP transport Time to check Back", HFILL }}, { &hf_cmp_tcptrans10_version, { "Version", "cmp.tcptrans10.version", diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index 41064527c6..dd5c80d6fe 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -494,7 +494,7 @@ proto_register_dcc(void) NULL, 0, NULL, HFILL }}, { &hf_dcc_date, { - "Date", "dcc.date", FT_ABSOLUTE_TIME, BASE_NONE, + "Date", "dcc.date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_dcc_adminop, { diff --git a/epan/dissectors/packet-dcerpc-budb.c b/epan/dissectors/packet-dcerpc-budb.c index 438eac1f70..8e9ae92271 100644 --- a/epan/dissectors/packet-dcerpc-budb.c +++ b/epan/dissectors/packet-dcerpc-budb.c @@ -3886,12 +3886,12 @@ proto_register_budb(void) NULL, HFILL }}, { &hf_budb_dumpEntry_created, - { "created", "budb.dumpEntry.created", FT_ABSOLUTE_TIME, BASE_NONE, + { "created", "budb.dumpEntry.created", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_budb_dumpEntry_incTime, - { "incTime", "budb.dumpEntry.incTime", FT_ABSOLUTE_TIME, BASE_NONE, + { "incTime", "budb.dumpEntry.incTime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -3941,12 +3941,12 @@ proto_register_budb(void) NULL, HFILL }}, { &hf_budb_tapeEntry_written, - { "written", "budb.tapeEntry.written", FT_ABSOLUTE_TIME, BASE_NONE, + { "written", "budb.tapeEntry.written", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_budb_tapeEntry_expires, - { "expires", "budb.tapeEntry.expires", FT_ABSOLUTE_TIME, BASE_NONE, + { "expires", "budb.tapeEntry.expires", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -4051,12 +4051,12 @@ proto_register_budb(void) NULL, HFILL }}, { &hf_budb_volumeEntry_clone, - { "clone", "budb.volumeEntry.clone", FT_ABSOLUTE_TIME, BASE_NONE, + { "clone", "budb.volumeEntry.clone", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_budb_volumeEntry_incTime, - { "incTime", "budb.volumeEntry.incTime", FT_ABSOLUTE_TIME, BASE_NONE, + { "incTime", "budb.volumeEntry.incTime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -4231,12 +4231,12 @@ proto_register_budb(void) NULL, HFILL }}, { &hf_budb_dbVolume_clone, - { "clone", "budb.dbVolume.clone", FT_ABSOLUTE_TIME, BASE_NONE, + { "clone", "budb.dbVolume.clone", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_budb_dbVolume_incTime, - { "incTime", "budb.dbVolume.incTime", FT_ABSOLUTE_TIME, BASE_NONE, + { "incTime", "budb.dbVolume.incTime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-dcerpc-butc.c b/epan/dissectors/packet-dcerpc-butc.c index 16ad33e7d6..906a2605e4 100644 --- a/epan/dissectors/packet-dcerpc-butc.c +++ b/epan/dissectors/packet-dcerpc-butc.c @@ -2270,12 +2270,12 @@ proto_register_butc(void) NULL, HFILL }}, { &hf_butc_tc_dumpDesc_date, - { "date", "butc.tc_dumpDesc.date", FT_ABSOLUTE_TIME, BASE_NONE, + { "date", "butc.tc_dumpDesc.date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_butc_tc_dumpDesc_cloneDate, - { "cloneDate", "butc.tc_dumpDesc.cloneDate", FT_ABSOLUTE_TIME, BASE_NONE, + { "cloneDate", "butc.tc_dumpDesc.cloneDate", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -2705,7 +2705,7 @@ proto_register_butc(void) NULL, HFILL }}, { &hf_butc_tciStatusS_lastPolled, - { "lastPolled", "butc.tciStatusS.lastPolled", FT_ABSOLUTE_TIME, BASE_NONE, + { "lastPolled", "butc.tciStatusS.lastPolled", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c index 5ab2272ad5..f41eef0e47 100644 --- a/epan/dissectors/packet-dcerpc-conv.c +++ b/epan/dissectors/packet-dcerpc-conv.c @@ -183,11 +183,11 @@ proto_register_conv (void) { &hf_conv_who_are_you_rqst_actuid, {"Activity UID", "conv.who_are_you_rqst_actuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }}, { &hf_conv_who_are_you_rqst_boot_time, - {"Boot time", "conv.who_are_you_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + {"Boot time", "conv.who_are_you_rqst_boot_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_conv_who_are_you2_rqst_actuid, {"Activity UID", "conv.who_are_you2_rqst_actuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }}, { &hf_conv_who_are_you2_rqst_boot_time, - {"Boot time", "conv.who_are_you2_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + {"Boot time", "conv.who_are_you2_rqst_boot_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_conv_who_are_you_resp_seq, {"Sequence Number", "conv.who_are_you_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-dcerpc-drsuapi.c b/epan/dissectors/packet-dcerpc-drsuapi.c index 3027a0e2f2..30383a56f7 100644 --- a/epan/dissectors/packet-dcerpc-drsuapi.c +++ b/epan/dissectors/packet-dcerpc-drsuapi.c @@ -8731,7 +8731,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaCoursorEx_time1, - { "time1", "drsuapi.DsReplicaCoursorEx.time1", FT_ABSOLUTE_TIME, BASE_NONE, + { "time1", "drsuapi.DsReplicaCoursorEx.time1", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9456,12 +9456,12 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaNeighbour_last_success, - { "last_success", "drsuapi.DsReplicaNeighbour.last_success", FT_ABSOLUTE_TIME, BASE_NONE, + { "last_success", "drsuapi.DsReplicaNeighbour.last_success", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_drsuapi_DsReplicaNeighbour_last_attempt, - { "last_attempt", "drsuapi.DsReplicaNeighbour.last_attempt", FT_ABSOLUTE_TIME, BASE_NONE, + { "last_attempt", "drsuapi.DsReplicaNeighbour.last_attempt", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9516,7 +9516,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaObjMetaData_originating_last_changed, - { "originating_last_changed", "drsuapi.DsReplicaObjMetaData.originating_last_changed", FT_ABSOLUTE_TIME, BASE_NONE, + { "originating_last_changed", "drsuapi.DsReplicaObjMetaData.originating_last_changed", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9561,7 +9561,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaKccDsaFailure_first_failure, - { "first_failure", "drsuapi.DsReplicaKccDsaFailure.first_failure", FT_ABSOLUTE_TIME, BASE_NONE, + { "first_failure", "drsuapi.DsReplicaKccDsaFailure.first_failure", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9621,7 +9621,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaOp_operation_start, - { "operation_start", "drsuapi.DsReplicaOp.operation_start", FT_ABSOLUTE_TIME, BASE_NONE, + { "operation_start", "drsuapi.DsReplicaOp.operation_start", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9671,7 +9671,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaOpCtr_time, - { "time", "drsuapi.DsReplicaOpCtr.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "time", "drsuapi.DsReplicaOpCtr.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9706,12 +9706,12 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaAttrValMetaData_deleted, - { "deleted", "drsuapi.DsReplicaAttrValMetaData.deleted", FT_ABSOLUTE_TIME, BASE_NONE, + { "deleted", "drsuapi.DsReplicaAttrValMetaData.deleted", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_drsuapi_DsReplicaAttrValMetaData_created, - { "created", "drsuapi.DsReplicaAttrValMetaData.created", FT_ABSOLUTE_TIME, BASE_NONE, + { "created", "drsuapi.DsReplicaAttrValMetaData.created", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9721,7 +9721,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaAttrValMetaData_originating_last_changed, - { "originating_last_changed", "drsuapi.DsReplicaAttrValMetaData.originating_last_changed", FT_ABSOLUTE_TIME, BASE_NONE, + { "originating_last_changed", "drsuapi.DsReplicaAttrValMetaData.originating_last_changed", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9766,7 +9766,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaCoursor2_last_sync_success, - { "last_sync_success", "drsuapi.DsReplicaCoursor2.last_sync_success", FT_ABSOLUTE_TIME, BASE_NONE, + { "last_sync_success", "drsuapi.DsReplicaCoursor2.last_sync_success", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9796,7 +9796,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaCoursor3_last_sync_success, - { "last_sync_success", "drsuapi.DsReplicaCoursor3.last_sync_success", FT_ABSOLUTE_TIME, BASE_NONE, + { "last_sync_success", "drsuapi.DsReplicaCoursor3.last_sync_success", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9831,7 +9831,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaObjMetaData2_originating_last_changed, - { "originating_last_changed", "drsuapi.DsReplicaObjMetaData2.originating_last_changed", FT_ABSOLUTE_TIME, BASE_NONE, + { "originating_last_changed", "drsuapi.DsReplicaObjMetaData2.originating_last_changed", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9891,12 +9891,12 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaAttrValMetaData2_deleted, - { "deleted", "drsuapi.DsReplicaAttrValMetaData2.deleted", FT_ABSOLUTE_TIME, BASE_NONE, + { "deleted", "drsuapi.DsReplicaAttrValMetaData2.deleted", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_drsuapi_DsReplicaAttrValMetaData2_created, - { "created", "drsuapi.DsReplicaAttrValMetaData2.created", FT_ABSOLUTE_TIME, BASE_NONE, + { "created", "drsuapi.DsReplicaAttrValMetaData2.created", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9906,7 +9906,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaAttrValMetaData2_originating_last_changed, - { "originating_last_changed", "drsuapi.DsReplicaAttrValMetaData2.originating_last_changed", FT_ABSOLUTE_TIME, BASE_NONE, + { "originating_last_changed", "drsuapi.DsReplicaAttrValMetaData2.originating_last_changed", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, @@ -9966,7 +9966,7 @@ proto_register_drsuapi(void) NULL, HFILL }}, { &hf_drsuapi_DsReplicaConnection04_bind_time, - { "bind_time", "drsuapi.DsReplicaConnection04.bind_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "bind_time", "drsuapi.DsReplicaConnection04.bind_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c index 6fa7d8bc0d..40363e1621 100644 --- a/epan/dissectors/packet-dcerpc-fileexp.c +++ b/epan/dissectors/packet-dcerpc-fileexp.c @@ -4296,7 +4296,7 @@ proto_register_fileexp (void) { &hf_fileexp_tn_string, {"String", "fileexp.string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fileexp_tn_size, {"String Size", "fileexp.tn_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_fileexp_opnum, {"Operation", "fileexp.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - { &hf_fileexp_setcontext_rqst_epochtime, {"EpochTime:", "fileexp.setcontext_rqst_epochtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + { &hf_fileexp_setcontext_rqst_epochtime, {"EpochTime:", "fileexp.setcontext_rqst_epochtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL}}, { &hf_fileexp_setcontext_rqst_secobjectid, { "SetObjectid:", "fileexp.setcontext_secobjextid", FT_STRING, BASE_NONE, NULL, 0x0, "UUID", HFILL} } , { &hf_fileexp_setcontext_rqst_clientsizesattrs, { "ClientSizeAttrs:", "fileexp.setcontext_clientsizesattrs", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } , { &hf_fileexp_setcontext_rqst_parm7, { "Parm7:", "fileexp.setcontext.parm7", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } , diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c index 5cbe063668..6fd2c1e692 100644 --- a/epan/dissectors/packet-dcerpc-frsrpc.c +++ b/epan/dissectors/packet-dcerpc-frsrpc.c @@ -325,7 +325,7 @@ proto_register_dcerpc_frsrpc(void) NULL, 0x0, NULL, HFILL }}, { &hf_frsrpc_timestamp, - { "Timestamp", "frsrpc.timestamp", FT_ABSOLUTE_TIME, BASE_NONE, + { "Timestamp", "frsrpc.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c index 561645102c..a5434f061b 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.c +++ b/epan/dissectors/packet-dcerpc-frstrans.c @@ -2577,7 +2577,7 @@ void proto_register_dcerpc_frstrans(void) { &hf_frstrans_frstrans_EpoqueVector_year, { "Year", "frstrans.frstrans_EpoqueVector.year", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_frstrans_frstrans_Update_fence, - { "Fence", "frstrans.frstrans_Update.fence", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Fence", "frstrans.frstrans_Update.fence", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_frstrans_frstrans_RequestVersionVector_sequence_number, { "Sequence Number", "frstrans.frstrans_RequestVersionVector.sequence_number", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_frstrans_opnum, @@ -2675,7 +2675,7 @@ void proto_register_dcerpc_frstrans(void) { &hf_frstrans_frstrans_RequestUpdates_version_vector_diff, { "Version Vector Diff", "frstrans.frstrans_RequestUpdates.version_vector_diff", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_frstrans_frstrans_Update_clock, - { "Clock", "frstrans.frstrans_Update.clock", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Clock", "frstrans.frstrans_Update.clock", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_frstrans_frstrans_AsyncVersionVectorResponse_epoque_vector, { "Epoque Vector", "frstrans.frstrans_AsyncVersionVectorResponse.epoque_vector", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_frstrans_frstrans_VersionVector_high, @@ -2683,7 +2683,7 @@ void proto_register_dcerpc_frstrans(void) { &hf_frstrans_frstrans_EpoqueVector_day_of_week, { "Day Of Week", "frstrans.frstrans_EpoqueVector.day_of_week", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_frstrans_frstrans_Update_create_time, - { "Create Time", "frstrans.frstrans_Update.create_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Create Time", "frstrans.frstrans_Update.create_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_frstrans_frstrans_EpoqueVector_milli_seconds, { "Milli Seconds", "frstrans.frstrans_EpoqueVector.milli_seconds", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_frstrans_frstrans_RdcFileInfo_rdc_minimum_compatible_version, diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index 989794e91d..8feb38848a 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -11887,7 +11887,7 @@ void proto_register_dcerpc_lsarpc(void) { &hf_lsarpc_lsa_SetSecret_old_val, { "Old Val", "lsarpc.lsa_SetSecret.old_val", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_TrustDomainInfoBuffer_last_update_time, - { "Last Update Time", "lsarpc.lsa_TrustDomainInfoBuffer.last_update_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Update Time", "lsarpc.lsa_TrustDomainInfoBuffer.last_update_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_DnsDomainInfo_dns_forest, { "Dns Forest", "lsarpc.lsa_DnsDomainInfo.dns_forest", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_QueryDomainInformationPolicy_info, @@ -11901,7 +11901,7 @@ void proto_register_dcerpc_lsarpc(void) { &hf_lsarpc_lsa_AuditLogInfo_unknown, { "Unknown", "lsarpc.lsa_AuditLogInfo.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_AuditLogInfo_retention_time, - { "Retention Time", "lsarpc.lsa_AuditLogInfo.retention_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Retention Time", "lsarpc.lsa_AuditLogInfo.retention_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_ObjectAttribute_sec_desc, { "Sec Desc", "lsarpc.lsa_ObjectAttribute.sec_desc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_DnsDomainInfo_name, @@ -11911,7 +11911,7 @@ void proto_register_dcerpc_lsarpc(void) { &hf_lsarpc_lsa_TranslatedSid2_sid_index, { "Sid Index", "lsarpc.lsa_TranslatedSid2.sid_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_QuerySecret_old_mtime, - { "Old Mtime", "lsarpc.lsa_QuerySecret.old_mtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Old Mtime", "lsarpc.lsa_QuerySecret.old_mtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_OpenTrustedDomain_handle, { "Handle", "lsarpc.lsa_OpenTrustedDomain.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_TransNameArray_names, @@ -12221,7 +12221,7 @@ void proto_register_dcerpc_lsarpc(void) { &hf_lsarpc_lsa_TrustedDomainInfo_password, { "Password", "lsarpc.lsa_TrustedDomainInfo.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_ModificationInfo_db_create_time, - { "Db Create Time", "lsarpc.lsa_ModificationInfo.db_create_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Db Create Time", "lsarpc.lsa_ModificationInfo.db_create_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_NOTIFICATION, { "Lsa Policy Notification", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_NOTIFICATION", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_NOTIFICATION_tfs), ( 0x00001000 ), NULL, HFILL }}, { &hf_lsarpc_lsa_PolicyInformation_domain, @@ -12301,7 +12301,7 @@ void proto_register_dcerpc_lsarpc(void) { &hf_lsarpc_lsa_EnumAccountRights_handle, { "Handle", "lsarpc.lsa_EnumAccountRights.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_AuditLogInfo_time_to_shutdown, - { "Time To Shutdown", "lsarpc.lsa_AuditLogInfo.time_to_shutdown", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Time To Shutdown", "lsarpc.lsa_AuditLogInfo.time_to_shutdown", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_VIEW, { "Lsa Account View", "lsarpc.lsa_AccountAccessMask.LSA_ACCOUNT_VIEW", FT_BOOLEAN, 32, TFS(&lsa_AccountAccessMask_LSA_ACCOUNT_VIEW_tfs), ( 0x00000001 ), NULL, HFILL }}, { &hf_lsarpc_lsa_TrustDomainInfoInfoEx_domain_name, @@ -12561,7 +12561,7 @@ void proto_register_dcerpc_lsarpc(void) { &hf_lsarpc_lsa_ModificationInfo_modified_id, { "Modified Id", "lsarpc.lsa_ModificationInfo.modified_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_QuerySecret_new_mtime, - { "New Mtime", "lsarpc.lsa_QuerySecret.new_mtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "New Mtime", "lsarpc.lsa_QuerySecret.new_mtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_LookupPrivValue_handle, { "Handle", "lsarpc.lsa_LookupPrivValue.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lsarpc_lsa_TransSidArray2_count, diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index ffaf91f626..8644ea184b 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -8273,7 +8273,7 @@ static hf_register_info hf[] = { NULL, 0x0, "Unknown char. If you know what this is, contact wireshark developers.", HFILL }}, { &hf_netlogon_acct_expiry_time, - { "Acct Expiry Time", "netlogon.acct.expiry_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Acct Expiry Time", "netlogon.acct.expiry_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "When this account will expire", HFILL }}, { &hf_netlogon_nt_pwd_present, @@ -8585,7 +8585,7 @@ static hf_register_info hf[] = { NULL, 0x0, NULL, HFILL }}, { &hf_netlogon_timestamp, - { "Timestamp", "netlogon.timestamp", FT_ABSOLUTE_TIME, BASE_NONE, + { "Timestamp", "netlogon.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_netlogon_user_rid, @@ -9049,23 +9049,23 @@ static hf_register_info hf[] = { NULL, 0x0, NULL, HFILL }}, { &hf_netlogon_logon_time, - { "Logon Time", "netlogon.logon_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Logon Time", "netlogon.logon_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time for last time this user logged on", HFILL }}, { &hf_netlogon_kickoff_time, - { "Kickoff Time", "netlogon.kickoff_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Kickoff Time", "netlogon.kickoff_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when this user will be kicked off", HFILL }}, { &hf_netlogon_logoff_time, - { "Logoff Time", "netlogon.logoff_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Logoff Time", "netlogon.logoff_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time for last time this user logged off", HFILL }}, { &hf_netlogon_last_logoff_time, - { "Last Logoff Time", "netlogon.last_logoff_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last Logoff Time", "netlogon.last_logoff_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time for last time this user logged off", HFILL }}, { &hf_netlogon_pwd_last_set_time, - { "PWD Last Set", "netlogon.pwd_last_set_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "PWD Last Set", "netlogon.pwd_last_set_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Last time this users password was changed", HFILL }}, { &hf_netlogon_pwd_age, @@ -9073,35 +9073,35 @@ static hf_register_info hf[] = { NULL, 0, "Time since this users password was changed", HFILL }}, { &hf_netlogon_pwd_can_change_time, - { "PWD Can Change", "netlogon.pwd_can_change_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "PWD Can Change", "netlogon.pwd_can_change_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "When this users password may be changed", HFILL }}, { &hf_netlogon_pwd_must_change_time, - { "PWD Must Change", "netlogon.pwd_must_change_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "PWD Must Change", "netlogon.pwd_must_change_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "When this users password must be changed", HFILL }}, { &hf_netlogon_domain_create_time, - { "Domain Create Time", "netlogon.domain_create_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Domain Create Time", "netlogon.domain_create_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when this domain was created", HFILL }}, { &hf_netlogon_domain_modify_time, - { "Domain Modify Time", "netlogon.domain_modify_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Domain Modify Time", "netlogon.domain_modify_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when this domain was last modified", HFILL }}, { &hf_netlogon_db_modify_time, - { "DB Modify Time", "netlogon.db_modify_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "DB Modify Time", "netlogon.db_modify_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when last modified", HFILL }}, { &hf_netlogon_db_create_time, - { "DB Create Time", "netlogon.db_create_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "DB Create Time", "netlogon.db_create_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when created", HFILL }}, { &hf_netlogon_cipher_current_set_time, - { "Cipher Current Set Time", "netlogon.cipher_current_set_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Cipher Current Set Time", "netlogon.cipher_current_set_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when current cipher was initiated", HFILL }}, { &hf_netlogon_cipher_old_set_time, - { "Cipher Old Set Time", "netlogon.cipher_old_set_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Cipher Old Set Time", "netlogon.cipher_old_set_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when previous cipher was initiated", HFILL }}, { &hf_netlogon_audit_retention_period, diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index d3ee3e1eb8..c6fefab3e2 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -15393,7 +15393,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_GroupInfo_attributes, { "Attributes", "samr.samr_GroupInfo.attributes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_DomInfo3_force_logoff_time, - { "Force Logoff Time", "samr.samr_DomInfo3.force_logoff_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Force Logoff Time", "samr.samr_DomInfo3.force_logoff_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ChangePasswordUser_new_nt_crypted, { "New Nt Crypted", "samr.samr_ChangePasswordUser.new_nt_crypted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ChangePasswordUser3_reject, @@ -15471,7 +15471,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_SetUserInfo_level, { "Level", "samr.samr_SetUserInfo.level", FT_UINT1632, BASE_DEC, VALS(samr_samr_UserInfoLevel_vals), 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_last_logon, - { "Last Logon", "samr.samr_UserInfo21.last_logon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Logon", "samr.samr_UserInfo21.last_logon", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_GetBootKeyInformation_domain_handle, { "Domain Handle", "samr.samr_GetBootKeyInformation.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_lm_password, @@ -15487,7 +15487,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_1, { "Samr Domain Access Set Info 1", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_SET_INFO_1", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_1_tfs), ( 0x00000002 ), NULL, HFILL }}, { &hf_samr_samr_UserInfo3_last_logon, - { "Last Logon", "samr.samr_UserInfo3.last_logon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Logon", "samr.samr_UserInfo3.last_logon", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo_info10, { "Info10", "samr.samr_UserInfo.info10", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_EnumDomainGroups_max_size, @@ -15667,7 +15667,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_CryptPasswordEx_data, { "Data", "samr.samr_CryptPasswordEx.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ValidatePasswordInfo_bad_password_time, - { "Bad Password Time", "samr.samr_ValidatePasswordInfo.bad_password_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Bad Password Time", "samr.samr_ValidatePasswordInfo.bad_password_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_AcctFlags_ACB_USE_DES_KEY_ONLY, { "Acb Use Des Key Only", "samr.samr_AcctFlags.ACB_USE_DES_KEY_ONLY", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_USE_DES_KEY_ONLY_tfs), ( 0x00008000 ), NULL, HFILL }}, { &hf_samr_samr_DispInfo_info1, @@ -15677,13 +15677,13 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_DispInfo_info4, { "Info4", "samr.samr_DispInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_DomInfo8_domain_create_time, - { "Domain Create Time", "samr.samr_DomInfo8.domain_create_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Domain Create Time", "samr.samr_DomInfo8.domain_create_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_private, { "Private", "samr.samr_UserInfo21.private", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ChangePasswordUser_old_nt_crypted, { "Old Nt Crypted", "samr.samr_ChangePasswordUser.old_nt_crypted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_DomGeneralInformation_force_logoff_time, - { "Force Logoff Time", "samr.samr_DomGeneralInformation.force_logoff_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Force Logoff Time", "samr.samr_DomGeneralInformation.force_logoff_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_DomInfo12_lockout_threshold, { "Lockout Threshold", "samr.samr_DomInfo12.lockout_threshold", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_GroupInfoAttributes_attributes, @@ -15725,7 +15725,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_UserInfo21_bad_password_count, { "Bad Password Count", "samr.samr_UserInfo21.bad_password_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_acct_expiry, - { "Acct Expiry", "samr.samr_UserInfo21.acct_expiry", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Acct Expiry", "samr.samr_UserInfo21.acct_expiry", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_EnumDomainUsers_max_size, { "Max Size", "samr.samr_EnumDomainUsers.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_FieldsPresent_SAMR_FIELD_ALLOW_PWD_CHANGE, @@ -15745,7 +15745,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_Connect5_level_out, { "Level Out", "samr.samr_Connect5.level_out", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo5_last_logon, - { "Last Logon", "samr.samr_UserInfo5.last_logon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Logon", "samr.samr_UserInfo5.last_logon", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ChangePasswordUser2_server, { "Server", "samr.samr_ChangePasswordUser2.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_SetDomainInfo_info, @@ -15775,7 +15775,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_UserInfo23_password, { "Password", "samr.samr_UserInfo23.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_last_logoff, - { "Last Logoff", "samr.samr_UserInfo21.last_logoff", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Logoff", "samr.samr_UserInfo21.last_logoff", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_DispInfo_info2, { "Info2", "samr.samr_DispInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_EnumDomainUsers_resume_handle, @@ -15997,7 +15997,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_DomGeneralInformation2_lockout_threshold, { "Lockout Threshold", "samr.samr_DomGeneralInformation2.lockout_threshold", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_last_password_change, - { "Last Password Change", "samr.samr_UserInfo21.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Password Change", "samr.samr_UserInfo21.last_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ChangePasswordUser2_account, { "Account", "samr.samr_ChangePasswordUser2.account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ChangePasswordUser3_lm_password, @@ -16017,7 +16017,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_UserInfo3_acct_flags, { "Acct Flags", "samr.samr_UserInfo3.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo3_allow_password_change, - { "Allow Password Change", "samr.samr_UserInfo3.allow_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Allow Password Change", "samr.samr_UserInfo3.allow_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_QueryDomainInfo2_level, { "Level", "samr.samr_QueryDomainInfo2.level", FT_UINT1632, BASE_DEC, VALS(samr_samr_DomainInfoClass_vals), 0, NULL, HFILL }}, { &hf_samr_samr_GetDisplayEnumerationIndex_name, @@ -16025,9 +16025,9 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_ValidatePasswordReq3_info, { "Info", "samr.samr_ValidatePasswordReq3.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ValidatePasswordInfo_lockout_time, - { "Lockout Time", "samr.samr_ValidatePasswordInfo.lockout_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Lockout Time", "samr.samr_ValidatePasswordInfo.lockout_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo17_acct_expiry, - { "Acct Expiry", "samr.samr_UserInfo17.acct_expiry", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Acct Expiry", "samr.samr_UserInfo17.acct_expiry", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_DomInfo1_password_history_length, { "Password History Length", "samr.samr_DomInfo1.password_history_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_QueryUserInfo_info, @@ -16081,7 +16081,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_GroupInfo_name, { "Name", "samr.samr_GroupInfo.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo3_force_password_change, - { "Force Password Change", "samr.samr_UserInfo3.force_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Force Password Change", "samr.samr_UserInfo3.force_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ChangePasswordUser_nt_present, { "Nt Present", "samr.samr_ChangePasswordUser.nt_present", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_home_directory, @@ -16145,7 +16145,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_UserInfo21_unknown4, { "Unknown4", "samr.samr_UserInfo21.unknown4", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_DomInfo13_domain_create_time, - { "Domain Create Time", "samr.samr_DomInfo13.domain_create_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Domain Create Time", "samr.samr_DomInfo13.domain_create_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_AcctFlags_ACB_WSTRUST, { "Acb Wstrust", "samr.samr_AcctFlags.ACB_WSTRUST", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_WSTRUST_tfs), ( 0x00000080 ), NULL, HFILL }}, { &hf_samr_samr_DispEntryAscii_idx, @@ -16155,7 +16155,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_UserInfo5_logon_count, { "Logon Count", "samr.samr_UserInfo5.logon_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo5_last_logoff, - { "Last Logoff", "samr.samr_UserInfo5.last_logoff", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Logoff", "samr.samr_UserInfo5.last_logoff", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ValidatePassword_level, { "Level", "samr.samr_ValidatePassword.level", FT_UINT1632, BASE_DEC, VALS(samr_samr_ValidatePasswordLevel_vals), 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo6_full_name, @@ -16197,7 +16197,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_FieldsPresent_SAMR_FIELD_COMMENT, { "Samr Field Comment", "samr.samr_FieldsPresent.SAMR_FIELD_COMMENT", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_COMMENT_tfs), ( 0x00000020 ), NULL, HFILL }}, { &hf_samr_samr_UserInfo3_last_password_change, - { "Last Password Change", "samr.samr_UserInfo3.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Password Change", "samr.samr_UserInfo3.last_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_Shutdown_connect_handle, { "Connect Handle", "samr.samr_Shutdown.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_sec_desc_buf_len, @@ -16247,7 +16247,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_UserInfo_info18, { "Info18", "samr.samr_UserInfo.info18", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_force_password_change, - { "Force Password Change", "samr.samr_UserInfo21.force_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Force Password Change", "samr.samr_UserInfo21.force_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_nt_password, { "Nt Password", "samr.samr_UserInfo21.nt_password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_DomGeneralInformation_domain_server_state, @@ -16267,7 +16267,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_QueryDisplayInfo2_max_entries, { "Max Entries", "samr.samr_QueryDisplayInfo2.max_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ValidatePasswordInfo_last_password_change, - { "Last Password Change", "samr.samr_ValidatePasswordInfo.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Password Change", "samr.samr_ValidatePasswordInfo.last_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOCALE, { "Samr User Access Get Locale", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_LOCALE", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOCALE_tfs), ( 0x00000002 ), NULL, HFILL }}, { &hf_samr_samr_FieldsPresent_SAMR_FIELD_LOGON_HOURS, @@ -16331,7 +16331,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_GetGroupsForUser_rids, { "Rids", "samr.samr_GetGroupsForUser.rids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo3_last_logoff, - { "Last Logoff", "samr.samr_UserInfo3.last_logoff", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Logoff", "samr.samr_UserInfo3.last_logoff", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ValidatePasswordRepCtr_info, { "Info", "samr.samr_ValidatePasswordRepCtr.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_SetGroupInfo_level, @@ -16343,7 +16343,7 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_SetUserInfo2_level, { "Level", "samr.samr_SetUserInfo2.level", FT_UINT1632, BASE_DEC, VALS(samr_samr_UserInfoLevel_vals), 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo5_acct_expiry, - { "Acct Expiry", "samr.samr_UserInfo5.acct_expiry", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Acct Expiry", "samr.samr_UserInfo5.acct_expiry", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_Connect5_info_in, { "Info In", "samr.samr_Connect5.info_in", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_nt_password_set, @@ -16419,13 +16419,13 @@ void proto_register_dcerpc_samr(void) { &hf_samr_samr_SetDsrmPassword_unknown, { "Unknown", "samr.samr_SetDsrmPassword.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo5_last_password_change, - { "Last Password Change", "samr.samr_UserInfo5.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Password Change", "samr.samr_UserInfo5.last_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_GROUP, { "Samr Domain Access Create Group", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_CREATE_GROUP", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_GROUP_tfs), ( 0x00000020 ), NULL, HFILL }}, { &hf_samr_samr_QueryDisplayInfo_returned_size, { "Returned Size", "samr.samr_QueryDisplayInfo.returned_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_UserInfo21_allow_password_change, - { "Allow Password Change", "samr.samr_UserInfo21.allow_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Allow Password Change", "samr.samr_UserInfo21.allow_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_ConnectInfo_info1, { "Info1", "samr.samr_ConnectInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_FieldsPresent_SAMR_FIELD_FULL_NAME, diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 7496c0757c..fc3220d453 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -7017,7 +7017,7 @@ proto_register_dcerpc_spoolss(void) NULL, 0, NULL, HFILL }}, { &hf_driverdate, - { "Driver Date", "spoolss.driverdate", FT_ABSOLUTE_TIME, BASE_NONE, + { "Driver Date", "spoolss.driverdate", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Date of driver creation", HFILL }}, { &hf_padding, diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c index 5761e73bc6..317b458aa0 100644 --- a/epan/dissectors/packet-dcerpc-winreg.c +++ b/epan/dissectors/packet-dcerpc-winreg.c @@ -4027,7 +4027,7 @@ void proto_register_dcerpc_winreg(void) { &hf_winreg_winreg_InitiateSystemShutdownEx_timeout, { "Timeout", "winreg.winreg_InitiateSystemShutdownEx.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_winreg_winreg_EnumKey_last_changed_time, - { "Last Changed Time", "winreg.winreg_EnumKey.last_changed_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Changed Time", "winreg.winreg_EnumKey.last_changed_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_winreg_winreg_QueryValue_size, { "Size", "winreg.winreg_QueryValue.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_winreg_winreg_EnumValue_size, @@ -4131,7 +4131,7 @@ void proto_register_dcerpc_winreg(void) { &hf_winreg_winreg_StringBuf_length, { "Length", "winreg.winreg_StringBuf.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_winreg_winreg_QueryInfoKey_last_changed_time, - { "Last Changed Time", "winreg.winreg_QueryInfoKey.last_changed_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Last Changed Time", "winreg.winreg_QueryInfoKey.last_changed_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_winreg_winreg_OpenHKPD_access_mask, { "Access Mask", "winreg.winreg_OpenHKPD.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_winreg_winreg_AbortSystemShutdown_server, diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 7bcc340a67..9dde6f7ca4 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -5356,7 +5356,7 @@ proto_register_dcerpc (void) { &hf_dcerpc_dg_seqnum, { "Sequence num", "dcerpc.dg_seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dcerpc_dg_server_boot, - { "Server boot time", "dcerpc.dg_server_boot", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "Server boot time", "dcerpc.dg_server_boot", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_dcerpc_dg_if_ver, { "Interface Ver", "dcerpc.dg_if_ver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dcerpc_krb5_av_prot_level, diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index a2887a700a..1508ea6e37 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -993,7 +993,7 @@ proto_register_dhcpfo(void) { &hf_dhcpfo_time, { "Time", "dhcpfo.time", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 0b8c5c4819..fc215b84cd 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -3001,7 +3001,7 @@ proto_register_dnp3(void) { "Reserved", "dnp3.al.aoq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG7, NULL, HFILL }}, { &hf_dnp3_al_timestamp, - { "Timestamp", "dnp3.al.timestamp", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "Object Timestamp", HFILL }}, + { "Timestamp", "dnp3.al.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Object Timestamp", HFILL }}, { &hf_dnp3_al_rel_timestamp, { "Relative Timestamp", "dnp3.al.reltimestamp", FT_RELATIVE_TIME, BASE_NONE, NULL, 0, "Object Relative Timestamp", HFILL }}, diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 82b7fd097d..aa12826199 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -2032,7 +2032,7 @@ proto_register_dtls(void) }, { &hf_dtls_handshake_random_time, { "Random.gmt_unix_time", "dtls.handshake.random_time", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "Unix time field of random structure", HFILL } }, { &hf_dtls_handshake_random_bytes, diff --git a/epan/dissectors/packet-e100.c b/epan/dissectors/packet-e100.c index 48f9a221a5..e215c877e4 100644 --- a/epan/dissectors/packet-e100.c +++ b/epan/dissectors/packet-e100.c @@ -173,7 +173,7 @@ proto_register_e100(void) { "Packet Capture Timestamp", "e100.pkt_ts", FT_ABSOLUTE_TIME, - BASE_NONE, + ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c index 77457a740c..48a56f8207 100644 --- a/epan/dissectors/packet-egd.c +++ b/epan/dissectors/packet-egd.c @@ -195,7 +195,7 @@ void proto_register_egd(void) }, { &hf_egd_time, { "Timestamp", "egd.time", - FT_ABSOLUTE_TIME, BASE_NONE, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 490d98d86f..6a2e20367d 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -1323,7 +1323,7 @@ static hf_register_info hf[] = { /* SoC data fields*/ { &hf_epl_soc_mc, { "MC (Multiplexed Cycle Completed)", "epl.soc.mc", FT_BOOLEAN, 8, NULL, EPL_SOC_MC_MASK, NULL, HFILL }}, { &hf_epl_soc_ps, { "PS (Prescaled Slot)", "epl.soc.ps", FT_BOOLEAN, 8, NULL, EPL_SOC_PS_MASK, NULL, HFILL }}, -{ &hf_epl_soc_nettime, { "NetTime", "epl.soc.nettime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +{ &hf_epl_soc_nettime, { "NetTime", "epl.soc.nettime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_epl_soc_relativetime,{ "RelativeTime", "epl.soc.relativetime", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* PReq data fields*/ diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c index 42863ccdc7..c95217f7bb 100644 --- a/epan/dissectors/packet-fmp.c +++ b/epan/dissectors/packet-fmp.c @@ -2088,7 +2088,7 @@ proto_register_fmp(void) NULL, 0, NULL, HFILL }}, { &hf_fmp_btime, { - "Boot Time", "fmp.btime", FT_ABSOLUTE_TIME, BASE_NONE, + "Boot Time", "fmp.btime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Machine Boot Time", HFILL }}, { &hf_fmp_time_sec, { diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index fe04106a2f..af8fdebc13 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -545,7 +545,11 @@ proto_register_frame(void) { static hf_register_info hf[] = { { &hf_frame_arrival_time, - { "Arrival Time", "frame.time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, +#if 0 + { "Arrival Time", "frame.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, +#else + { "Arrival Time", "frame.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0x0, +#endif "Absolute time when this frame was captured", HFILL }}, { &hf_frame_arrival_time_epoch, diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 0567e9a1d5..5dbf0e1cff 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -9119,7 +9119,7 @@ void proto_register_h225(void) { "h225.AliasAddress", HFILL }}, { &hf_h225_timeStamp, { "timeStamp", "h225.timeStamp", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "h235.TimeStamp", HFILL }}, { &hf_h225_token, { "token", "h225.token", @@ -9451,15 +9451,15 @@ void proto_register_h225(void) { "h225.NonStandardParameter", HFILL }}, { &hf_h225_alertingTime, { "alertingTime", "h225.alertingTime", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "h235.TimeStamp", HFILL }}, { &hf_h225_connectTime, { "connectTime", "h225.connectTime", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "h235.TimeStamp", HFILL }}, { &hf_h225_endTime, { "endTime", "h225.endTime", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "h235.TimeStamp", HFILL }}, { &hf_h225_releaseCompleteCauseIE, { "releaseCompleteCauseIE", "h225.releaseCompleteCauseIE", diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index b3e1fe9324..1d3109224d 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -1186,7 +1186,7 @@ void proto_register_h235(void) { "h235.OBJECT_IDENTIFIER", HFILL }}, { &hf_h235_timeStamp, { "timeStamp", "h235.timeStamp", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "h235.TimeStamp", HFILL }}, { &hf_h235_password, { "password", "h235.password", diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index dee5876191..8570ae25e2 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -3082,11 +3082,11 @@ void proto_register_h501(void) { "h501.PartyInformation", HFILL }}, { &hf_h501_startTime, { "startTime", "h501.startTime", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "h235.TimeStamp", HFILL }}, { &hf_h501_endTime, { "endTime", "h501.endTime", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "h235.TimeStamp", HFILL }}, { &hf_h501_terminationCause, { "terminationCause", "h501.terminationCause", diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index b4fb228f67..1bb4e6d67b 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -2127,7 +2127,7 @@ proto_register_iax2 (void) HFILL}}, {&hf_iax2_absts, - {"Absolute Time", "iax2.abstime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + {"Absolute Time", "iax2.abstime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "The absoulte time of this packet (calculated by adding the IAX timestamp to the start time of this call)", HFILL}}, @@ -2363,7 +2363,7 @@ proto_register_iax2 (void) {"Date/Time", "iax2.iax.datetime.raw", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, {&hf_iax2_ie_datetime, - {"Date/Time", "iax2.iax.datetime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + {"Date/Time", "iax2.iax.datetime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, {&hf_iax2_ies[IAX_IE_DEVICETYPE], {"Device type", "iax2.iax.devicetype", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index bf41158122..4e90490198 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -685,7 +685,7 @@ proto_register_ipp(void) { static hf_register_info hf[] = { { &hf_ipp_timestamp, - { "Time", "ipp.timestamp", FT_ABSOLUTE_TIME, BASE_NONE, + { "Time", "ipp.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, }; static gint *ett[] = { diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index cdba0f7986..21d9e203e2 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -5270,7 +5270,7 @@ proto_register_kerberos(void) "Offset", "kerberos.pac.offset", FT_UINT32, BASE_DEC, NULL, 0, "Offset to W2k PAC entry", HFILL }}, { &hf_krb_pac_clientid, { - "ClientID", "kerberos.pac.clientid", FT_ABSOLUTE_TIME, BASE_NONE, + "ClientID", "kerberos.pac.clientid", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "ClientID Timestamp", HFILL }}, { &hf_krb_pac_namelen, { "Name Length", "kerberos.pac.namelen", FT_UINT16, BASE_DEC, diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index 6c76601b5e..6608984f6d 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -382,15 +382,15 @@ proto_register_krb4(void) NULL, HFILL }}, { &hf_krb4_time_sec, { "Time Sec", "krb4.time_sec", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, NULL, HFILL }}, { &hf_krb4_exp_date, { "Exp Date", "krb4.exp_date", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, NULL, HFILL }}, { &hf_krb4_req_date, { "Req Date", "krb4.req_date", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, NULL, HFILL }}, { &hf_krb4_lifetime, { "Lifetime", "krb4.lifetime", diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index 18673a179a..74699a5c40 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -239,7 +239,7 @@ void proto_register_lanforge(void) { &hf_lanforge_timestamp, { "Timestamp", "LANforge.timestamp", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } } diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 82f1eca7bd..3eda0363cd 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -1380,7 +1380,7 @@ proto_register_mmse(void) }, { &hf_mmse_date, { "Date", "mmse.date", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Arrival timestamp of the message or sending timestamp.", HFILL } @@ -1394,7 +1394,7 @@ proto_register_mmse(void) }, { &hf_mmse_delivery_time_abs, { "X-Mms-Delivery-Time", "mmse.delivery_time.abs", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "The time at which message delivery is desired.", HFILL } @@ -1408,7 +1408,7 @@ proto_register_mmse(void) }, { &hf_mmse_expiry_abs, { "X-Mms-Expiry", "mmse.expiry.abs", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Time when message expires and need not be delivered anymore.", HFILL } @@ -1570,7 +1570,7 @@ proto_register_mmse(void) }, { &hf_mmse_reply_charging_deadline_abs, { "X-Mms-Reply-Charging-Deadline", "mmse.reply_charging_deadline.abs", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "The latest time of the recipient(s) to submit the Reply MM.", HFILL } diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index e0932416ad..a6151d284b 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3574,7 +3574,7 @@ proto_register_ndmp(void) NULL, 0, "Reply Sequence number for NDMP PDU", HFILL }}, { &hf_ndmp_timestamp, { - "Time", "ndmp.timestamp", FT_ABSOLUTE_TIME, BASE_NONE, + "Time", "ndmp.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Timestamp for this NDMP PDU", HFILL }}, { &hf_ndmp_msgtype, { @@ -4130,15 +4130,15 @@ proto_register_ndmp(void) TFS(&tfs_ndmp_file_invalid_group), 0x00000004, "invalid_group", HFILL, }}, { &hf_ndmp_file_mtime, { - "mtime", "ndmp.file.mtime", FT_ABSOLUTE_TIME, BASE_NONE, + "mtime", "ndmp.file.mtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Timestamp for mtime for this file", HFILL }}, { &hf_ndmp_file_atime, { - "atime", "ndmp.file.atime", FT_ABSOLUTE_TIME, BASE_NONE, + "atime", "ndmp.file.atime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Timestamp for atime for this file", HFILL }}, { &hf_ndmp_file_ctime, { - "ctime", "ndmp.file.ctime", FT_ABSOLUTE_TIME, BASE_NONE, + "ctime", "ndmp.file.ctime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Timestamp for ctime for this file", HFILL }}, { &hf_ndmp_file_owner, { diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 05d5f2f377..4c009b862a 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -9692,7 +9692,7 @@ proto_register_ndps(void) { &hf_ndps_attribute_time, { "Time", "ndps.attribute_time", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_print_security, diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index f781accade..ff1f6456f8 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -3398,7 +3398,7 @@ proto_register_netflow(void) }, {&hf_cflow_timestamp, {"Timestamp", "cflow.timestamp", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "Current seconds since epoch", HFILL} }, {&hf_cflow_unix_secs, @@ -4146,12 +4146,12 @@ proto_register_netflow(void) }, {&hf_cflow_abstimestart, {"StartTime", "cflow.abstimestart", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "Uptime at start of flow", HFILL} }, {&hf_cflow_abstimeend, {"EndTime", "cflow.abstimeend", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "Uptime at end of flow", HFILL} }, {&hf_cflow_dstnet_v6, diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 72f0219bea..24e3d188ba 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -10787,7 +10787,7 @@ proto_register_nfs(void) NULL, 0, NULL, HFILL }}, { &hf_nfs_atime, { - "atime", "nfs.atime", FT_ABSOLUTE_TIME, BASE_NONE, + "atime", "nfs.atime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Access Time", HFILL }}, { &hf_nfs_atime_sec, { @@ -10803,7 +10803,7 @@ proto_register_nfs(void) NULL, 0, "Access Time, Micro-seconds", HFILL }}, { &hf_nfs_mtime, { - "mtime", "nfs.mtime", FT_ABSOLUTE_TIME, BASE_NONE, + "mtime", "nfs.mtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Modify Time", HFILL }}, { &hf_nfs_mtime_sec, { @@ -10819,7 +10819,7 @@ proto_register_nfs(void) NULL, 0, "Modify Time, Micro-seconds", HFILL }}, { &hf_nfs_ctime, { - "ctime", "nfs.ctime", FT_ABSOLUTE_TIME, BASE_NONE, + "ctime", "nfs.ctime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Creation Time", HFILL }}, { &hf_nfs_ctime_sec, { diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c index 6b3224167c..20c6b9d9d2 100644 --- a/epan/dissectors/packet-nisplus.c +++ b/epan/dissectors/packet-nisplus.c @@ -1688,11 +1688,11 @@ proto_register_nis(void) NULL, 0, "Name Of Group Member", HFILL }}, { &hf_nisplus_object_ctime, { - "ctime", "nisplus.ctime", FT_ABSOLUTE_TIME, BASE_NONE, + "ctime", "nisplus.ctime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time Of Creation", HFILL }}, { &hf_nisplus_object_mtime, { - "mtime", "nisplus.mtime", FT_ABSOLUTE_TIME, BASE_NONE, + "mtime", "nisplus.mtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time Last Modified", HFILL }}, { &hf_nisplus_ib_flags, { @@ -1736,7 +1736,7 @@ proto_register_nis(void) NULL, 0, "Directory To Dump", HFILL }}, { &hf_nisplus_dump_time, { - "time", "nisplus.dump.time", FT_ABSOLUTE_TIME, BASE_NONE, + "time", "nisplus.dump.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "From This Timestamp", HFILL }}, { &hf_nisplus_dummy, { @@ -1744,7 +1744,7 @@ proto_register_nis(void) NULL, 0, NULL, HFILL }}, { &hf_nisplus_ping_time, { - "time", "nisplus.ping.time", FT_ABSOLUTE_TIME, BASE_NONE, + "time", "nisplus.ping.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Timestamp Of The Transaction", HFILL }}, { &hf_nisplus_ping_dir, { @@ -1772,7 +1772,7 @@ proto_register_nis(void) NULL, 0, "Log Entry", HFILL }}, { &hf_nisplus_log_time, { - "time", "nisplus.log.time", FT_ABSOLUTE_TIME, BASE_NONE, + "time", "nisplus.log.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time Of Log Entry", HFILL }}, { &hf_nisplus_log_type, { diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index eee16aebfe..710b6bc8b6 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -2661,7 +2661,7 @@ proto_register_ntlmssp(void) { &hf_ntlmssp_ntlmv2_response_reserved, { "Reserved", "ntlmssp.ntlmv2response.reserved", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response_time, - { "Time", "ntlmssp.ntlmv2response.time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Time", "ntlmssp.ntlmv2response.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response_chal, { "Client challenge", "ntlmssp.ntlmv2response.chal", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response_unknown, @@ -2675,7 +2675,7 @@ proto_register_ntlmssp(void) { &hf_ntlmssp_ntlmv2_response_restriction, { "Encoding restrictions", "ntlmssp.ntlmv2response.name.restrictions", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response_client_time, - { "Client Time", "ntlmssp.ntlmv2response.client_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }} + { "Client Time", "ntlmssp.ntlmv2response.client_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }} }; diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index 07bb43b2f6..d7fb938677 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.c @@ -701,7 +701,7 @@ proto_register_opsi(void) }, { &hf_smc_receive_time_att, { "SMC receive time", "opsi.attr.smc_receive_time", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, NULL, HFILL } }, { &hf_smc_stat_time_att, diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index cad0f60f82..d6e6cce6aa 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -1396,7 +1396,7 @@ void proto_register_p_mul (void) { "Message ID (MSID)", "p_mul.message_id", FT_UINT32, BASE_DEC, NULL, 0x0, "Message ID", HFILL } }, { &hf_expiry_time, - { "Expiry Time", "p_mul.expiry_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Expiry Time", "p_mul.expiry_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_mc_group, { "Multicast Group", "p_mul.mc_group", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index ebdaaa575c..60a544613e 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -768,7 +768,7 @@ proto_register_pktc_mtafqdn(void) "MTA Public Key Hash", "pktc.mtafqdn.pub_key_hash", FT_BYTES, BASE_NONE, NULL, 0, "MTA Public Key Hash (SHA-1)", HFILL }}, { &hf_pktc_mtafqdn_manu_cert_revoked, { - "Manufacturer Cert Revocation Time", "pktc.mtafqdn.manu_cert_revoked", FT_ABSOLUTE_TIME, BASE_NONE, + "Manufacturer Cert Revocation Time", "pktc.mtafqdn.manu_cert_revoked", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Manufacturer Cert Revocation Time (UTC) or 0 if not revoked", HFILL }}, /* MTA FQDN REP */ { &hf_pktc_mtafqdn_fqdn, { diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c index 0b78cf4d19..2880911f5e 100644 --- a/epan/dissectors/packet-pktgen.c +++ b/epan/dissectors/packet-pktgen.c @@ -174,7 +174,7 @@ void proto_register_pktgen(void) { &hf_pktgen_timestamp, { "Timestamp", "pktgen.timestamp", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } } diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index a0462ae558..11fe56bca9 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -3293,7 +3293,7 @@ proto_register_pvfs(void) VALS(names_pvfs_error), 0, NULL, HFILL }}, { &hf_pvfs_atime, - { "atime", "pvfs.atime", FT_ABSOLUTE_TIME, BASE_NONE, + { "atime", "pvfs.atime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Access Time", HFILL }}, { &hf_pvfs_atime_sec, @@ -3305,7 +3305,7 @@ proto_register_pvfs(void) NULL, 0, "Access Time (microseconds)", HFILL }}, { &hf_pvfs_mtime, - { "mtime", "pvfs.mtime", FT_ABSOLUTE_TIME, BASE_NONE, + { "mtime", "pvfs.mtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Modify Time", HFILL }}, { &hf_pvfs_mtime_sec, @@ -3317,7 +3317,7 @@ proto_register_pvfs(void) NULL, 0, "Modify Time (microseconds)", HFILL }}, { &hf_pvfs_ctime, - { "ctime", "pvfs.ctime", FT_ABSOLUTE_TIME, BASE_NONE, + { "ctime", "pvfs.ctime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Creation Time", HFILL }}, { &hf_pvfs_ctime_sec, @@ -3329,7 +3329,7 @@ proto_register_pvfs(void) NULL, 0, "Creation Time (microseconds)", HFILL }}, { &hf_pvfs_parent_atime, - { "Parent atime", "pvfs.parent_atime", FT_ABSOLUTE_TIME, BASE_NONE, + { "Parent atime", "pvfs.parent_atime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Access Time", HFILL }}, { &hf_pvfs_parent_atime_sec, @@ -3341,7 +3341,7 @@ proto_register_pvfs(void) NULL, 0, "Access Time (microseconds)", HFILL }}, { &hf_pvfs_parent_mtime, - { "Parent mtime", "pvfs.parent_mtime", FT_ABSOLUTE_TIME, BASE_NONE, + { "Parent mtime", "pvfs.parent_mtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Modify Time", HFILL }}, { &hf_pvfs_parent_mtime_sec, @@ -3353,7 +3353,7 @@ proto_register_pvfs(void) NULL, 0, "Modify Time (microseconds)", HFILL }}, { &hf_pvfs_parent_ctime, - { "Parent ctime", "pvfs.parent_ctime", FT_ABSOLUTE_TIME, BASE_NONE, + { "Parent ctime", "pvfs.parent_ctime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Creation Time", HFILL }}, { &hf_pvfs_parent_ctime_sec, diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index e2e7bcbe35..e10f0c0270 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -1703,7 +1703,7 @@ static void register_attrs(gpointer k _U_, gpointer v, gpointer p) { hfri[0].hfinfo.display = BASE_NONE; } else if (a->type == radius_date) { hfri[0].hfinfo.type = FT_ABSOLUTE_TIME; - hfri[0].hfinfo.display = BASE_NONE; + hfri[0].hfinfo.display = ABSOLUTE_TIME_LOCAL; } else if (a->type == radius_abinary) { hfri[0].hfinfo.type = FT_BYTES; hfri[0].hfinfo.display = BASE_NONE; diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 7321eb001e..8910818f20 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -1062,7 +1062,7 @@ proto_register_rpcap (void) { "Packet", "rpcap.packet", FT_NONE, BASE_NONE, NULL, 0x0, "Packet data", HFILL } }, { &hf_timestamp, - { "Arrival time", "rpcap.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Arrival time", "rpcap.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_caplen, { "Capture length", "rpcap.cap_len", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index e70cb18051..ae23498e1d 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -598,7 +598,7 @@ proto_register_rx(void) { static hf_register_info hf[] = { { &hf_rx_epoch, { - "Epoch", "rx.epoch", FT_ABSOLUTE_TIME, BASE_NONE, + "Epoch", "rx.epoch", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_rx_cid, { diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index 9565482ee0..8d7d6c808e 100644 --- a/epan/dissectors/packet-sebek.c +++ b/epan/dissectors/packet-sebek.c @@ -296,7 +296,7 @@ proto_register_sebek(void) "Counter", "sebek.counter", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_sebek_time, { - "Time", "sebek.time.sec", FT_ABSOLUTE_TIME, BASE_NONE, + "Time", "sebek.time.sec", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_sebek_pid, { "Process ID", "sebek.pid", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 1601523ffe..d34848e8dc 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -1122,7 +1122,7 @@ proto_register_smb_logon( void) NULL, 0, "SMB NETLOGON Large Serial Number", HFILL }}, { &hf_nt_date_time, - { "NT Date/Time", "smb_netlogon.nt_date_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "NT Date/Time", "smb_netlogon.nt_date_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "SMB NETLOGON NT Date/Time", HFILL }}, { &hf_unknown8, diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 9826475e6f..88ed447bd6 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -3004,7 +3004,7 @@ proto_register_pipe_lanman(void) NULL, 0, "LANMAN Number of Available Bytes", HFILL }}, { &hf_current_time, - { "Current Date/Time", "lanman.current_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Current Date/Time", "lanman.current_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "LANMAN Current date and time, in seconds since 00:00:00, January 1, 1970", HFILL }}, { &hf_msecs, @@ -3124,19 +3124,19 @@ proto_register_pipe_lanman(void) NULL, 0, "LANMAN Number of incorrect passwords entered since last successful login", HFILL }}, { &hf_last_logon, - { "Last Logon Date/Time", "lanman.last_logon", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last Logon Date/Time", "lanman.last_logon", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "LANMAN Date and time of last logon", HFILL }}, { &hf_last_logoff, - { "Last Logoff Date/Time", "lanman.last_logoff", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last Logoff Date/Time", "lanman.last_logoff", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "LANMAN Date and time of last logoff", HFILL }}, { &hf_logoff_time, - { "Logoff Date/Time", "lanman.logoff_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Logoff Date/Time", "lanman.logoff_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "LANMAN Date and time when user should log off", HFILL }}, { &hf_kickoff_time, - { "Kickoff Date/Time", "lanman.kickoff_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Kickoff Date/Time", "lanman.kickoff_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "LANMAN Date and time when user will be logged off", HFILL }}, { &hf_password_age, @@ -3144,11 +3144,11 @@ proto_register_pipe_lanman(void) NULL, 0, "LANMAN Time since user last changed his/her password", HFILL }}, { &hf_password_can_change, - { "Password Can Change", "lanman.password_can_change", FT_ABSOLUTE_TIME, BASE_NONE, + { "Password Can Change", "lanman.password_can_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "LANMAN Date and time when user can change their password", HFILL }}, { &hf_password_must_change, - { "Password Must Change", "lanman.password_must_change", FT_ABSOLUTE_TIME, BASE_NONE, + { "Password Must Change", "lanman.password_must_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "LANMAN Date and time when user must change their password", HFILL }}, { &hf_script_path, diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 5063546eb1..e25afbc0d8 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -17462,7 +17462,7 @@ proto_register_smb(void) TFS(&tfs_rm_write), RAWMODE_WRITE, "Is Write Raw supported?", HFILL }}, { &hf_smb_server_date_time, - { "Server Date and Time", "smb.server_date_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Server Date and Time", "smb.server_date_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Current date and time at server", HFILL }}, { &hf_smb_server_smb_date, @@ -17550,7 +17550,7 @@ proto_register_smb(void) TFS(&tfs_server_cap_extended_security), SERVER_CAP_EXTENDED_SECURITY, "Are Extended security exchanges supported?", HFILL }}, { &hf_smb_system_time, - { "System Time", "smb.system.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "System Time", "smb.system.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_smb_unknown, @@ -17802,15 +17802,15 @@ proto_register_smb(void) TFS(&tfs_da_writetru), 0x4000, "Writethrough mode?", HFILL }}, { &hf_smb_create_time, - { "Created", "smb.create.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Created", "smb.create.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Creation Time", HFILL }}, { &hf_smb_modify_time, - { "Modified", "smb.modify.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Modified", "smb.modify.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Modification Time", HFILL }}, { &hf_smb_backup_time, - { "Backed-up", "smb.backup.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Backed-up", "smb.backup.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Backup time", HFILL}}, { &hf_smb_mac_alloc_block_count, @@ -17874,7 +17874,7 @@ proto_register_smb(void) NULL, 0, "Create Time, SMB_TIME format", HFILL }}, { &hf_smb_last_write_time, - { "Last Write", "smb.last_write.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last Write", "smb.last_write.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time this file was last written to", HFILL }}, { &hf_smb_last_write_dos_date, @@ -17930,7 +17930,7 @@ proto_register_smb(void) VALS(seek_mode_vals), 0, "Seek Mode, what type of seek", HFILL }}, { &hf_smb_access_time, - { "Last Access", "smb.access.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last Access", "smb.access.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Last Access Time", HFILL }}, { &hf_smb_access_dos_date, @@ -18714,7 +18714,7 @@ proto_register_smb(void) NULL, 0, "Offset to next entry", HFILL }}, { &hf_smb_change_time, - { "Change", "smb.change.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Change", "smb.change.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Last Change Time", HFILL }}, { &hf_smb_setup_len, @@ -18734,7 +18734,7 @@ proto_register_smb(void) NULL, 0, "Index of entry after last returned", HFILL }}, { &hf_smb_print_queue_date, - { "Queued", "smb.print.queued.date", FT_ABSOLUTE_TIME, BASE_NONE, + { "Queued", "smb.print.queued.date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Date when this entry was queued", HFILL }}, { &hf_smb_print_queue_dos_date, @@ -19384,15 +19384,15 @@ proto_register_smb(void) NULL, 0, "Number of bytes used to store the file", HFILL }}, { &hf_smb_unix_file_last_status, - { "Last status change", "smb.unix.file.stime", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last status change", "smb.unix.file.stime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_smb_unix_file_last_access, - { "Last access", "smb.unix.file.atime", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last access", "smb.unix.file.atime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_smb_unix_file_last_change, - { "Last modification", "smb.unix.file.mtime", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last modification", "smb.unix.file.mtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_smb_unix_file_uid, diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 42827e5a86..64c55d52ca 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -5701,7 +5701,7 @@ proto_register_smb2(void) NULL, 0, NULL, HFILL }}, { &hf_smb2_create_timestamp, - { "Create", "smb2.create.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Create", "smb2.create.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when this object was created", HFILL }}, { &hf_smb2_fid, @@ -5717,15 +5717,15 @@ proto_register_smb2(void) NULL, 0, "SMB2 Data that is read", HFILL }}, { &hf_smb2_last_access_timestamp, - { "Last Access", "smb2.last_access.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last Access", "smb2.last_access.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when this object was last accessed", HFILL }}, { &hf_smb2_last_write_timestamp, - { "Last Write", "smb2.last_write.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last Write", "smb2.last_write.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when this object was last written to", HFILL }}, { &hf_smb2_last_change_timestamp, - { "Last Change", "smb2.last_change.time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Last Change", "smb2.last_change.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Time when this object was last changed", HFILL }}, { &hf_smb2_file_all_info, @@ -5878,11 +5878,11 @@ proto_register_smb2(void) NULL, 0, "Offset to next buffer or 0", HFILL }}, { &hf_smb2_current_time, - { "Current Time", "smb2.current_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Current Time", "smb2.current_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Current Time at server", HFILL }}, { &hf_smb2_boot_time, - { "Boot Time", "smb2.boot_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Boot Time", "smb2.boot_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Boot Time at server", HFILL }}, { &hf_smb2_ea_flags, @@ -6058,7 +6058,7 @@ proto_register_smb2(void) NULL, 0, "Unknown bytes", HFILL }}, { &hf_smb2_unknown_timestamp, - { "Timestamp", "smb2.unknown.timestamp", FT_ABSOLUTE_TIME, BASE_NONE, + { "Timestamp", "smb2.unknown.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Unknown timestamp", HFILL }}, { &hf_smb2_ses_flags_guest, diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 975d346e39..2b7cb82e44 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -2699,7 +2699,7 @@ proto_register_smpp(void) }, { &hf_smpp_schedule_delivery_time, { "Scheduled delivery time", "smpp.schedule_delivery_time", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Scheduled time for delivery of short message.", HFILL } @@ -2713,7 +2713,7 @@ proto_register_smpp(void) }, { &hf_smpp_validity_period, { "Validity period", "smpp.validity_period", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Validity period of this message.", HFILL } @@ -2811,7 +2811,7 @@ proto_register_smpp(void) }, { &hf_smpp_final_date, { "Final date", "smpp.final_date", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Date-time when the queried message reached a final state.", HFILL } @@ -3453,7 +3453,7 @@ proto_register_smpp(void) }, { &hf_smpp_broadcast_end_time, { "Broadcast Message - End Time", "smpp.broadcast_end_time", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Cell Broadcast Message - Date and time at which MC set the state of the message to terminated", HFILL } }, diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index de910be5b9..1f842c8006 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -3188,7 +3188,7 @@ void proto_register_snmp(void) { "Engine ID Data: Text", "snmp.engineid.text", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_snmp_engineid_time, { - "Engine ID Data: Creation Time", "snmp.engineid.time", FT_ABSOLUTE_TIME, BASE_NONE, + "Engine ID Data: Creation Time", "snmp.engineid.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_snmp_engineid_data, { "Engine ID Data", "snmp.engineid.data", FT_BYTES, BASE_NONE, diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 7789a9aa41..1869244f9c 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -1579,7 +1579,7 @@ proto_register_srvloc(void) "Length of Authentication Block", HFILL} }, { &hf_srvloc_authblkv2_timestamp, - { "Timestamp", "srvloc.authblkv2.timestamp", FT_ABSOLUTE_TIME, BASE_NONE, + { "Timestamp", "srvloc.authblkv2.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Timestamp on Authentication Block", HFILL } }, { &hf_srvloc_authblkv2_slpspilen, @@ -1754,7 +1754,7 @@ proto_register_srvloc(void) /* collection of helper functions for DA Advertisement */ { &hf_srvloc_daadvert_timestamp, - { "DAADVERT Timestamp", "srvloc.daadvert.timestamp", FT_ABSOLUTE_TIME, BASE_NONE, + { "DAADVERT Timestamp", "srvloc.daadvert.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "Timestamp on DA Advert", HFILL } }, { &hf_srvloc_daadvert_urllen, diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 3745f800ab..6f68e7ecea 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -3959,7 +3959,7 @@ proto_register_ssl(void) }, { &hf_ssl_handshake_random_time, { "gmt_unix_time", "ssl.handshake.random_time", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "Unix time field of random structure", HFILL } }, { &hf_ssl_handshake_random_bytes, diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 039a54bfe8..4c2cdf32d0 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -2291,7 +2291,7 @@ proto_register_ucp(void) }, { &hf_ucp_parm_CT, { "CT", "ucp.parm.CT", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Accumulated charges timestamp.", HFILL } @@ -2410,7 +2410,7 @@ proto_register_ucp(void) }, { &hf_ucp_parm_DDT, { "DDT", "ucp.parm.DDT", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Deferred delivery time.", HFILL } @@ -2424,21 +2424,21 @@ proto_register_ucp(void) }, { &hf_ucp_parm_ST, { "ST", "ucp.parm.ST", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Start time.", HFILL } }, { &hf_ucp_parm_SP, { "SP", "ucp.parm.SP", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Stop time.", HFILL } }, { &hf_ucp_parm_VP, { "VP", "ucp.parm.VP", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Validity period.", HFILL } @@ -2452,7 +2452,7 @@ proto_register_ucp(void) }, { &hf_ucp_parm_SCTS, { "SCTS", "ucp.parm.SCTS", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Service Centre timestamp.", HFILL } @@ -2473,7 +2473,7 @@ proto_register_ucp(void) }, { &hf_ucp_parm_DSCTS, { "DSCTS", "ucp.parm.DSCTS", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Delivery timestamp.", HFILL } @@ -2676,7 +2676,7 @@ proto_register_ucp(void) }, { &hf_ucp_parm_MVP, { "MVP", "ucp.parm.MVP", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, "Modified validity period.", HFILL } diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index c270a29e39..a5d98c5d11 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.c @@ -238,11 +238,11 @@ proto_register_who(void) NULL, HFILL }}, { &hf_who_sendtime, - { "Send Time", "who.sendtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + { "Send Time", "who.sendtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_who_recvtime, - { "Receive Time", "who.recvtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + { "Receive Time", "who.recvtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_who_hostname, @@ -262,7 +262,7 @@ proto_register_who(void) NULL, HFILL }}, { &hf_who_boottime, - { "Boot Time", "who.boottime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + { "Boot Time", "who.boottime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_who_whoent, @@ -278,7 +278,7 @@ proto_register_who(void) NULL, HFILL }}, { &hf_who_timeon, - { "Time On", "who.timeon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + { "Time On", "who.timeon", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_who_idle, diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index 45aa6fd1c9..7dbe73ff23 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.c @@ -1149,7 +1149,7 @@ proto_register_wtls(void) { &hf_wtls_hands_cli_hello_gmt, { "Time GMT", "wtls.handshake.client_hello.gmt", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, NULL, HFILL } }, @@ -1317,7 +1317,7 @@ proto_register_wtls(void) { &hf_wtls_hands_serv_hello_gmt, { "Time GMT", "wtls.handshake.server_hello.gmt", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, NULL, HFILL } }, @@ -1464,14 +1464,14 @@ proto_register_wtls(void) { &hf_wtls_hands_certificate_wtls_valid_not_before, { "Valid not before", "wtls.handshake.certificate.before", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, NULL, HFILL } }, { &hf_wtls_hands_certificate_wtls_valid_not_after, { "Valid not after", "wtls.handshake.certificate.after", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, + FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x00, NULL, HFILL } }, diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index daa07c5f2f..05c9b862d9 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -2080,7 +2080,7 @@ void proto_register_zbee_zcl(void) { "Day of Week", "zbee.zcl.attr.wd", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_utc, - { "UTC", "zbee.zcl.attr.utc", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "UTC", "zbee.zcl.attr.utc", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_status, { "Status", "zbee.zcl.attr.status", FT_UINT8, BASE_HEX, VALS(zbee_zcl_status_names), diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c index 088e91bcd2..903445d505 100644 --- a/epan/dissectors/packet-zep.c +++ b/epan/dissectors/packet-zep.c @@ -311,7 +311,7 @@ void proto_register_zep(void) NULL, HFILL }}, { &hf_zep_timestamp, - { "Timestamp", "zep.time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, + { "Timestamp", "zep.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_zep_seqno, diff --git a/epan/proto.c b/epan/proto.c index 6256435af8..53c3ce4d46 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -3334,7 +3334,9 @@ proto_custom_set(proto_tree* tree, int field_id, break; case FT_ABSOLUTE_TIME: - g_strlcpy(result, abs_time_to_str(fvalue_get(&finfo->value), FALSE), size); + g_strlcpy(result, + abs_time_to_str(fvalue_get(&finfo->value), (hfinfo->display == ABSOLUTE_TIME_UTC)), + size); break; case FT_RELATIVE_TIME: @@ -4224,6 +4226,13 @@ static void tmp_fld_check_assert(header_field_info *hfinfo) { case FT_BOOLEAN: break; + case FT_ABSOLUTE_TIME: + DISSECTOR_ASSERT(hfinfo->display == ABSOLUTE_TIME_LOCAL || + hfinfo->display == ABSOLUTE_TIME_UTC); + DISSECTOR_ASSERT(hfinfo->bitmask == 0); + DISSECTOR_ASSERT(hfinfo->strings == NULL); + break; + default: DISSECTOR_ASSERT(hfinfo->display == BASE_NONE); DISSECTOR_ASSERT(hfinfo->bitmask == 0); @@ -4461,7 +4470,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str) case FT_ABSOLUTE_TIME: g_snprintf(label_str, ITEM_LABEL_LENGTH, "%s: %s", hfinfo->name, - abs_time_to_str(fvalue_get(&fi->value), FALSE)); + abs_time_to_str(fvalue_get(&fi->value), (hfinfo->display == ABSOLUTE_TIME_UTC))); break; case FT_RELATIVE_TIME: @@ -6534,4 +6543,3 @@ proto_check_field_name(const gchar *field_name) { return wrs_check_charset(fld_abbrev_chars, field_name); } - diff --git a/epan/proto.h b/epan/proto.h index 2aedbab599..333bc234bb 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -167,6 +167,15 @@ typedef enum { /* BASE_ values that cause the field value to be displayed twice */ #define IS_BASE_DUAL(b) ((b)==BASE_DEC_HEX||(b)==BASE_HEX_DEC) +/* For FT_ABSOLUTE_TIME, the display format is ABSOLUTE_TIME_LOCAL if + * the time is to be displayed as local time in our time zone or + * ABSOLUTE_TIME_UTC if the time is to be displayed as UTC. */ + +typedef enum { + ABSOLUTE_TIME_LOCAL, + ABSOLUTE_TIME_UTC +} absolute_time_display_e; + typedef enum { HF_REF_TYPE_NONE, /**< Field is not referenced */ HF_REF_TYPE_INDIRECT, /**< Field is indirectly referenced (only applicable for FT_PROTOCOL) via. its child */ diff --git a/plugins/opcua/opcua_hfindeces.c b/plugins/opcua/opcua_hfindeces.c index 16ba6712b6..391f675961 100644 --- a/plugins/opcua/opcua_hfindeces.c +++ b/plugins/opcua/opcua_hfindeces.c @@ -419,7 +419,7 @@ void registerFieldTypes(int proto) { &hf_opcua_AddResults, { "AddResults", "", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Algorithm, { "Algorithm", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Alias, { "Alias", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_AnnotationTime, { "AnnotationTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_AnnotationTime, { "AnnotationTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ApplicationUri, { "ApplicationUri", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ArrayDimensions, { "ArrayDimensions", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_AttributeId, { "AttributeId", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, @@ -428,7 +428,7 @@ void registerFieldTypes(int proto) { &hf_opcua_AvailableSequenceNumbers, { "AvailableSequenceNumbers", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Boolean, { "Boolean", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Booleans, { "Booleans", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_BuildDate, { "BuildDate", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_BuildDate, { "BuildDate", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_BuildNumber, { "BuildNumber", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Byte, { "Byte", "", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ByteString, { "ByteString", "", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -438,20 +438,20 @@ void registerFieldTypes(int proto) { &hf_opcua_ChannelId, { "ChannelId", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ChannelLifetime, { "ChannelLifetime", "", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ClientCertificate, { "ClientCertificate", "", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_ClientConnectionTime, { "ClientConnectionTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_ClientConnectionTime, { "ClientConnectionTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ClientHandle, { "ClientHandle", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_ClientLastContactTime, { "ClientLastContactTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_ClientLastContactTime, { "ClientLastContactTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ClientNonce, { "ClientNonce", "", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ClientProtocolVersion, { "ClientProtocolVersion", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ClientUserIdHistory, { "ClientUserIdHistory", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ClientUserIdOfSession, { "ClientUserIdOfSession", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_ComplianceDate, { "ComplianceDate", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_ComplianceDate, { "ComplianceDate", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ComplianceTool, { "ComplianceTool", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ContainsNoLoops, { "ContainsNoLoops", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ContinuationPoint, { "ContinuationPoint", "", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ContinuationPoints, { "ContinuationPoints", "", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_CreateClientName, { "CreateClientName", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_CreatedAt, { "CreatedAt", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_CreatedAt, { "CreatedAt", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_CumulatedSessionCount, { "CumulatedSessionCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_CumulatedSubscriptionCount, { "CumulatedSubscriptionCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_CurrentKeepAliveCount, { "CurrentKeepAliveCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, @@ -461,11 +461,11 @@ void registerFieldTypes(int proto) { &hf_opcua_CurrentSessionCount, { "CurrentSessionCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_CurrentSubscriptionCount, { "CurrentSubscriptionCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_CurrentSubscriptionsCount, { "CurrentSubscriptionsCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_CurrentTime, { "CurrentTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_CurrentTime, { "CurrentTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_DataChangeNotificationsCount, { "DataChangeNotificationsCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_DataStatusCodes, { "DataStatusCodes", "", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_DateTime, { "DateTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_DateTimes, { "DateTimes", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_DateTime, { "DateTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_DateTimes, { "DateTimes", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_DaylightSavingInOffset, { "DaylightSavingInOffset", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_DeadbandType, { "DeadbandType", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_DeadbandValue, { "DeadbandValue", "", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -483,7 +483,7 @@ void registerFieldTypes(int proto) { &hf_opcua_EnableCount, { "EnableCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Encoding, { "Encoding", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_EncryptionAlgorithm, { "EncryptionAlgorithm", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_EndTime, { "EndTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_EndTime, { "EndTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_EndpointUrl, { "EndpointUrl", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ErrorCount, { "ErrorCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_EventIds, { "EventIds", "", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -509,21 +509,21 @@ void registerFieldTypes(int proto) { &hf_opcua_Int32s, { "Int32s", "", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Int64, { "Int64", "", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Int64s, { "Int64s", "", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_InvocationCreationTime, { "InvocationCreationTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_InvocationCreationTime, { "InvocationCreationTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_IsAbstract, { "IsAbstract", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_IsDeleteModified, { "IsDeleteModified", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_IsForward, { "IsForward", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_IsInverse, { "IsInverse", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_IsOnline, { "IsOnline", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_IsReadModified, { "IsReadModified", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_IssueDate, { "IssueDate", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_IssueDate, { "IssueDate", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_IssuedBy, { "IssuedBy", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_IssuedTokenType, { "IssuedTokenType", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_IssuerEndpointUrl, { "IssuerEndpointUrl", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Iteration, { "Iteration", "", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_LastMethodCall, { "LastMethodCall", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_LastMethodCallTime, { "LastMethodCallTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_LastTransitionTime, { "LastTransitionTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_LastMethodCallTime, { "LastMethodCallTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_LastTransitionTime, { "LastTransitionTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_LatePublishRequestCount, { "LatePublishRequestCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_LinksToAdd, { "LinksToAdd", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_LinksToRemove, { "LinksToRemove", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, @@ -677,7 +677,7 @@ void registerFieldTypes(int proto) { &hf_opcua_ProfileId, { "ProfileId", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ProfileUris, { "ProfileUris", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_PublishRequestCount, { "PublishRequestCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_PublishTime, { "PublishTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_PublishTime, { "PublishTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_PublishingEnabled, { "PublishingEnabled", "", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_PublishingInterval, { "PublishingInterval", "", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_PublishingIntervalCount, { "PublishingIntervalCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, @@ -691,7 +691,7 @@ void registerFieldTypes(int proto) { &hf_opcua_RepublishMessageCount, { "RepublishMessageCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_RepublishMessageRequestCount, { "RepublishMessageRequestCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_RepublishRequestCount, { "RepublishRequestCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_ReqTimes, { "ReqTimes", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_ReqTimes, { "ReqTimes", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_RequestHandle, { "RequestHandle", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_RequestedLifetime, { "RequestedLifetime", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_RequestedLifetimeCount, { "RequestedLifetimeCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, @@ -714,7 +714,7 @@ void registerFieldTypes(int proto) { &hf_opcua_RevisedQueueSize, { "RevisedQueueSize", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_RevisedSamplingInterval, { "RevisedSamplingInterval", "", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_RevisedSessionTimeout, { "RevisedSessionTimeout", "", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_RevisedStartTime, { "RevisedStartTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_RevisedStartTime, { "RevisedStartTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_SByte, { "SByte", "", FT_INT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_SBytes, { "SBytes", "", FT_INT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_SamplingInterval, { "SamplingInterval", "", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -743,7 +743,7 @@ void registerFieldTypes(int proto) { &hf_opcua_Signature, { "Signature", "", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_SoftwareVersion, { "SoftwareVersion", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_SpecifiedAttributes, { "SpecifiedAttributes", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_StartTime, { "StartTime", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_StartTime, { "StartTime", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Status, { "Status", "", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_StatusCode, { "StatusCode", "", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_StatusCodes, { "StatusCodes", "", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, @@ -757,7 +757,7 @@ void registerFieldTypes(int proto) { &hf_opcua_TargetServerUri, { "TargetServerUri", "", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_TestId, { "TestId", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_TimeoutHint, { "TimeoutHint", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_Timestamp, { "Timestamp", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_Timestamp, { "Timestamp", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_TokenData, { "TokenData", "", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_TokenId, { "TokenId", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_TotalCount, { "TotalCount", "", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c index 3b4537f47f..55406e624e 100644 --- a/plugins/opcua/opcua_simpletypes.c +++ b/plugins/opcua/opcua_simpletypes.c @@ -271,9 +271,9 @@ void registerSimpleTypes(int proto) { &hf_opcua_datavalue_mask_sourcepicoseconds, { "has source picoseconds", "", FT_BOOLEAN, 8, NULL, DATAVALUE_ENCODINGBYTE_SOURCEPICOSECONDS, NULL, HFILL } }, { &hf_opcua_datavalue_mask_serverpicoseconds, { "has server picoseconds", "", FT_BOOLEAN, 8, NULL, DATAVALUE_ENCODINGBYTE_SERVERPICOSECONDS, NULL, HFILL } }, { &hf_opcua_variant_encodingmask, { "Variant Type", "", FT_UINT8, BASE_HEX, VALS(g_VariantTypes), 0x0, NULL, HFILL } }, - { &hf_opcua_SourceTimestamp, { "SourceTimestamp", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_SourceTimestamp, { "SourceTimestamp", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_SourcePicoseconds, { "SourcePicoseconds", "", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_ServerTimestamp, { "ServerTimestamp", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_ServerTimestamp, { "ServerTimestamp", "", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ServerPicoseconds, { "ServerPicoseconds", "", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_diag_symbolicid, { "SymbolicId", "", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_diag_namespace, { "Namespace", "", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/rawshark.c b/rawshark.c index cefd204bad..9b99b3a92b 100644 --- a/rawshark.c +++ b/rawshark.c @@ -1189,7 +1189,19 @@ char* ftenum_to_string(header_field_info *hfi) }; } -char* base_display_e_to_string(base_display_e bd) +static char* absolute_time_display_e_to_string(absolute_time_display_e atd) +{ + switch(atd) { + case ABSOLUTE_TIME_LOCAL: + return "ABSOLUTE_TIME_LOCAL"; + case ABSOLUTE_TIME_UTC: + return "ABSOLUTE_TIME_UTC"; + default: + return "n.a."; + } +} + +static char* base_display_e_to_string(base_display_e bd) { switch(bd) { case BASE_NONE: @@ -1373,10 +1385,23 @@ protocolinfo_init(char *field) exit(1); } - printf("%u %s %s - ", - g_cmd_line_index, - ftenum_to_string(hfi), - base_display_e_to_string(hfi->display)); + switch (hfi->type) { + + case FT_ABSOLUTE_TIME: + printf("%u %s %s - ", + g_cmd_line_index, + ftenum_to_string(hfi), + absolute_time_display_e_to_string(hfi->display)); + break; + break; + + default: + printf("%u %s %s - ", + g_cmd_line_index, + ftenum_to_string(hfi), + base_display_e_to_string(hfi->display)); + break; + } rs=g_malloc(sizeof(pci_t)); rs->hf_index=hfi->id; diff --git a/tools/ncp2222.py b/tools/ncp2222.py index 1f109eab74..b54edb6068 100755 --- a/tools/ncp2222.py +++ b/tools/ncp2222.py @@ -7645,7 +7645,7 @@ proto_register_ncp2222(void) { "Replica Number", "ncp.nds_replica_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_es_seconds, - { "Seconds", "ncp.nds_es_seconds", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "Seconds", "ncp.nds_es_seconds", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_nds_event_num, { "Event Number", "ncp.nds_event_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, @@ -7672,7 +7672,7 @@ proto_register_ncp2222(void) { "Replicas", "ncp.nds_replicas", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nds_purge, - { "Purge Time", "ncp.nds_purge", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "Purge Time", "ncp.nds_purge", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_nds_local_partition, { "Local Partition ID", "ncp.nds_local_partition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, @@ -8024,13 +8024,13 @@ proto_register_ncp2222(void) { "License Flags", "ncp.nds_lic_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nds_ds_time, - { "DS Time", "ncp.nds_ds_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "DS Time", "ncp.nds_ds_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_nds_svr_time, - { "Server Time", "ncp.nds_svr_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "Server Time", "ncp.nds_svr_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_nds_crt_time, - { "Agent Create Time", "ncp.nds_crt_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "Agent Create Time", "ncp.nds_crt_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_nds_ping_version, { "Ping Version", "ncp.nds_ping_version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, @@ -8185,7 +8185,7 @@ proto_register_ncp2222(void) { "Tune Mark", "ncp.ndstunemark", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nds_create_time, - { "NDS Creation Time", "ncp.ndscreatetime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "NDS Creation Time", "ncp.ndscreatetime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_srvr_param_string, { "Set Parameter Value", "ncp.srvr_param_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},