summaryrefslogtreecommitdiff
path: root/epan/dissectors
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2010-04-24 19:07:21 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2010-04-24 19:07:21 +0000
commit112fd1841001f7980c56cebdc065e0792ad1fb67 (patch)
tree97cb536c234dca81cddf3ef5b02887cad39c4982 /epan/dissectors
parent6c5201f39a548fd6bf17a91149a86f9584880c4b (diff)
downloadwireshark-112fd1841001f7980c56cebdc065e0792ad1fb67.tar.gz
Make the absolute_time_display_e enum start at 1000 to avoid overlapping with
the base_display_e enum. Fix a couple of dissectors that were still using FT_ABSOLUTE_TIME with BASE_NONE. (The time format chosen is based only on an attempt to not change the behavior. I don't know that it's right.) One of these is built by Pidl. I'll send a patch upstream too. When checking hfinfos, display the absolute_time_display_e values too. Display "bit count: X" instead of "unknown" when the display value doesn't match one of the enumerated values. svn path=/trunk/; revision=32552
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-aruba-erm.c16
-rw-r--r--epan/dissectors/packet-dcerpc-lsa.c12
2 files changed, 14 insertions, 14 deletions
diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c
index 82a4cd740c..bab9c02efc 100644
--- a/epan/dissectors/packet-aruba-erm.c
+++ b/epan/dissectors/packet-aruba-erm.c
@@ -28,12 +28,12 @@
/*
* Format:
* Use the Header of Record (Packet) Header
- *
+ *
* typedef struct pcaprec_hdr_s {
- * guint32 ts_sec; timestamp seconds
- * guint32 ts_usec; timestamp microseconds
- * guint32 incl_len; number of octets of packet saved in file
- * guint32 orig_len; actual length of packet
+ * guint32 ts_sec; timestamp seconds
+ * guint32 ts_usec; timestamp microseconds
+ * guint32 incl_len; number of octets of packet saved in file
+ * guint32 orig_len; actual length of packet
* } pcaprec_hdr_t;
*
* Following with 802.11 header
@@ -70,7 +70,7 @@ dissect_aruba_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *aruba_erm_tree;
tvbuff_t *eth_tvb;
nstime_t ts;
-
+
col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME);
col_set_str(pinfo->cinfo, COL_INFO, PROTO_SHORT_NAME ":");
@@ -81,7 +81,7 @@ dissect_aruba_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ts.secs = tvb_get_ntohl(tvb, 0);
ts.nsecs = tvb_get_ntohl(tvb,4)*1000;
proto_tree_add_time(aruba_erm_tree, hf_aruba_erm_time, tvb, 0, 8,&ts);
- proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_incl_len, tvb, 8, 4, FALSE);
+ proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_incl_len, tvb, 8, 4, FALSE);
proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_orig_len, tvb, 12, 4, FALSE);
}
@@ -97,7 +97,7 @@ proto_register_aruba_erm(void)
static hf_register_info hf[] = {
{ &hf_aruba_erm_time,
- { "Packet Capture Timestamp", "aruba_erm.time", FT_ABSOLUTE_TIME, BASE_NONE, NULL,
+ { "Packet Capture Timestamp", "aruba_erm.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL,
0x00, NULL, HFILL }},
{ &hf_aruba_erm_incl_len,
{ "Packet Captured Length", "aruba_erm.incl_len", FT_UINT32, BASE_DEC, NULL,
diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c
index fec28c9124..53acffd262 100644
--- a/epan/dissectors/packet-dcerpc-lsa.c
+++ b/epan/dissectors/packet-dcerpc-lsa.c
@@ -12255,7 +12255,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,
@@ -12269,7 +12269,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,
@@ -12279,7 +12279,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,
@@ -12589,7 +12589,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,
@@ -12669,7 +12669,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,
@@ -12929,7 +12929,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,