diff options
20 files changed, 1561 insertions, 1043 deletions
diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c index fec4bbccab..08b4212790 100644 --- a/epan/dissectors/packet-dcerpc-atsvc.c +++ b/epan/dissectors/packet-dcerpc-atsvc.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-atsvc.h" +void proto_register_dcerpc_atsvc(void); +void proto_reg_handoff_dcerpc_atsvc(void); /* Ett declarations */ static gint ett_dcerpc_atsvc = -1; diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c index ab0c0e9bf1..a12f6bd266 100644 --- a/epan/dissectors/packet-dcerpc-dfs.c +++ b/epan/dissectors/packet-dcerpc-dfs.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-dfs.h" +void proto_register_dcerpc_netdfs(void); +void proto_reg_handoff_dcerpc_netdfs(void); /* Ett declarations */ static gint ett_dcerpc_netdfs = -1; diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c index c0c2f1910a..05903e89d0 100644 --- a/epan/dissectors/packet-dcerpc-dnsserver.c +++ b/epan/dissectors/packet-dcerpc-dnsserver.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-dnsserver.h" +void proto_register_dcerpc_dnsserver(void); +void proto_reg_handoff_dcerpc_dnsserver(void); /* Ett declarations */ static gint ett_dcerpc_dnsserver = -1; diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c index 799832933b..db00348424 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.c +++ b/epan/dissectors/packet-dcerpc-dssetup.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-dssetup.h" +void proto_register_dcerpc_dssetup(void); +void proto_reg_handoff_dcerpc_dssetup(void); /* Ett declarations */ static gint ett_dcerpc_dssetup = -1; diff --git a/epan/dissectors/packet-dcerpc-efs.c b/epan/dissectors/packet-dcerpc-efs.c index a071f5234c..9cf36a9f6e 100644 --- a/epan/dissectors/packet-dcerpc-efs.c +++ b/epan/dissectors/packet-dcerpc-efs.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-efs.h" +void proto_register_dcerpc_efs(void); +void proto_reg_handoff_dcerpc_efs(void); /* Ett declarations */ static gint ett_dcerpc_efs = -1; diff --git a/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c index ccf7de6e7a..a7c1ca16b1 100644 --- a/epan/dissectors/packet-dcerpc-eventlog.c +++ b/epan/dissectors/packet-dcerpc-eventlog.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-eventlog.h" +void proto_register_dcerpc_eventlog(void); +void proto_reg_handoff_dcerpc_eventlog(void); /* Ett declarations */ static gint ett_dcerpc_eventlog = -1; diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c index 904aac8f54..e166c62ae7 100644 --- a/epan/dissectors/packet-dcerpc-frsrpc.c +++ b/epan/dissectors/packet-dcerpc-frsrpc.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-frsrpc.h" +void proto_register_dcerpc_frsrpc(void); +void proto_reg_handoff_dcerpc_frsrpc(void); /* Ett declarations */ static gint ett_ChunkCtr = -1; diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c index 8aa2efcdae..22c9330f63 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.c +++ b/epan/dissectors/packet-dcerpc-frstrans.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-frstrans.h" +void proto_register_dcerpc_frstrans(void); +void proto_reg_handoff_dcerpc_frstrans(void); /* Ett declarations */ static gint ett_dcerpc_frstrans = -1; diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c index b36c6126c7..469499fb66 100644 --- a/epan/dissectors/packet-dcerpc-initshutdown.c +++ b/epan/dissectors/packet-dcerpc-initshutdown.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-initshutdown.h" +void proto_register_dcerpc_initshutdown(void); +void proto_reg_handoff_dcerpc_initshutdown(void); /* Ett declarations */ static gint ett_dcerpc_initshutdown = -1; @@ -33,21 +35,21 @@ static gint ett_initshutdown_initshutdown_ReasonFlags = -1; /* Header field declarations */ static gint hf_initshutdown_initshutdown_InitEx_do_reboot = -1; -static gint hf_initshutdown_opnum = -1; -static gint hf_initshutdown_initshutdown_Init_hostname = -1; -static gint hf_initshutdown_initshutdown_InitEx_reason = -1; static gint hf_initshutdown_initshutdown_InitEx_force_apps = -1; static gint hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_PLANNED = -1; static gint hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_USER_DEFINED = -1; static gint hf_initshutdown_initshutdown_InitEx_timeout = -1; +static gint hf_initshutdown_initshutdown_InitEx_hostname = -1; +static gint hf_initshutdown_werror = -1; +static gint hf_initshutdown_initshutdown_Abort_server = -1; +static gint hf_initshutdown_opnum = -1; +static gint hf_initshutdown_initshutdown_Init_hostname = -1; +static gint hf_initshutdown_initshutdown_InitEx_reason = -1; static gint hf_initshutdown_initshutdown_Init_timeout = -1; static gint hf_initshutdown_initshutdown_Init_force_apps = -1; -static gint hf_initshutdown_initshutdown_InitEx_hostname = -1; static gint hf_initshutdown_initshutdown_Init_do_reboot = -1; static gint hf_initshutdown_initshutdown_Init_message = -1; -static gint hf_initshutdown_werror = -1; static gint hf_initshutdown_initshutdown_InitEx_message = -1; -static gint hf_initshutdown_initshutdown_Abort_server = -1; static gint proto_dcerpc_initshutdown = -1; /* Version information */ @@ -506,12 +508,6 @@ void proto_register_dcerpc_initshutdown(void) static hf_register_info hf[] = { { &hf_initshutdown_initshutdown_InitEx_do_reboot, { "Do Reboot", "initshutdown.initshutdown_InitEx.do_reboot", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_initshutdown_opnum, - { "Operation", "initshutdown.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_initshutdown_initshutdown_Init_hostname, - { "Hostname", "initshutdown.initshutdown_Init.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_initshutdown_initshutdown_InitEx_reason, - { "Reason", "initshutdown.initshutdown_InitEx.reason", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_initshutdown_initshutdown_InitEx_force_apps, { "Force Apps", "initshutdown.initshutdown_InitEx.force_apps", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_PLANNED, @@ -520,22 +516,28 @@ void proto_register_dcerpc_initshutdown(void) { "Shtdn Reason Flag User Defined", "initshutdown.initshutdown_ReasonFlags.SHTDN_REASON_FLAG_USER_DEFINED", FT_BOOLEAN, 32, TFS(&initshutdown_ReasonFlags_SHTDN_REASON_FLAG_USER_DEFINED_tfs), ( 0x40000000 ), NULL, HFILL }}, { &hf_initshutdown_initshutdown_InitEx_timeout, { "Timeout", "initshutdown.initshutdown_InitEx.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_initshutdown_initshutdown_InitEx_hostname, + { "Hostname", "initshutdown.initshutdown_InitEx.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_initshutdown_werror, + { "Windows Error", "initshutdown.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }}, + { &hf_initshutdown_initshutdown_Abort_server, + { "Server", "initshutdown.initshutdown_Abort.server", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_initshutdown_opnum, + { "Operation", "initshutdown.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_initshutdown_initshutdown_Init_hostname, + { "Hostname", "initshutdown.initshutdown_Init.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_initshutdown_initshutdown_InitEx_reason, + { "Reason", "initshutdown.initshutdown_InitEx.reason", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_initshutdown_initshutdown_Init_timeout, { "Timeout", "initshutdown.initshutdown_Init.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_initshutdown_initshutdown_Init_force_apps, { "Force Apps", "initshutdown.initshutdown_Init.force_apps", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_initshutdown_initshutdown_InitEx_hostname, - { "Hostname", "initshutdown.initshutdown_InitEx.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_initshutdown_initshutdown_Init_do_reboot, { "Do Reboot", "initshutdown.initshutdown_Init.do_reboot", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_initshutdown_initshutdown_Init_message, { "Message", "initshutdown.initshutdown_Init.message", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_initshutdown_werror, - { "Windows Error", "initshutdown.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }}, { &hf_initshutdown_initshutdown_InitEx_message, { "Message", "initshutdown.initshutdown_InitEx.message", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_initshutdown_initshutdown_Abort_server, - { "Server", "initshutdown.initshutdown_Abort.server", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index f0506836e1..1f0db50362 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-lsa.h" +void proto_register_dcerpc_lsarpc(void); +void proto_reg_handoff_dcerpc_lsarpc(void); /* Ett declarations */ static gint ett_lsarpc_names = -1; diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index 478f0909a9..f6dbc8a2e3 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -1,6 +1,6 @@ /* DO NOT EDIT This file was automatically generated by Pidl - from mapi.idl and mapi.cnf. + from mapi/mapi.idl and mapi/mapi.cnf. Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. @@ -25,17 +25,10 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-mapi.h" +void proto_register_dcerpc_mapi(void); +void proto_reg_handoff_dcerpc_mapi(void); /* Ett declarations */ -static gint ett_mapi_mapi_request = -1; -static gint ett_mapi_EcDoRpc_MAPI_REQ = -1; -static gint ett_mapi_OpenFolder_req = -1; -static gint ett_mapi_GetProps_req = -1; -static gint ett_mapi_OpenMsgStore_req = -1; -static gint ett_mapi_mapi_response = -1; -static gint ett_mapi_EcDoRpc_MAPI_REPL = -1; -static gint ett_mapi_OpenFolder_repl = -1; -static gint ett_mapi_GetProps_repl = -1; static gint ett_dcerpc_mapi = -1; static gint ett_mapi_DATA_BLOB = -1; static gint ett_mapi_input_locale = -1; @@ -46,6 +39,8 @@ static gint ett_mapi_SPropValue = -1; static gint ett_mapi_SRow = -1; static gint ett_mapi_Release_req = -1; static gint ett_mapi_Release_repl = -1; +static gint ett_mapi_OpenFolder_req = -1; +static gint ett_mapi_OpenFolder_repl = -1; static gint ett_mapi_OpenMessage_req = -1; static gint ett_mapi_RecipExchange = -1; static gint ett_mapi_RecipSMTP = -1; @@ -53,124 +48,143 @@ static gint ett_mapi_recipient_type = -1; static gint ett_mapi_recipient_displayname_7bit = -1; static gint ett_mapi_recipients_headers = -1; static gint ett_mapi_OpenMessage_recipients = -1; +static gint ett_mapi_GetProps_req = -1; +static gint ett_mapi_GetProps_repl = -1; static gint ett_mapi_ulEventType = -1; +static gint ett_mapi_OpenMsgStore_req = -1; static gint ett_mapi_EcDoRpc_MAPI_REQ_UNION = -1; static gint ett_mapi_EcDoRpc_MAPI_REPL_UNION = -1; +static gint ett_mapi_EcDoRpc_MAPI_REQ = -1; +static gint ett_mapi_EcDoRpc_MAPI_REPL = -1; +static gint ett_mapi_mapi_request = -1; +static gint ett_mapi_mapi_response = -1; /* Header field declarations */ -static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps = -1; -static gint hf_mapi_EcDoConnect_org_group = -1; -static gint hf_mapi_input_locale_method = -1; -static gint hf_mapi_ulEventType_fnevObjectMoved = -1; -static gint hf_mapi_SPropValue_CTR_lpszA = -1; -static gint hf_mapi_OpenMessage_recipients_recipients_headers = -1; -static gint hf_mapi_SPropValue_ulPropTag = -1; +static gint hf_mapi_EcDoConnect_unknown1 = -1; +static gint hf_mapi_SPropValue_CTR_i = -1; +static gint hf_mapi_EcDoRpc_mapi_request_ = -1; +static gint hf_mapi_EcDoRpc_mapi_response_ = -1; +static gint hf_mapi_EcDoConnect_emsmdb_client_version = -1; static gint hf_mapi_EcDoConnect_name = -1; -static gint hf_mapi_EcDoRpc_mapi_flags = -1; -static gint hf_mapi_FILETIME_dwHighDateTime = -1; -static gint hf_mapi_EcDoRpc_str_length = -1; -static gint hf_mapi_ulEventType_fnevObjectCreated = -1; -static gint hf_mapi_EcDoConnect_unknown3 = -1; -static gint hf_mapi_recipients_headers_prop_count = -1; -static gint hf_mapi_ulEventType_fnevObjectDeleted = -1; -static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore = -1; -static gint hf_mapi_EcDoRpc_subcontext_size = -1; -static gint hf_mapi_SPropValue_CTR_b = -1; -static gint hf_mapi_EcRRegisterPushNotification_retval = -1; -static gint hf_mapi_SPropValue_CTR_d = -1; -static gint hf_mapi_EcDoRpc_unknown2 = -1; -static gint hf_mapi_DATA_BLOB_length = -1; -static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder = -1; -static gint hf_mapi_EcDoConnect_unknown2 = -1; -static gint hf_mapi_OpenMessage_req_folder_id = -1; -static gint hf_mapi_ulEventType_fnevObjectCopied = -1; -static gint hf_mapi_ulEventType_fnevSearchComplete = -1; -static gint hf_mapi_recipient_type = -1; -static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps = -1; static gint hf_mapi_SPropValue_CTR_lpszW = -1; -static gint hf_mapi_recipient_displayname_7bit_lpszA = -1; -static gint hf_mapi_EcRRegisterPushNotification_notif_len = -1; -static gint hf_mapi_EcDoConnect_session_nb = -1; -static gint hf_mapi_EcDoConnect_unknown1 = -1; -static gint hf_mapi_FILETIME_dwLowDateTime = -1; -static gint hf_mapi_MAPI_OPNUM = -1; -static gint hf_mapi_OpenMessage_recipients_RecipClass = -1; +static gint hf_mapi_EcDoRpc_offset = -1; +static gint hf_mapi_EcDoConnect_alloc_space = -1; +static gint hf_mapi_EcDoRpc_MAPI_REQ_u = -1; static gint hf_mapi_ulEventType_fnevCriticalError = -1; +static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder = -1; +static gint hf_mapi_SRow_ulRowFlags = -1; +static gint hf_mapi_EcRRegisterPushNotification_notifkey = -1; +static gint hf_mapi_EcRUnregisterPushNotification_unknown = -1; +static gint hf_mapi_mapi_response_mapi_len = -1; +static gint hf_mapi_OpenMsgStore_req_codepage = -1; +static gint hf_mapi_mapi_request_mapi_req = -1; +static gint hf_mapi_recipients_headers_username = -1; +static gint hf_mapi_GetProps_repl_layout = -1; +static gint hf_mapi_EcRRegisterPushNotification_retval = -1; +static gint hf_mapi_ulEventType_fnevObjectDeleted = -1; +static gint hf_mapi_SPropValue_CTR_lpszA = -1; static gint hf_mapi_DATA_BLOB_data = -1; -static gint hf_mapi_EcDoRpc_unknown3 = -1; -static gint hf_mapi_EcDoRpc_mapi_request_ = -1; -static gint hf_mapi_EcDoConnect_store_version = -1; +static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps = -1; +static gint hf_mapi_recipient_type_SMTP = -1; +static gint hf_mapi_EcRRegisterPushNotification_sockaddr = -1; +static gint hf_mapi_LPSTR_lppszA = -1; +static gint hf_mapi_mapi_response_handles = -1; +static gint hf_mapi_EcDoRpc_max_data = -1; +static gint hf_mapi_OpenMessage_recipients_codepage = -1; +static gint hf_mapi_ulEventType_fnevObjectCopied = -1; +static gint hf_mapi_EcRRegisterPushNotification_unknown2 = -1; +static gint hf_mapi_recipients_headers_prop_count = -1; +static gint hf_mapi_OpenMsgStore_req_row = -1; +static gint hf_mapi_recipients_headers_bitmask = -1; +static gint hf_mapi_FILETIME_dwLowDateTime = -1; +static gint hf_mapi_OpenMsgStore_req_mailbox = -1; +static gint hf_mapi_MAPISTATUS_status = -1; +static gint hf_mapi_recipient_type_EXCHANGE = -1; +static gint hf_mapi_SPropValue_CTR_lpguid = -1; +static gint hf_mapi_EcDoConnect_unknown2 = -1; +static gint hf_mapi_ulEventType_fnevSearchComplete = -1; +static gint hf_mapi_OpenMessage_recipients_recipients_headers_ = -1; +static gint hf_mapi_mapi_request_length = -1; +static gint hf_mapi_ulEventType_fnevStatusObjectModified = -1; +static gint hf_mapi_ulEventType_fnevObjectCreated = -1; +static gint hf_mapi_OpenMessage_req_max_data = -1; +static gint hf_mapi_DATA_BLOB_length = -1; static gint hf_mapi_EcDoConnect_input_locale = -1; -static gint hf_mapi_EcDoConnect_emsmdb_client_version = -1; -static gint hf_mapi_EcDoRpc_length = -1; -static gint hf_mapi_EcDoConnect_unknown4 = -1; -static gint hf_mapi_RecipExchange_organization_length = -1; -static gint hf_mapi_handle = -1; static gint hf_mapi_RecipExchange_addr_type = -1; -static gint hf_mapi_ulEventType_fnevObjectModified = -1; +static gint hf_mapi_EcDoRpc_mapi_request = -1; static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_Release = -1; -static gint hf_mapi_OpenMessage_req_message_id = -1; -static gint hf_mapi_EcDoRpc_mailbox = -1; -static gint hf_mapi_property_types = -1; -static gint hf_mapi_mapi_response_mapi_repl = -1; +static gint hf_mapi_OpenMsgStore_req_mailbox_str_size = -1; +static gint hf_mapi_decrypted_data = -1; +static gint hf_mapi_EcDoRpc_MAPI_REPL_handle_idx = -1; +static gint hf_mapi_GetProps_req_unknown = -1; static gint hf_mapi_ulEventType_fnevNewMail = -1; -static gint hf_mapi_EcDoRpc_max_data = -1; -static gint hf_mapi_recipients_headers_username = -1; +static gint hf_mapi_SPropValue_CTR_b = -1; +static gint hf_mapi_mapi_response_mapi_repl = -1; +static gint hf_mapi_recipients_headers_layout = -1; +static gint hf_mapi_EcDoRpc_length = -1; +static gint hf_mapi_RecipExchange_organization_length = -1; +static gint hf_mapi_OpenMessage_recipients_recipients_headers = -1; +static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps = -1; +static gint hf_mapi_EcDoRpc_MAPI_REPL_error_code = -1; +static gint hf_mapi_EcDoRpc_MAPI_REPL_opnum = -1; static gint hf_mapi_SPropValue_CTR_dbl = -1; +static gint hf_mapi_OpenMessage_req_message_id = -1; +static gint hf_mapi_OpenFolder_req_unknown = -1; +static gint hf_mapi_EcDoRpc_size = -1; +static gint hf_mapi_EcDoConnect_session_nb = -1; static gint hf_mapi_MAPI_handle = -1; -static gint hf_mapi_EcDoRpc_mapi_response = -1; -static gint hf_mapi_ulEventType_fnevTableModified = -1; -static gint hf_mapi_EcDoRpc_mapi_tag = -1; -static gint hf_mapi_OpenMessage_recipients_recipients_headers_ = -1; -static gint hf_mapi_EcRUnregisterPushNotification_unknown = -1; -static gint hf_mapi_SPropValue_CTR_err = -1; static gint hf_mapi_pdu_len = -1; -static gint hf_mapi_recipient_type_SMTP = -1; -static gint hf_mapi_MAPISTATUS_status = -1; -static gint hf_mapi_ulEventType_fnevExtended = -1; -static gint hf_mapi_OpenMessage_recipients_codepage = -1; -static gint hf_mapi_ulEventType_fnevStatusObjectModified = -1; -static gint hf_mapi_EcRRegisterPushNotification_notifkey = -1; -static gint hf_mapi_EcRRegisterPushNotification_sockaddr_len = -1; -static gint hf_mapi_EcDoRpc_offset = -1; -static gint hf_mapi_EcDoRpc_mapi_request = -1; -static gint hf_mapi_EcDoRpc_row = -1; -static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder = -1; -static gint hf_mapi_recipient_type_EXCHANGE = -1; -static gint hf_mapi_SPropValue_CTR_lpguid = -1; -static gint hf_mapi_LPSTR_lppszA = -1; -static gint hf_mapi_EcDoRpc_padding = -1; -static gint hf_mapi_EcDoRpc_folder_id = -1; -static gint hf_mapi_opnum = -1; -static gint hf_mapi_EcDoRpc_codepage = -1; -static gint hf_mapi_recipients_headers_prop_values = -1; -static gint hf_mapi_decrypted_data = -1; -static gint hf_mapi_EcDoConnect_user = -1; -static gint hf_mapi_SPropValue_CTR_l = -1; -static gint hf_mapi_SPropValue_CTR_i = -1; -static gint hf_mapi_EcDoRpc_size = -1; +static gint hf_mapi_mapi_request_mapi_len = -1; +static gint hf_mapi_SPropValue_CTR_ft = -1; +static gint hf_mapi_SPropValue_ulPropTag = -1; +static gint hf_mapi_OpenMessage_recipients_RecipClass = -1; static gint hf_mapi_EcRRegisterPushNotification_ulEventMask = -1; -static gint hf_mapi_EcDoConnect_alloc_space = -1; +static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder = -1; +static gint hf_mapi_OpenMsgStore_req_padding = -1; +static gint hf_mapi_FILETIME_dwHighDateTime = -1; static gint hf_mapi_OpenMessage_req_message_permissions = -1; -static gint hf_mapi_EcDoRpc_prop_count = -1; -static gint hf_mapi_EcRRegisterPushNotification_sockaddr = -1; -static gint hf_mapi_EcDoRpc_unknown1 = -1; -static gint hf_mapi_OpenMessage_req_max_data = -1; -static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_Release = -1; -static gint hf_mapi_EcRRegisterPushNotification_unknown2 = -1; +static gint hf_mapi_mapi_request_handles = -1; +static gint hf_mapi_OpenFolder_req_handle_idx = -1; static gint hf_mapi_ulEventType_fnevReservedForMapi = -1; -static gint hf_mapi_EcDoRpc_mapi_response_ = -1; -static gint hf_mapi_recipients_headers_bitmask = -1; -static gint hf_mapi_SPropValue_CTR_ft = -1; +static gint hf_mapi_SPropValue_CTR_l = -1; +static gint hf_mapi_GetProps_req_prop_count = -1; +static gint hf_mapi_GetProps_repl_prop_data = -1; +static gint hf_mapi_EcDoConnect_user = -1; +static gint hf_mapi_EcDoRpc_MAPI_REPL_u = -1; +static gint hf_mapi_EcDoConnect_unknown4 = -1; +static gint hf_mapi_OpenFolder_req_folder_id = -1; +static gint hf_mapi_MAPI_OPNUM = -1; +static gint hf_mapi_EcDoConnect_code_page = -1; +static gint hf_mapi_handle = -1; +static gint hf_mapi_input_locale_method = -1; static gint hf_mapi_input_locale_language = -1; -static gint hf_mapi_SRow_ulRowFlags = -1; +static gint hf_mapi_mapi_response_length = -1; +static gint hf_mapi_GetProps_req_properties = -1; +static gint hf_mapi_EcDoRpc_mapi_response = -1; +static gint hf_mapi_EcDoConnect_store_version = -1; +static gint hf_mapi_ulEventType_fnevObjectMoved = -1; +static gint hf_mapi_SPropValue_CTR_err = -1; +static gint hf_mapi_ulEventType_fnevTableModified = -1; +static gint hf_mapi_recipient_type = -1; +static gint hf_mapi_ulEventType_fnevExtended = -1; +static gint hf_mapi_recipients_headers_prop_values = -1; +static gint hf_mapi_EcDoRpc_MAPI_REQ_mapi_flags = -1; +static gint hf_mapi_OpenFolder_repl_unknown = -1; +static gint hf_mapi_opnum = -1; +static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_Release = -1; +static gint hf_mapi_property_types = -1; +static gint hf_mapi_EcDoRpc_MAPI_REQ_handle_idx = -1; +static gint hf_mapi_recipient_displayname_7bit_lpszA = -1; +static gint hf_mapi_EcRRegisterPushNotification_sockaddr_len = -1; +static gint hf_mapi_EcRRegisterPushNotification_notif_len = -1; +static gint hf_mapi_EcDoConnect_unknown3 = -1; static gint hf_mapi_OpenMessage_req_folder_handle_idx = -1; -static gint hf_mapi_recipients_headers_layout = -1; -static gint hf_mapi_mapi_request_mapi_req = -1; -static gint hf_mapi_EcDoRpc_layout = -1; -static gint hf_mapi_EcDoConnect_code_page = -1; -static gint hf_mapi_EcDoRpc_handle_index = -1; +static gint hf_mapi_SPropValue_CTR_d = -1; +static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore = -1; +static gint hf_mapi_EcDoConnect_org_group = -1; +static gint hf_mapi_OpenMessage_req_folder_id = -1; +static gint hf_mapi_ulEventType_fnevObjectModified = -1; static gint proto_dcerpc_mapi = -1; /* Version information */ @@ -3808,6 +3822,10 @@ const value_string mapi_ulRowFlags_vals[] = { { 0, NULL } }; static int mapi_dissect_element_SRow_ulRowFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_OpenFolder_req_handle_idx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_OpenFolder_req_folder_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_OpenFolder_req_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_OpenFolder_repl_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_OpenMessage_req_folder_handle_idx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_OpenMessage_req_max_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_OpenMessage_req_folder_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); @@ -3858,6 +3876,12 @@ static int mapi_dissect_element_OpenMessage_recipients_RecipClass(tvbuff_t *tvb static int mapi_dissect_element_OpenMessage_recipients_codepage(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_OpenMessage_recipients_recipients_headers(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_OpenMessage_recipients_recipients_headers_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_GetProps_req_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_GetProps_req_prop_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_GetProps_req_properties(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_GetProps_req_properties_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_GetProps_repl_layout(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_GetProps_repl_prop_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static const true_false_string ulEventType_fnevCriticalError_tfs = { "fnevCriticalError is SET", "fnevCriticalError is NOT SET", @@ -3906,6 +3930,12 @@ static const true_false_string ulEventType_fnevExtended_tfs = { "fnevExtended is SET", "fnevExtended is NOT SET", }; +static int mapi_dissect_element_OpenMsgStore_req_codepage(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_OpenMsgStore_req_padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_OpenMsgStore_req_row(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_OpenMsgStore_req_mailbox_str_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_OpenMsgStore_req_mailbox(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_OpenMsgStore_req_mailbox_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_Release(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenFolder(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_GetProps(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); @@ -3913,6 +3943,26 @@ static int mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvbuff_t *tv static int mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_Release(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_OpenFolder(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_GetProps(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_EcDoRpc_MAPI_REQ_opnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint8 *opnum); +static int mapi_dissect_element_EcDoRpc_MAPI_REQ_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_EcDoRpc_MAPI_REQ_handle_idx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_EcDoRpc_MAPI_REQ_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint8 *opnum); +static int mapi_dissect_element_EcDoRpc_MAPI_REPL_opnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint8 *opnum); +static int mapi_dissect_element_EcDoRpc_MAPI_REPL_handle_idx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_EcDoRpc_MAPI_REPL_error_code(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_EcDoRpc_MAPI_REPL_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint8 *opnum); +static int mapi_dissect_element_request_len(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_request_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_request_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_request_req_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_request_handles(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_request_handles_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_response_len(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_response_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_response_repl(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_response_repl_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_response_handles(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); +static int mapi_dissect_element_response_handles_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_EcDoConnect_handle(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_EcDoConnect_handle_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int mapi_dissect_element_EcDoConnect_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); @@ -3993,381 +4043,6 @@ static int mapi_dissect_element_request_handles_cnf(tvbuff_t *tvb _U_, int offse } return offset; } -int -mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) -{ - proto_item *item = NULL; - proto_tree *tree = NULL; - int old_offset; - guint8 opnum; - - old_offset = offset; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, TRUE); - tree = proto_item_add_subtree(item, ett_mapi_EcDoRpc_MAPI_REQ); - } - opnum = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_mapi_MAPI_OPNUM, tvb, offset, 1, ENC_NA); - offset += 1; - col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation")); - proto_tree_add_item(tree, hf_mapi_EcDoRpc_mapi_flags, tvb, offset, 1, ENC_NA); - offset += 1; - proto_tree_add_item(tree, hf_mapi_EcDoRpc_handle_index, tvb, offset, 1, ENC_NA); - offset += 1; - switch(opnum) { - case op_MAPI_Release: - offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_Release(tvb, offset, pinfo, tree, di, drep); - break; - case op_MAPI_OpenFolder: - offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenFolder(tvb, offset, pinfo, tree, di, drep); - break; - case op_MAPI_GetProps: - offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_GetProps(tvb, offset, pinfo, tree, di, drep); - break; - case op_MAPI_OpenMsgStore: - offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvb, offset, pinfo, tree, di, drep); - break; - default: - offset += param - 3; - } - proto_item_set_len(item, offset-old_offset); - return offset; -} -static int -mapi_dissect_element_EcDoRpc_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - offset = mapi_dissect_element_EcDoRpc_request_(tvb, offset, pinfo, tree, di, drep); - return offset; -} -static int -mapi_dissect_element_EcDoRpc_request_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - guint32 size; - int start_offset = offset; - guint8 *decrypted_data; - tvbuff_t *decrypted_tvb; - const guint8 *ptr; - gint reported_len; - guint16 pdu_len; - guint32 i; - proto_tree *tr = NULL; - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_mapi_request, &size); - proto_tree_add_uint(tree, hf_mapi_EcDoRpc_subcontext_size, tvb, start_offset, offset - start_offset + size, size); - reported_len = tvb_reported_length_remaining(tvb, offset); - if ((guint32) reported_len > size) { - reported_len = size; - } - if (size > (guint32) reported_len) { - size = reported_len; - } - ptr = tvb_get_ptr(tvb, offset, size); - decrypted_data = (guint8 *)g_malloc(size); - for (i = 0; i < size; i++) { - decrypted_data[i] = ptr[i] ^ 0xA5; - } - decrypted_tvb = tvb_new_child_real_data(tvb, decrypted_data, size, reported_len); - tvb_set_free_cb(decrypted_tvb, g_free); - - add_new_data_source(pinfo, decrypted_tvb, "Decrypted MAPI"); - tr = proto_tree_add_subtree(tree, decrypted_tvb, 0, size, ett_mapi_mapi_request, NULL, "Decrypted MAPI PDU"); - pdu_len = tvb_get_letohs(decrypted_tvb, 0); - proto_tree_add_uint(tr, hf_mapi_pdu_len, decrypted_tvb, 0, 2, pdu_len); - proto_tree_add_item(tr, hf_mapi_decrypted_data, decrypted_tvb, 2, pdu_len - 2, ENC_NA); - /* analyze contents */ - offset = mapi_dissect_element_EcDoRpc_request__(decrypted_tvb, 0, pinfo, tr, di, drep); - /* analyze mapi handles */ - offset = mapi_dissect_element_request_handles_cnf(decrypted_tvb, offset, pinfo, tr, di, drep); - /* append ptr size (4) */ - return start_offset + offset + 4; -} -/* - * Analyze mapi_request real contents - */ -static int mapi_dissect_element_EcDoRpc_request__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - guint16 length; - length = tvb_get_letohs(tvb, offset); - offset += 2; - while (offset < length) { - offset = mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvb, offset, pinfo, tree, di, drep, hf_mapi_mapi_request_mapi_req, length - offset); - } - return offset; -} -int -mapi_dissect_struct_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) -{ - proto_item *item = NULL; - proto_tree *tree = NULL; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, TRUE); - tree = proto_item_add_subtree(item, ett_mapi_mapi_request); - } - offset = mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvb, offset, pinfo, tree, di, drep, hf_mapi_mapi_request_mapi_req, 0); - return offset; -} -/*************************/ -/* EcDoRpc Function 0x2 */ -static int -mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenFolder(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - proto_item *item = NULL; - proto_tree *tree = NULL; - int origin_offset; - origin_offset = offset; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder, tvb, offset, -1, ENC_NA); - tree = proto_item_add_subtree(item, ett_mapi_OpenFolder_req); - } - proto_tree_add_item(tree, hf_mapi_EcDoRpc_handle_index, tvb, offset, 1, ENC_NA); - offset += 1; - proto_tree_add_item(tree, hf_mapi_EcDoRpc_folder_id, tvb, offset, 8, ENC_LITTLE_ENDIAN); - offset += 8; - proto_tree_add_item(tree, hf_mapi_EcDoRpc_unknown2, tvb, offset, 1, ENC_NA); - offset += 1; - - proto_item_set_len(item, offset - origin_offset); - - return offset; -} -/*************************/ -/* EcDoRpc Function 0x7 */ -static int -mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_GetProps(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - proto_item *item = NULL; - proto_tree *tree = NULL; - int origin_offset; - guint16 i; - /**** Function parameters ****/ - guint16 prop_count; - guint32 mapitag; - origin_offset = offset; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps, tvb, offset, -1, ENC_NA); - tree = proto_item_add_subtree(item, ett_mapi_GetProps_req); - } - proto_tree_add_item(tree, hf_mapi_EcDoRpc_unknown3, tvb, offset, 4, ENC_LITTLE_ENDIAN); - offset += 4; - prop_count = tvb_get_letohs(tvb, offset); - proto_tree_add_uint(tree, hf_mapi_EcDoRpc_prop_count, tvb, offset, 2, prop_count); - offset += 2; - for (i = 0; i < prop_count; i++) { - mapitag = tvb_get_letohl(tvb, offset); - proto_tree_add_uint_format(tree, hf_mapi_EcDoRpc_mapi_tag, tvb, offset, 4, mapitag, "[%.2d] %s", i, val_to_str(mapitag, mapi_MAPITAGS_vals, "Unknown MAPITAGS")); - offset += 4; - } - proto_item_set_len(item, offset - origin_offset); - return offset; -} -/*************************/ -/* EcDoRpc Function 0xFE */ -static int -mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - proto_item *item = NULL; - proto_tree *tree = NULL; - int old_offset; - int origin_offset; - /**** Function parameters ****/ - guint32 codepage; - guint32 padding; - guint8 row; - guint16 str_len; - gchar *mailbox; - origin_offset = offset; - old_offset = offset; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore, tvb, offset, -1, ENC_NA); - tree = proto_item_add_subtree(item, ett_mapi_OpenMsgStore_req); - } - proto_tree_add_item(tree, hf_mapi_EcDoRpc_codepage, tvb, offset, 4, ENC_LITTLE_ENDIAN); - offset += 4; - proto_tree_add_item(tree, hf_mapi_EcDoRpc_padding, tvb, offset, 4, ENC_LITTLE_ENDIAN); - offset += 4; - proto_tree_add_item(tree, hf_mapi_EcDoRpc_row, tvb, offset, 1, ENC_NA); - offset += 1; - str_len = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_mapi_EcDoRpc_str_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 2; - mailbox = tvb_format_text(tvb, offset, str_len - 1); - proto_tree_add_item(tree, hf_mapi_EcDoRpc_mailbox, tvb, offset, str_len, ENC_ASCII|ENC_NA); - offset += str_len; - proto_item_set_len(item, offset - origin_offset); - return offset; -} -static int -mapi_dissect_struct_EcDoRpc_MAPI_REPL(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) -{ - proto_item *item = NULL; - proto_tree *tree = NULL; - int old_offset; - guint8 opnum; - guint8 handle_idx; - guint32 retval; - old_offset = offset; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA); - tree = proto_item_add_subtree(item, ett_mapi_EcDoRpc_MAPI_REPL); - } - opnum = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_mapi_MAPI_OPNUM, tvb, offset, 1, ENC_NA); - offset += 1; - col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation: 0x%02x")); - if (opnum != op_MAPI_Notify) { - handle_idx = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_mapi_EcDoRpc_handle_index, tvb, offset, 1, ENC_NA); - offset += 1; - retval = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_mapi_MAPISTATUS_status, tvb, offset, 4, ENC_LITTLE_ENDIAN); - offset += 4; - if (retval == MAPI_E_SUCCESS) { - switch(opnum) { - case op_MAPI_Release: - offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_Release(tvb, offset, pinfo, tree, di, drep); - break; - case op_MAPI_OpenFolder: - offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_OpenFolder(tvb, offset, pinfo, tree, di, drep); - break; - case op_MAPI_GetProps: - offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_GetProps(tvb, offset, pinfo, tree, di, drep); - break; -/* case op_MAPI_OpenMsgStore: */ -/* offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_OpenMsgStore(tvb, offset, pinfo, tree, di, drep); */ -/* break; */ - default: - offset += param - 6; - } - } - } else { - /* we don't decode notifications within the dissector yet */ - offset += param - 1; - } - proto_item_set_len(item, offset - old_offset); - return offset; -} -static int -mapi_dissect_element_EcDoRpc_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - offset = mapi_dissect_element_EcDoRpc_response_(tvb, offset, pinfo, tree, di, drep); - return offset; -} -static int -mapi_dissect_element_EcDoRpc_response_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - guint32 size; - int start_offset = offset; - guint8 *decrypted_data; - tvbuff_t *decrypted_tvb; - const guint8 *ptr; - gint reported_len; - guint16 pdu_len; - guint32 i; - proto_tree *tr = NULL; - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_mapi_response, &size); - proto_tree_add_uint(tree, hf_mapi_EcDoRpc_subcontext_size, tvb, start_offset, offset - start_offset + size, size); - reported_len = tvb_reported_length_remaining(tvb, offset); - if ((guint32) reported_len > size) { - reported_len = size; - } - if (size > (guint32) reported_len) { - size = reported_len; - } - ptr = tvb_get_ptr(tvb, offset, size); - decrypted_data = (guint8 *)g_malloc(size); - for (i = 0; i < size; i++) { - decrypted_data[i] = ptr[i] ^ 0xA5; - } - decrypted_tvb = tvb_new_child_real_data(tvb, decrypted_data, size, reported_len); - tvb_set_free_cb(decrypted_tvb, g_free); - add_new_data_source(pinfo, decrypted_tvb, "Decrypted MAPI"); - tr = proto_tree_add_subtree(tree, decrypted_tvb, 0, size, ett_mapi_mapi_response, NULL, "Decrypted MAPI PDU"); - pdu_len = tvb_get_letohs(decrypted_tvb, 0); - proto_tree_add_uint(tr, hf_mapi_pdu_len, decrypted_tvb, 0, 2, pdu_len); - proto_tree_add_item(tr, hf_mapi_decrypted_data, decrypted_tvb, 2, pdu_len - 2, ENC_NA); - /* Analyze contents */ - offset = mapi_dissect_element_EcDoRpc_response__(decrypted_tvb, 0, pinfo, tr, di, drep); - /* Analyze mapi handles */ - offset = mapi_dissect_element_request_handles_cnf(decrypted_tvb, offset, pinfo, tr, di, drep); - return start_offset + offset + 4; -} -static int -mapi_dissect_element_EcDoRpc_response__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - guint16 length; - tvbuff_t *subtvb; - length = tvb_get_letohs(tvb, offset); - subtvb = tvb_new_subset(tvb, offset, length, length); - offset += 2; - while (offset < length) { - offset = mapi_dissect_struct_EcDoRpc_MAPI_REPL(subtvb, offset, pinfo, tree, di, drep, hf_mapi_mapi_response_mapi_repl, length - offset); - } - return offset; -} -/*************************/ -/* EcDoRpc Function 0x2 */ -static int -mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_OpenFolder(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - proto_item *item = NULL; - proto_tree *tree = NULL; - int old_offset; - int origin_offset; - /**** Function parameters ****/ - guint16 unknown; - origin_offset = offset; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder, tvb, offset, -1, ENC_NA); - tree = proto_item_add_subtree(item, ett_mapi_OpenFolder_repl); - } - old_offset = offset; - proto_tree_add_item(tree, hf_mapi_EcDoRpc_unknown1, tvb, old_offset, 2, ENC_LITTLE_ENDIAN); - offset += 2; - proto_item_set_len(item, offset - origin_offset); - return offset; -} -/*************************/ -/* EcDoRpc Function 0x7 */ -static int -mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_GetProps(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - proto_item *item = NULL; - proto_tree *tree = NULL; - int origin_offset; - /**** Function parameters ****/ - guint8 layout; - guint16 length; - origin_offset = offset; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps, tvb, offset, -1, ENC_NA); - tree = proto_item_add_subtree(item, ett_mapi_GetProps_repl); - } - proto_tree_add_item(tree, hf_mapi_EcDoRpc_layout, tvb, offset, 1, ENC_NA); - offset += 1; - length = tvb_reported_length_remaining(tvb, offset); - proto_tree_add_uint(tree, hf_mapi_EcDoRpc_prop_count, tvb, offset, 0, length); - offset += length; - proto_item_set_len(item, offset - origin_offset); - return offset; -} -/*************************/ -/* EcDoRpc Function 0xFE */ -/* static int -mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_OpenMsgStore(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - proto_item *item = NULL; - proto_tree *tree = NULL; - int old_offset; - int origin_offset; - origin_offset = offset; - old_offset = offset; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenMsgStore, tvb, offset, -1, TRUE); - tree = proto_item_add_subtree(item, ett_mapi_OpenMsgStore_repl); - } - offset = mapi_dissect_element_OpenMsgStore_repl_PR_OBJECT_TYPE(tvb, offset, pinfo, tree, di, drep); - proto_item_set_len(item, offset - origin_offset); - return offset; - }*/ /* IDL: enum { */ @@ -8294,7 +7969,7 @@ mapi_dissect_enum_property_types(tvbuff_t *tvb _U_, int offset _U_, packet_info /* IDL: [case(PT_BOOLEAN)] [case(PT_BOOLEAN)] uint8 b; */ /* IDL: [case(PT_I8)] [case(PT_I8)] dlong d; */ /* IDL: [case(PT_STRING8)] [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] [case(PT_STRING8)] string lpszA; */ -/* IDL: [case(PT_UNICODE)] [case(PT_UNICODE)] [flag(LIBNDR_FLAG_STR_NULLTERM)] string lpszW; */ +/* IDL: [case(PT_UNICODE)] [flag(LIBNDR_FLAG_STR_NULLTERM)] [case(PT_UNICODE)] string lpszW; */ /* IDL: [case(PT_SYSTIME)] [case(PT_SYSTIME)] FILETIME ft; */ /* IDL: [case(PT_CLSID)] [case(PT_CLSID)] GUID lpguid; */ /* IDL: } */ @@ -8630,11 +8305,103 @@ mapi_dissect_struct_Release_repl(tvbuff_t *tvb _U_, int offset _U_, packet_info /* IDL: uint8 unknown; */ /* IDL: } */ +static int +mapi_dissect_element_OpenFolder_req_handle_idx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_mapi_OpenFolder_req_handle_idx, 0); + + return offset; +} + +static int +mapi_dissect_element_OpenFolder_req_folder_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset=cnf_dissect_hyper(tvb, offset, pinfo, tree, di, drep, 0, hf_mapi_OpenFolder_req_folder_id); + + return offset; +} + +static int +mapi_dissect_element_OpenFolder_req_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_mapi_OpenFolder_req_unknown, 0); + + return offset; +} + +int +mapi_dissect_struct_OpenFolder_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + + + old_offset = offset; + + if (parent_tree) { + item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA); + tree = proto_item_add_subtree(item, ett_mapi_OpenFolder_req); + } + + offset = mapi_dissect_element_OpenFolder_req_handle_idx(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_OpenFolder_req_folder_id(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_OpenFolder_req_unknown(tvb, offset, pinfo, tree, di, drep); + + + proto_item_set_len(item, offset-old_offset); + + + if (di->call_data->flags & DCERPC_IS_NDR64) { + ALIGN_TO_8_BYTES; + } + + return offset; +} + /* IDL: struct { */ /* IDL: uint16 unknown; */ /* IDL: } */ +static int +mapi_dissect_element_OpenFolder_repl_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, di, drep, hf_mapi_OpenFolder_repl_unknown, 0); + + return offset; +} + +int +mapi_dissect_struct_OpenFolder_repl(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + + + old_offset = offset; + + if (parent_tree) { + item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA); + tree = proto_item_add_subtree(item, ett_mapi_OpenFolder_repl); + } + + offset = mapi_dissect_element_OpenFolder_repl_unknown(tvb, offset, pinfo, tree, di, drep); + + + proto_item_set_len(item, offset-old_offset); + + + if (di->call_data->flags & DCERPC_IS_NDR64) { + ALIGN_TO_2_BYTES; + } + + return offset; +} + /* IDL: struct { */ /* IDL: uint8 folder_handle_idx; */ @@ -9190,12 +8957,121 @@ mapi_dissect_struct_OpenMessage_recipients(tvbuff_t *tvb _U_, int offset _U_, pa /* IDL: MAPITAGS properties[prop_count]; */ /* IDL: } */ +static int +mapi_dissect_element_GetProps_req_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, hf_mapi_GetProps_req_unknown, 0); + + return offset; +} + +static int +mapi_dissect_element_GetProps_req_prop_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, di, drep, hf_mapi_GetProps_req_prop_count, 0); + + return offset; +} + +static int +mapi_dissect_element_GetProps_req_properties(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + + return offset; +} + +static int +mapi_dissect_element_GetProps_req_properties_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_enum_MAPITAGS(tvb, offset, pinfo, tree, di, drep, hf_mapi_GetProps_req_properties, 0); + + return offset; +} + +int +mapi_dissect_struct_GetProps_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + + + old_offset = offset; + + if (parent_tree) { + item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA); + tree = proto_item_add_subtree(item, ett_mapi_GetProps_req); + } + + offset = mapi_dissect_element_GetProps_req_unknown(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_GetProps_req_prop_count(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_GetProps_req_properties(tvb, offset, pinfo, tree, di, drep); + + + proto_item_set_len(item, offset-old_offset); + + + if (di->call_data->flags & DCERPC_IS_NDR64) { + ALIGN_TO_4_BYTES; + } + + return offset; +} + /* IDL: struct { */ /* IDL: uint8 layout; */ /* IDL: [flag(LIBNDR_FLAG_REMAINING)] DATA_BLOB prop_data; */ /* IDL: } */ +static int +mapi_dissect_element_GetProps_repl_layout(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_mapi_GetProps_repl_layout, 0); + + return offset; +} + +static int +mapi_dissect_element_GetProps_repl_prop_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, di, drep, hf_mapi_GetProps_repl_prop_data, 1); + + return offset; +} + +int +mapi_dissect_struct_GetProps_repl(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + + + old_offset = offset; + + if (parent_tree) { + item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA); + tree = proto_item_add_subtree(item, ett_mapi_GetProps_repl); + } + + offset = mapi_dissect_element_GetProps_repl_layout(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_GetProps_repl_prop_data(tvb, offset, pinfo, tree, di, drep); + + + proto_item_set_len(item, offset-old_offset); + + + if (di->call_data->flags & DCERPC_IS_NDR64) { + ALIGN_TO_4_BYTES; + } + + return offset; +} + /* IDL: bitmap { */ /* IDL: fnevCriticalError = 0x00000001 , */ @@ -9341,9 +9217,96 @@ mapi_dissect_bitmap_ulEventType(tvbuff_t *tvb _U_, int offset _U_, packet_info * /* IDL: uint32 padding; */ /* IDL: uint8 row; */ /* IDL: uint16 mailbox_str_size; */ -/* IDL: [charset(DOS)] [unique(1)] uint8 *mailbox; */ +/* IDL: [unique(1)] [charset(DOS)] uint8 *mailbox; */ /* IDL: } */ +static int +mapi_dissect_element_OpenMsgStore_req_codepage(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, hf_mapi_OpenMsgStore_req_codepage, 0); + + return offset; +} + +static int +mapi_dissect_element_OpenMsgStore_req_padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, hf_mapi_OpenMsgStore_req_padding, 0); + + return offset; +} + +static int +mapi_dissect_element_OpenMsgStore_req_row(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_mapi_OpenMsgStore_req_row, 0); + + return offset; +} + +static int +mapi_dissect_element_OpenMsgStore_req_mailbox_str_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, di, drep, hf_mapi_OpenMsgStore_req_mailbox_str_size, 0); + + return offset; +} + +static int +mapi_dissect_element_OpenMsgStore_req_mailbox(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, di, drep, mapi_dissect_element_OpenMsgStore_req_mailbox_, NDR_POINTER_UNIQUE, "Pointer to Mailbox (uint8)",hf_mapi_OpenMsgStore_req_mailbox); + + return offset; +} + +static int +mapi_dissect_element_OpenMsgStore_req_mailbox_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + char *data; + + offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, di, drep, sizeof(guint8), hf_mapi_OpenMsgStore_req_mailbox, FALSE, &data); + proto_item_append_text(tree, ": %s", data); + + return offset; +} + +int +mapi_dissect_struct_OpenMsgStore_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + + + old_offset = offset; + + if (parent_tree) { + item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA); + tree = proto_item_add_subtree(item, ett_mapi_OpenMsgStore_req); + } + + offset = mapi_dissect_element_OpenMsgStore_req_codepage(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_OpenMsgStore_req_padding(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_OpenMsgStore_req_row(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_OpenMsgStore_req_mailbox_str_size(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_OpenMsgStore_req_mailbox(tvb, offset, pinfo, tree, di, drep); + + + proto_item_set_len(item, offset-old_offset); + + + if (di->call_data->flags & DCERPC_IS_NDR64) { + ALIGN_TO_5_BYTES; + } + + return offset; +} + /* IDL: [switch_type(MAPI_OPNUM)] union { */ /* IDL: [case(op_MAPI_Release)] [case(op_MAPI_Release)] Release_req mapi_Release; */ @@ -9360,8 +9323,70 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_Release(tvbuff_t *tvb _U_, int offse return offset; } +static int +mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenFolder(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_struct_OpenFolder_req(tvb,offset,pinfo,tree,di,drep,hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder,0); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_GetProps(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_struct_GetProps_req(tvb,offset,pinfo,tree,di,drep,hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps,0); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_struct_OpenMsgStore_req(tvb,offset,pinfo,tree,di,drep,hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore,0); + + return offset; +} -/* IDL: [switch_type(MAPI_OPNUM)] [public(1)] union { */ +static int +mapi_dissect_EcDoRpc_MAPI_REQ_UNION(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + guint8 level; + + old_offset = offset; + if (parent_tree) { + tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_mapi_EcDoRpc_MAPI_REQ_UNION, &item, "EcDoRpc_MAPI_REQ_UNION"); + } + + offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_index, &level); + ALIGN_TO_8_BYTES; + + switch(level) { + case op_MAPI_Release: + offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_Release(tvb, offset, pinfo, tree, di, drep); + break; + + case op_MAPI_OpenFolder: + offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenFolder(tvb, offset, pinfo, tree, di, drep); + break; + + case op_MAPI_GetProps: + offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_GetProps(tvb, offset, pinfo, tree, di, drep); + break; + + case op_MAPI_OpenMsgStore: + offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvb, offset, pinfo, tree, di, drep); + break; + } + proto_item_set_len(item, offset-old_offset); + + + return offset; +} + +/* IDL: [public(1)] [switch_type(MAPI_OPNUM)] union { */ /* IDL: [case(op_MAPI_Release)] [case(op_MAPI_Release)] Release_repl mapi_Release; */ /* IDL: [case(op_MAPI_OpenFolder)] [case(op_MAPI_OpenFolder)] OpenFolder_repl mapi_OpenFolder; */ /* IDL: [case(op_MAPI_GetProps)] [case(op_MAPI_GetProps)] GetProps_repl mapi_GetProps; */ @@ -9375,6 +9400,56 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_Release(tvbuff_t *tvb _U_, int offs return offset; } +static int +mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_OpenFolder(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_struct_OpenFolder_repl(tvb,offset,pinfo,tree,di,drep,hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder,0); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_GetProps(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_struct_GetProps_repl(tvb,offset,pinfo,tree,di,drep,hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps,0); + + return offset; +} + +static int +mapi_dissect_EcDoRpc_MAPI_REPL_UNION(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + guint8 level; + + old_offset = offset; + if (parent_tree) { + tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_mapi_EcDoRpc_MAPI_REPL_UNION, &item, "EcDoRpc_MAPI_REPL_UNION"); + } + + offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_index, &level); + ALIGN_TO_4_BYTES; + + switch(level) { + case op_MAPI_Release: + offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_Release(tvb, offset, pinfo, tree, di, drep); + break; + + case op_MAPI_OpenFolder: + offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_OpenFolder(tvb, offset, pinfo, tree, di, drep); + break; + + case op_MAPI_GetProps: + offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_GetProps(tvb, offset, pinfo, tree, di, drep); + break; + } + proto_item_set_len(item, offset-old_offset); + + + return offset; +} /* IDL: struct { */ /* IDL: uint8 opnum; */ @@ -9383,6 +9458,73 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_Release(tvbuff_t *tvb _U_, int offs /* IDL: [switch_is(opnum)] EcDoRpc_MAPI_REQ_UNION u; */ /* IDL: } */ +static int +mapi_dissect_element_EcDoRpc_MAPI_REQ_opnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint8 *opnum) +{ + offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_mapi_MAPI_OPNUM, *opnum); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_MAPI_REQ_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_MAPI_REQ_mapi_flags, 0); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_MAPI_REQ_handle_idx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_MAPI_REQ_handle_idx, 0); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_MAPI_REQ_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint8 *opnum) +{ + offset = mapi_dissect_EcDoRpc_MAPI_REQ_UNION(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_MAPI_REQ_u, *opnum); + + return offset; +} + +int +mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + guint8 opnum; + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + + + old_offset = offset; + + if (parent_tree) { + item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA); + tree = proto_item_add_subtree(item, ett_mapi_EcDoRpc_MAPI_REQ); + } + + offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_opnum(tvb, offset, pinfo, tree, di, drep, &opnum); + + offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_flags(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_handle_idx(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_EcDoRpc_MAPI_REQ_u(tvb, offset, pinfo, tree, di, drep, &opnum); + + + proto_item_set_len(item, offset-old_offset); + + + if (di->call_data->flags & DCERPC_IS_NDR64) { + ALIGN_TO_8_BYTES; + } + + return offset; +} + /* IDL: struct { */ /* IDL: uint8 opnum; */ @@ -9391,6 +9533,73 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_Release(tvbuff_t *tvb _U_, int offs /* IDL: [switch_is(opnum)] EcDoRpc_MAPI_REPL_UNION u; */ /* IDL: } */ +static int +mapi_dissect_element_EcDoRpc_MAPI_REPL_opnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint8 *opnum) +{ + offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_MAPI_REPL_opnum, *opnum); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_MAPI_REPL_handle_idx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_MAPI_REPL_handle_idx, 0); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_MAPI_REPL_error_code(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_enum_MAPISTATUS(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_MAPI_REPL_error_code, 0); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_MAPI_REPL_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint8 *opnum) +{ + offset = mapi_dissect_EcDoRpc_MAPI_REPL_UNION(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_MAPI_REPL_u, *opnum); + + return offset; +} + +int +mapi_dissect_struct_EcDoRpc_MAPI_REPL(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + guint8 opnum; + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + + + old_offset = offset; + + if (parent_tree) { + item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA); + tree = proto_item_add_subtree(item, ett_mapi_EcDoRpc_MAPI_REPL); + } + + offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_opnum(tvb, offset, pinfo, tree, di, drep, &opnum); + + offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_handle_idx(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_error_code(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_EcDoRpc_MAPI_REPL_u(tvb, offset, pinfo, tree, di, drep, &opnum); + + + proto_item_set_len(item, offset-old_offset); + + + if (di->call_data->flags & DCERPC_IS_NDR64) { + ALIGN_TO_4_BYTES; + } + + return offset; +} + /* IDL: struct { */ /* IDL: uint32 mapi_len; */ @@ -9399,6 +9608,89 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_Release(tvbuff_t *tvb _U_, int offs /* IDL: [unique(1)] uint32 *handles; */ /* IDL: } */ +static int +mapi_dissect_element_request_len(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, hf_mapi_mapi_request_mapi_len, 0); + + return offset; +} + +static int +mapi_dissect_element_request_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, di, drep, hf_mapi_mapi_request_length, 0); + + return offset; +} + +static int +mapi_dissect_element_request_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, di, drep, mapi_dissect_element_request_req_, NDR_POINTER_UNIQUE, "Pointer to Req (EcDoRpc_MAPI_REQ)",hf_mapi_mapi_request_mapi_req); + + return offset; +} + +static int +mapi_dissect_element_request_req_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvb,offset,pinfo,tree,di,drep,hf_mapi_mapi_request_mapi_req,0); + + return offset; +} + +static int +mapi_dissect_element_request_handles(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, di, drep, mapi_dissect_element_request_handles_, NDR_POINTER_UNIQUE, "Pointer to Handles (uint32)",hf_mapi_mapi_request_handles); + + return offset; +} + +static int +mapi_dissect_element_request_handles_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, hf_mapi_mapi_request_handles, 0); + + return offset; +} + +int +mapi_dissect_struct_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + + ALIGN_TO_5_BYTES; + + old_offset = offset; + + if (parent_tree) { + item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA); + tree = proto_item_add_subtree(item, ett_mapi_mapi_request); + } + + offset = mapi_dissect_element_request_len(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_request_length(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_request_req(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_request_handles(tvb, offset, pinfo, tree, di, drep); + + + proto_item_set_len(item, offset-old_offset); + + + if (di->call_data->flags & DCERPC_IS_NDR64) { + ALIGN_TO_5_BYTES; + } + + return offset; +} + /* IDL: struct { */ /* IDL: uint32 mapi_len; */ @@ -9407,6 +9699,89 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_Release(tvbuff_t *tvb _U_, int offs /* IDL: [unique(1)] uint32 *handles; */ /* IDL: } */ +static int +mapi_dissect_element_response_len(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, hf_mapi_mapi_response_mapi_len, 0); + + return offset; +} + +static int +mapi_dissect_element_response_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, di, drep, hf_mapi_mapi_response_length, 0); + + return offset; +} + +static int +mapi_dissect_element_response_repl(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, di, drep, mapi_dissect_element_response_repl_, NDR_POINTER_UNIQUE, "Pointer to Repl (EcDoRpc_MAPI_REPL)",hf_mapi_mapi_response_mapi_repl); + + return offset; +} + +static int +mapi_dissect_element_response_repl_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_struct_EcDoRpc_MAPI_REPL(tvb,offset,pinfo,tree,di,drep,hf_mapi_mapi_response_mapi_repl,0); + + return offset; +} + +static int +mapi_dissect_element_response_handles(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, di, drep, mapi_dissect_element_response_handles_, NDR_POINTER_UNIQUE, "Pointer to Handles (uint32)",hf_mapi_mapi_response_handles); + + return offset; +} + +static int +mapi_dissect_element_response_handles_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, hf_mapi_mapi_response_handles, 0); + + return offset; +} + +int +mapi_dissect_struct_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) +{ + proto_item *item = NULL; + proto_tree *tree = NULL; + int old_offset; + + ALIGN_TO_5_BYTES; + + old_offset = offset; + + if (parent_tree) { + item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA); + tree = proto_item_add_subtree(item, ett_mapi_mapi_response); + } + + offset = mapi_dissect_element_response_len(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_response_length(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_response_repl(tvb, offset, pinfo, tree, di, drep); + + offset = mapi_dissect_element_response_handles(tvb, offset, pinfo, tree, di, drep); + + + proto_item_set_len(item, offset-old_offset); + + + if (di->call_data->flags & DCERPC_IS_NDR64) { + ALIGN_TO_5_BYTES; + } + + return offset; +} + /* IDL: struct { */ /* IDL: uint16 cb; */ @@ -9615,7 +9990,7 @@ mapi_dissect_element_EcDoConnect_alloc_space_(tvbuff_t *tvb _U_, int offset _U_, } /* IDL: MAPISTATUS EcDoConnect( */ -/* IDL: [ref] [out] policy_handle *handle, */ +/* IDL: [out] [ref] policy_handle *handle, */ /* IDL: [in] uint8 name[*], */ /* IDL: [in] uint32 unknown1[3], */ /* IDL: [in] uint32 code_page, */ @@ -9623,8 +9998,8 @@ mapi_dissect_element_EcDoConnect_alloc_space_(tvbuff_t *tvb _U_, int offset _U_, /* IDL: [in] uint32 unknown2, */ /* IDL: [in] uint16 unknown3, */ /* IDL: [out] uint32 unknown4[3], */ -/* IDL: [ref] [out] uint16 *session_nb, */ -/* IDL: [out] [unique(1)] uint8 *org_group, */ +/* IDL: [out] [ref] uint16 *session_nb, */ +/* IDL: [unique(1)] [out] uint8 *org_group, */ /* IDL: [unique(1)] [out] uint8 *user, */ /* IDL: [out] uint16 store_version[3], */ /* IDL: [out] [in] uint16 emsmdb_client_version[3], */ @@ -9708,7 +10083,7 @@ mapi_dissect_element_EcDoDisconnect_handle_(tvbuff_t *tvb _U_, int offset _U_, p } /* IDL: MAPISTATUS EcDoDisconnect( */ -/* IDL: [in] [out] [ref] policy_handle *handle */ +/* IDL: [out] [ref] [in] policy_handle *handle */ /* IDL: ); */ static int @@ -9769,6 +10144,78 @@ mapi_dissect_element_EcDoRpc_offset(tvbuff_t *tvb _U_, int offset _U_, packet_in } static int +mapi_dissect_element_EcDoRpc_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = dissect_ndr_toplevel_pointer(tvb, offset, pinfo, tree, di, drep, mapi_dissect_element_EcDoRpc_request_, NDR_POINTER_REF, "Pointer to Request (mapi_request)",hf_mapi_EcDoRpc_mapi_request); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_request_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + guint3264 size; + int conformant = di->conformant_run; + tvbuff_t *subtvb; + + if (!conformant) { + guint32 saved_flags = di->call_data->flags; + offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_mapi_request_, &size); + di->call_data->flags &= ~DCERPC_IS_NDR64; + subtvb = tvb_new_subset(tvb, offset, (const gint)size, -1); + mapi_dissect_element_EcDoRpc_request__(subtvb, 0, pinfo, tree, di, drep); + offset += (int)size; + di->call_data->flags = saved_flags; + } + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_request__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_struct_request(tvb,offset,pinfo,tree,di,drep,hf_mapi_EcDoRpc_mapi_request,0); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = dissect_ndr_toplevel_pointer(tvb, offset, pinfo, tree, di, drep, mapi_dissect_element_EcDoRpc_response_, NDR_POINTER_REF, "Pointer to Response (mapi_response)",hf_mapi_EcDoRpc_mapi_response); + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_response_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + guint3264 size; + int conformant = di->conformant_run; + tvbuff_t *subtvb; + + if (!conformant) { + guint32 saved_flags = di->call_data->flags; + offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, di, drep, hf_mapi_EcDoRpc_mapi_response_, &size); + di->call_data->flags &= ~DCERPC_IS_NDR64; + subtvb = tvb_new_subset(tvb, offset, (const gint)size, -1); + mapi_dissect_element_EcDoRpc_response__(subtvb, 0, pinfo, tree, di, drep); + offset += (int)size; + di->call_data->flags = saved_flags; + } + + return offset; +} + +static int +mapi_dissect_element_EcDoRpc_response__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) +{ + offset = mapi_dissect_struct_response(tvb,offset,pinfo,tree,di,drep,hf_mapi_EcDoRpc_mapi_response,0); + + return offset; +} + +static int mapi_dissect_element_EcDoRpc_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) { offset = dissect_ndr_toplevel_pointer(tvb, offset, pinfo, tree, di, drep, mapi_dissect_element_EcDoRpc_length_, NDR_POINTER_REF, "Pointer to Length (uint16)",hf_mapi_EcDoRpc_length); @@ -9795,10 +10242,10 @@ mapi_dissect_element_EcDoRpc_max_data(tvbuff_t *tvb _U_, int offset _U_, packet_ /* IDL: MAPISTATUS EcDoRpc( */ /* IDL: [out] [ref] [in] policy_handle *handle, */ /* IDL: [out] [in] uint32 size, */ -/* IDL: [in] [out] uint32 offset, */ -/* IDL: [subcontext(4)] [in] [flag(LIBNDR_FLAG_REMAINING|LIBNDR_FLAG_NOALIGN)] [ref] mapi_request *mapi_request, */ -/* IDL: [flag(LIBNDR_FLAG_REMAINING|LIBNDR_FLAG_NOALIGN)] [subcontext(4)] [ref] [out] mapi_response *mapi_response, */ -/* IDL: [in] [out] [ref] uint16 *length, */ +/* IDL: [out] [in] uint32 offset, */ +/* IDL: [ref] [subcontext(4)] [in] [flag(LIBNDR_FLAG_REMAINING|LIBNDR_FLAG_NOALIGN)] mapi_request *mapi_request, */ +/* IDL: [out] [ref] [subcontext(4)] [flag(LIBNDR_FLAG_REMAINING|LIBNDR_FLAG_NOALIGN)] mapi_response *mapi_response, */ +/* IDL: [out] [ref] [in] uint16 *length, */ /* IDL: [in] uint16 max_data */ /* IDL: ); */ @@ -9964,7 +10411,7 @@ mapi_dissect_element_EcRRegisterPushNotification_retval_(tvbuff_t *tvb _U_, int } /* IDL: MAPISTATUS EcRRegisterPushNotification( */ -/* IDL: [in] [ref] [out] policy_handle *handle, */ +/* IDL: [out] [ref] [in] policy_handle *handle, */ /* IDL: [in] ulEventType ulEventMask, */ /* IDL: [in] [size_is(notif_len)] uint8 notifkey[*], */ /* IDL: [in] uint16 notif_len, */ @@ -10049,7 +10496,7 @@ mapi_dissect_element_EcRUnregisterPushNotification_unknown_(tvbuff_t *tvb _U_, i } /* IDL: MAPISTATUS EcRUnregisterPushNotification( */ -/* IDL: [ref] [out] [in] policy_handle *handle, */ +/* IDL: [out] [ref] [in] policy_handle *handle, */ /* IDL: [in] uint32 unknown[2] */ /* IDL: ); */ @@ -10180,243 +10627,258 @@ static dcerpc_sub_dissector mapi_dissectors[] = { void proto_register_dcerpc_mapi(void) { static hf_register_info hf[] = { - { &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps, - { "Mapi Getprops", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_GetProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoConnect_org_group, - { "Org Group", "mapi.EcDoConnect.org_group", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_input_locale_method, - { "Method", "mapi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_ulEventType_fnevObjectMoved, - { "Fnevobjectmoved", "mapi.ulEventType.fnevObjectMoved", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectMoved_tfs), ( 0x00000020 ), NULL, HFILL }}, - { &hf_mapi_SPropValue_CTR_lpszA, - { "Lpsza", "mapi.SPropValue_CTR.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_OpenMessage_recipients_recipients_headers, - { "Recipients Headers", "mapi.OpenMessage_recipients.recipients_headers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_SPropValue_ulPropTag, - { "Ulproptag", "mapi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(mapi_MAPITAGS_vals), 0, NULL, HFILL }}, + { &hf_mapi_EcDoConnect_unknown1, + { "Unknown1", "mapi.EcDoConnect.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_SPropValue_CTR_i, + { "I", "mapi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_mapi_request_, + { "Subcontext length", "mapi.EcDoRpc.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_mapi_response_, + { "Subcontext length", "mapi.EcDoRpc.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoConnect_emsmdb_client_version, + { "Emsmdb Client Version", "mapi.EcDoConnect.emsmdb_client_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_mapi_EcDoConnect_name, { "Name", "mapi.EcDoConnect.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_mapi_flags, - { "mapi_flags", "mapi.EcDoRpc.mapi_flags", FT_UINT8, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_FILETIME_dwHighDateTime, - { "Dwhighdatetime", "mapi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_str_length, - { "Length", "mapi.EcDoRpc.str_length", FT_UINT16, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_ulEventType_fnevObjectCreated, - { "Fnevobjectcreated", "mapi.ulEventType.fnevObjectCreated", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCreated_tfs), ( 0x00000004 ), NULL, HFILL }}, - { &hf_mapi_EcDoConnect_unknown3, - { "Unknown3", "mapi.EcDoConnect.unknown3", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_recipients_headers_prop_count, - { "Prop Count", "mapi.recipients_headers.prop_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_ulEventType_fnevObjectDeleted, - { "Fnevobjectdeleted", "mapi.ulEventType.fnevObjectDeleted", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectDeleted_tfs), ( 0x00000008 ), NULL, HFILL }}, - { &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore, - { "Mapi Openmsgstore", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenMsgStore", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_subcontext_size, - { "Subcontext size", "mapi.EcDoRpc.subcontext_size", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_SPropValue_CTR_b, - { "B", "mapi.SPropValue_CTR.b", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcRRegisterPushNotification_retval, - { "Retval", "mapi.EcRRegisterPushNotification.retval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_SPropValue_CTR_d, - { "D", "mapi.SPropValue_CTR.d", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_unknown2, - { "Unknown2", "mapi.EcDoRpc.unknown2", FT_UINT8, BASE_DEC, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_DATA_BLOB_length, - { "Length", "mapi.DATA_BLOB.length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder, - { "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_OpenFolder", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoConnect_unknown2, - { "Unknown2", "mapi.EcDoConnect.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_OpenMessage_req_folder_id, - { "Folder Id", "mapi.OpenMessage_req.folder_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_ulEventType_fnevObjectCopied, - { "Fnevobjectcopied", "mapi.ulEventType.fnevObjectCopied", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCopied_tfs), ( 0x00000040 ), NULL, HFILL }}, - { &hf_mapi_ulEventType_fnevSearchComplete, - { "Fnevsearchcomplete", "mapi.ulEventType.fnevSearchComplete", FT_BOOLEAN, 16, TFS(&ulEventType_fnevSearchComplete_tfs), ( 0x00000080 ), NULL, HFILL }}, - { &hf_mapi_recipient_type, - { "Recipient Type", "mapi.recipients_headers.type", FT_UINT16, BASE_HEX, VALS(mapi_OM_recipient_type_vals), 0, "NULL", HFILL }}, - { &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps, - { "Mapi Getprops", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_GetProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_mapi_SPropValue_CTR_lpszW, { "Lpszw", "mapi.SPropValue_CTR.lpszW", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_recipient_displayname_7bit_lpszA, - { "Lpsza", "mapi.recipient_displayname_7bit.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcRRegisterPushNotification_notif_len, - { "Notif Len", "mapi.EcRRegisterPushNotification.notif_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoConnect_session_nb, - { "Session Nb", "mapi.EcDoConnect.session_nb", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoConnect_unknown1, - { "Unknown1", "mapi.EcDoConnect.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_FILETIME_dwLowDateTime, - { "Dwlowdatetime", "mapi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_MAPI_OPNUM, - { "Opnum", "mapi.EcDoRpc_MAPI_REPL.opnum", FT_UINT8, BASE_HEX, VALS(mapi_MAPI_OPNUM_vals), 0, "NULL", HFILL }}, - { &hf_mapi_OpenMessage_recipients_RecipClass, - { "Recipclass", "mapi.OpenMessage_recipients.RecipClass", FT_UINT8, BASE_DEC, VALS(mapi_ulRecipClass_vals), 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_offset, + { "Offset", "mapi.EcDoRpc.offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoConnect_alloc_space, + { "Alloc Space", "mapi.EcDoConnect.alloc_space", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REQ_u, + { "U", "mapi.EcDoRpc_MAPI_REQ.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_mapi_ulEventType_fnevCriticalError, { "Fnevcriticalerror", "mapi.ulEventType.fnevCriticalError", FT_BOOLEAN, 16, TFS(&ulEventType_fnevCriticalError_tfs), ( 0x00000001 ), NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder, + { "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenFolder", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_SRow_ulRowFlags, + { "Ulrowflags", "mapi.SRow.ulRowFlags", FT_UINT8, BASE_DEC, VALS(mapi_ulRowFlags_vals), 0, NULL, HFILL }}, + { &hf_mapi_EcRRegisterPushNotification_notifkey, + { "Notifkey", "mapi.EcRRegisterPushNotification.notifkey", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcRUnregisterPushNotification_unknown, + { "Unknown", "mapi.EcRUnregisterPushNotification.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_mapi_response_mapi_len, + { "Mapi Len", "mapi.mapi_response.mapi_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenMsgStore_req_codepage, + { "Codepage", "mapi.OpenMsgStore_req.codepage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_mapi_request_mapi_req, + { "Mapi Req", "mapi.mapi_request.mapi_req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_recipients_headers_username, + { "Username", "mapi.recipients_headers.username", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_GetProps_repl_layout, + { "Layout", "mapi.GetProps_repl.layout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcRRegisterPushNotification_retval, + { "Retval", "mapi.EcRRegisterPushNotification.retval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_ulEventType_fnevObjectDeleted, + { "Fnevobjectdeleted", "mapi.ulEventType.fnevObjectDeleted", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectDeleted_tfs), ( 0x00000008 ), NULL, HFILL }}, + { &hf_mapi_SPropValue_CTR_lpszA, + { "Lpsza", "mapi.SPropValue_CTR.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_mapi_DATA_BLOB_data, { "Data", "mapi.DATA_BLOB.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_unknown3, - { "Unknown3", "mapi.EcDoRpc.unknown3", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_EcDoRpc_mapi_request_, - { "Subcontext length", "mapi.EcDoRpc.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoConnect_store_version, - { "Store Version", "mapi.EcDoConnect.store_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps, + { "Mapi Getprops", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_GetProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_recipient_type_SMTP, + { "Smtp", "mapi.recipient_type.SMTP", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcRRegisterPushNotification_sockaddr, + { "Sockaddr", "mapi.EcRRegisterPushNotification.sockaddr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_LPSTR_lppszA, + { "Lppsza", "mapi.LPSTR.lppszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_mapi_response_handles, + { "Handles", "mapi.mapi_response.handles", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_max_data, + { "Max Data", "mapi.EcDoRpc.max_data", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenMessage_recipients_codepage, + { "Codepage", "mapi.OpenMessage_recipients.codepage", FT_UINT32, BASE_DEC, VALS(mapi_CODEPAGEID_vals), 0, NULL, HFILL }}, + { &hf_mapi_ulEventType_fnevObjectCopied, + { "Fnevobjectcopied", "mapi.ulEventType.fnevObjectCopied", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCopied_tfs), ( 0x00000040 ), NULL, HFILL }}, + { &hf_mapi_EcRRegisterPushNotification_unknown2, + { "Unknown2", "mapi.EcRRegisterPushNotification.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_recipients_headers_prop_count, + { "Prop Count", "mapi.recipients_headers.prop_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenMsgStore_req_row, + { "Row", "mapi.OpenMsgStore_req.row", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_recipients_headers_bitmask, + { "Bitmask", "mapi.recipients_headers.bitmask", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_FILETIME_dwLowDateTime, + { "Dwlowdatetime", "mapi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenMsgStore_req_mailbox, + { "Mailbox", "mapi.OpenMsgStore_req.mailbox", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_MAPISTATUS_status, + { "MAPISTATUS", "mapi.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(mapi_MAPISTATUS_vals), 0, NULL, HFILL }}, + { &hf_mapi_recipient_type_EXCHANGE, + { "Exchange", "mapi.recipient_type.EXCHANGE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_SPropValue_CTR_lpguid, + { "Lpguid", "mapi.SPropValue_CTR.lpguid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoConnect_unknown2, + { "Unknown2", "mapi.EcDoConnect.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_ulEventType_fnevSearchComplete, + { "Fnevsearchcomplete", "mapi.ulEventType.fnevSearchComplete", FT_BOOLEAN, 16, TFS(&ulEventType_fnevSearchComplete_tfs), ( 0x00000080 ), NULL, HFILL }}, + { &hf_mapi_OpenMessage_recipients_recipients_headers_, + { "Subcontext length", "mapi.OpenMessage_recipients.subcontext", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, + { &hf_mapi_mapi_request_length, + { "Length", "mapi.mapi_request.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_ulEventType_fnevStatusObjectModified, + { "Fnevstatusobjectmodified", "mapi.ulEventType.fnevStatusObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevStatusObjectModified_tfs), ( 0x00000200 ), NULL, HFILL }}, + { &hf_mapi_ulEventType_fnevObjectCreated, + { "Fnevobjectcreated", "mapi.ulEventType.fnevObjectCreated", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCreated_tfs), ( 0x00000004 ), NULL, HFILL }}, + { &hf_mapi_OpenMessage_req_max_data, + { "Max Data", "mapi.OpenMessage_req.max_data", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_DATA_BLOB_length, + { "Length", "mapi.DATA_BLOB.length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_mapi_EcDoConnect_input_locale, { "Input Locale", "mapi.EcDoConnect.input_locale", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoConnect_emsmdb_client_version, - { "Emsmdb Client Version", "mapi.EcDoConnect.emsmdb_client_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_length, - { "Length", "mapi.EcDoRpc.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoConnect_unknown4, - { "Unknown4", "mapi.EcDoConnect.unknown4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_RecipExchange_organization_length, - { "Organization Length", "mapi.RecipExchange.organization_length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_handle, - { "Handle", "mapi.handle", FT_BYTES, BASE_NONE, NULL, 0, "NULL", HFILL }}, { &hf_mapi_RecipExchange_addr_type, { "Addr Type", "mapi.RecipExchange.addr_type", FT_UINT8, BASE_DEC, VALS(mapi_addr_type_vals), 0, NULL, HFILL }}, - { &hf_mapi_ulEventType_fnevObjectModified, - { "Fnevobjectmodified", "mapi.ulEventType.fnevObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectModified_tfs), ( 0x00000010 ), NULL, HFILL }}, + { &hf_mapi_EcDoRpc_mapi_request, + { "Mapi Request", "mapi.EcDoRpc.mapi_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_Release, { "Mapi Release", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_OpenMessage_req_message_id, - { "Message Id", "mapi.OpenMessage_req.message_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_mailbox, - { "Mailbox", "mapi.EcDoRpc.mailbox", FT_STRING, BASE_NONE, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_property_types, - { "Value", "mapi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(mapi_property_types_vals), 0, "NULL", HFILL }}, - { &hf_mapi_mapi_response_mapi_repl, - { "Mapi Repl", "mapi.mapi_response.mapi_repl", FT_NONE, BASE_NONE, NULL, 0, "NULL", HFILL }}, + { &hf_mapi_OpenMsgStore_req_mailbox_str_size, + { "Mailbox Str Size", "mapi.OpenMsgStore_req.mailbox_str_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_decrypted_data, + { "Decrypted data", "mapi.decrypted.data", FT_BYTES, BASE_NONE, NULL, 0, "NULL", HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REPL_handle_idx, + { "Handle Idx", "mapi.EcDoRpc_MAPI_REPL.handle_idx", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_GetProps_req_unknown, + { "Unknown", "mapi.GetProps_req.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_mapi_ulEventType_fnevNewMail, { "Fnevnewmail", "mapi.ulEventType.fnevNewMail", FT_BOOLEAN, 16, TFS(&ulEventType_fnevNewMail_tfs), ( 0x00000002 ), NULL, HFILL }}, - { &hf_mapi_EcDoRpc_max_data, - { "Max Data", "mapi.EcDoRpc.max_data", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_recipients_headers_username, - { "Username", "mapi.recipients_headers.username", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_SPropValue_CTR_b, + { "B", "mapi.SPropValue_CTR.b", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_mapi_response_mapi_repl, + { "Mapi Repl", "mapi.mapi_response.mapi_repl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_recipients_headers_layout, + { "Layout", "mapi.recipients_headers.layout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_length, + { "Length", "mapi.EcDoRpc.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_RecipExchange_organization_length, + { "Organization Length", "mapi.RecipExchange.organization_length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenMessage_recipients_recipients_headers, + { "Recipients Headers", "mapi.OpenMessage_recipients.recipients_headers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps, + { "Mapi Getprops", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_GetProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REPL_error_code, + { "Error Code", "mapi.EcDoRpc_MAPI_REPL.error_code", FT_UINT32, BASE_DEC, VALS(mapi_MAPISTATUS_vals), 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REPL_opnum, + { "Opnum", "mapi.EcDoRpc_MAPI_REPL.opnum", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_mapi_SPropValue_CTR_dbl, { "Dbl", "mapi.SPropValue_CTR.dbl", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenMessage_req_message_id, + { "Message Id", "mapi.OpenMessage_req.message_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenFolder_req_unknown, + { "Unknown", "mapi.OpenFolder_req.unknown", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_size, + { "Size", "mapi.EcDoRpc.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoConnect_session_nb, + { "Session Nb", "mapi.EcDoConnect.session_nb", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_mapi_MAPI_handle, { "MAPI handle", "mapi.mapi_handle", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_EcDoRpc_mapi_response, - { "Mapi Response", "mapi.EcDoRpc.mapi_response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_ulEventType_fnevTableModified, - { "Fnevtablemodified", "mapi.ulEventType.fnevTableModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevTableModified_tfs), ( 0x00000100 ), NULL, HFILL }}, - { &hf_mapi_EcDoRpc_mapi_tag, - { "MAPI tag", "mapi.EcDoRpc.mapi_tag", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_OpenMessage_recipients_recipients_headers_, - { "Subcontext length", "mapi.OpenMessage_recipients.subcontext", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcRUnregisterPushNotification_unknown, - { "Unknown", "mapi.EcRUnregisterPushNotification.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_SPropValue_CTR_err, - { "Err", "mapi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_mapi_pdu_len, { "Length", "mapi.pdu.len", FT_UINT16, BASE_HEX, NULL, 0x0, "Size of the command PDU", HFILL }}, - { &hf_mapi_recipient_type_SMTP, - { "Smtp", "mapi.recipient_type.SMTP", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_MAPISTATUS_status, - { "MAPISTATUS", "mapi.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(mapi_MAPISTATUS_vals), 0, NULL, HFILL }}, - { &hf_mapi_ulEventType_fnevExtended, - { "Fnevextended", "mapi.ulEventType.fnevExtended", FT_BOOLEAN, 16, TFS(&ulEventType_fnevExtended_tfs), ( 0x80000000 ), NULL, HFILL }}, - { &hf_mapi_OpenMessage_recipients_codepage, - { "Codepage", "mapi.OpenMessage_recipients.codepage", FT_UINT32, BASE_DEC, VALS(mapi_CODEPAGEID_vals), 0, NULL, HFILL }}, - { &hf_mapi_ulEventType_fnevStatusObjectModified, - { "Fnevstatusobjectmodified", "mapi.ulEventType.fnevStatusObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevStatusObjectModified_tfs), ( 0x00000200 ), NULL, HFILL }}, - { &hf_mapi_EcRRegisterPushNotification_notifkey, - { "Notifkey", "mapi.EcRRegisterPushNotification.notifkey", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcRRegisterPushNotification_sockaddr_len, - { "Sockaddr Len", "mapi.EcRRegisterPushNotification.sockaddr_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_offset, - { "Offset", "mapi.EcDoRpc.offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_mapi_request, - { "Mapi Request", "mapi.EcDoRpc.mapi_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_row, - { "Row", "mapi.EcDoRpc.row", FT_UINT8, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder, - { "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenFolder", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_recipient_type_EXCHANGE, - { "Exchange", "mapi.recipient_type.EXCHANGE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_SPropValue_CTR_lpguid, - { "Lpguid", "mapi.SPropValue_CTR.lpguid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_LPSTR_lppszA, - { "Lppsza", "mapi.LPSTR.lppszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_padding, - { "Padding", "mapi.EcDoRpc.padding", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_EcDoRpc_folder_id, - { "Folder ID", "mapi.EcDoRpc.folder_id", FT_UINT64, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_opnum, - { "Operation", "mapi.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_codepage, - { "Codepage", "mapi.EcDoRpc.codepage", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_recipients_headers_prop_values, - { "Prop Values", "mapi.recipients_headers.prop_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_decrypted_data, - { "Decrypted data", "mapi.decrypted.data", FT_BYTES, BASE_NONE, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_EcDoConnect_user, - { "User", "mapi.EcDoConnect.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_SPropValue_CTR_l, - { "L", "mapi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_SPropValue_CTR_i, - { "I", "mapi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_size, - { "Size", "mapi.EcDoRpc.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_mapi_request_mapi_len, + { "Mapi Len", "mapi.mapi_request.mapi_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_SPropValue_CTR_ft, + { "Ft", "mapi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_SPropValue_ulPropTag, + { "Ulproptag", "mapi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(mapi_MAPITAGS_vals), 0, NULL, HFILL }}, + { &hf_mapi_OpenMessage_recipients_RecipClass, + { "Recipclass", "mapi.OpenMessage_recipients.RecipClass", FT_UINT8, BASE_DEC, VALS(mapi_ulRecipClass_vals), 0, NULL, HFILL }}, { &hf_mapi_EcRRegisterPushNotification_ulEventMask, { "Uleventmask", "mapi.EcRRegisterPushNotification.ulEventMask", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoConnect_alloc_space, - { "Alloc Space", "mapi.EcDoConnect.alloc_space", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder, + { "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_OpenFolder", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenMsgStore_req_padding, + { "Padding", "mapi.OpenMsgStore_req.padding", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_FILETIME_dwHighDateTime, + { "Dwhighdatetime", "mapi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_mapi_OpenMessage_req_message_permissions, { "Message Permissions", "mapi.OpenMessage_req.message_permissions", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_prop_count, - { "Prop count", "mapi.EcDoRpc.prop_count", FT_UINT16, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_EcRRegisterPushNotification_sockaddr, - { "Sockaddr", "mapi.EcRRegisterPushNotification.sockaddr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_unknown1, - { "Unknown1", "mapi.EcDoRpc.unknown1", FT_UINT16, BASE_HEX, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_OpenMessage_req_max_data, - { "Max Data", "mapi.OpenMessage_req.max_data", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_Release, - { "Mapi Release", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcRRegisterPushNotification_unknown2, - { "Unknown2", "mapi.EcRRegisterPushNotification.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_mapi_request_handles, + { "Handles", "mapi.mapi_request.handles", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenFolder_req_handle_idx, + { "Handle Idx", "mapi.OpenFolder_req.handle_idx", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_mapi_ulEventType_fnevReservedForMapi, { "Fnevreservedformapi", "mapi.ulEventType.fnevReservedForMapi", FT_BOOLEAN, 16, TFS(&ulEventType_fnevReservedForMapi_tfs), ( 0x40000000 ), NULL, HFILL }}, - { &hf_mapi_EcDoRpc_mapi_response_, - { "Subcontext length", "mapi.EcDoRpc.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, - { &hf_mapi_recipients_headers_bitmask, - { "Bitmask", "mapi.recipients_headers.bitmask", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_SPropValue_CTR_ft, - { "Ft", "mapi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_SPropValue_CTR_l, + { "L", "mapi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_GetProps_req_prop_count, + { "Prop Count", "mapi.GetProps_req.prop_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_GetProps_repl_prop_data, + { "Prop Data", "mapi.GetProps_repl.prop_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoConnect_user, + { "User", "mapi.EcDoConnect.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REPL_u, + { "U", "mapi.EcDoRpc_MAPI_REPL.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoConnect_unknown4, + { "Unknown4", "mapi.EcDoConnect.unknown4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenFolder_req_folder_id, + { "Folder Id", "mapi.OpenFolder_req.folder_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_MAPI_OPNUM, + { "Opnum", "mapi.EcDoRpc_MAPI_REQ.opnum", FT_UINT8, BASE_HEX, VALS(mapi_MAPI_OPNUM_vals), 0, "NULL", HFILL }}, + { &hf_mapi_EcDoConnect_code_page, + { "Code Page", "mapi.EcDoConnect.code_page", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_handle, + { "Handle", "mapi.handle", FT_BYTES, BASE_NONE, NULL, 0, "NULL", HFILL }}, + { &hf_mapi_input_locale_method, + { "Method", "mapi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_mapi_input_locale_language, { "Language", "mapi.input_locale.language", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_SRow_ulRowFlags, - { "Ulrowflags", "mapi.SRow.ulRowFlags", FT_UINT8, BASE_DEC, VALS(mapi_ulRowFlags_vals), 0, NULL, HFILL }}, + { &hf_mapi_mapi_response_length, + { "Length", "mapi.mapi_response.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_GetProps_req_properties, + { "Properties", "mapi.GetProps_req.properties", FT_UINT32, BASE_DEC, VALS(mapi_MAPITAGS_vals), 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_mapi_response, + { "Mapi Response", "mapi.EcDoRpc.mapi_response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoConnect_store_version, + { "Store Version", "mapi.EcDoConnect.store_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_ulEventType_fnevObjectMoved, + { "Fnevobjectmoved", "mapi.ulEventType.fnevObjectMoved", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectMoved_tfs), ( 0x00000020 ), NULL, HFILL }}, + { &hf_mapi_SPropValue_CTR_err, + { "Err", "mapi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_ulEventType_fnevTableModified, + { "Fnevtablemodified", "mapi.ulEventType.fnevTableModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevTableModified_tfs), ( 0x00000100 ), NULL, HFILL }}, + { &hf_mapi_recipient_type, + { "Recipient Type", "mapi.recipients_headers.type", FT_UINT16, BASE_HEX, VALS(mapi_OM_recipient_type_vals), 0, "NULL", HFILL }}, + { &hf_mapi_ulEventType_fnevExtended, + { "Fnevextended", "mapi.ulEventType.fnevExtended", FT_BOOLEAN, 16, TFS(&ulEventType_fnevExtended_tfs), ( 0x80000000 ), NULL, HFILL }}, + { &hf_mapi_recipients_headers_prop_values, + { "Prop Values", "mapi.recipients_headers.prop_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REQ_mapi_flags, + { "Mapi Flags", "mapi.EcDoRpc_MAPI_REQ.mapi_flags", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenFolder_repl_unknown, + { "Unknown", "mapi.OpenFolder_repl.unknown", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_opnum, + { "Operation", "mapi.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_Release, + { "Mapi Release", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_property_types, + { "Value", "mapi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(mapi_property_types_vals), 0, "NULL", HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REQ_handle_idx, + { "Handle Idx", "mapi.EcDoRpc_MAPI_REQ.handle_idx", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_recipient_displayname_7bit_lpszA, + { "Lpsza", "mapi.recipient_displayname_7bit.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcRRegisterPushNotification_sockaddr_len, + { "Sockaddr Len", "mapi.EcRRegisterPushNotification.sockaddr_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcRRegisterPushNotification_notif_len, + { "Notif Len", "mapi.EcRRegisterPushNotification.notif_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoConnect_unknown3, + { "Unknown3", "mapi.EcDoConnect.unknown3", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_mapi_OpenMessage_req_folder_handle_idx, { "Folder Handle Idx", "mapi.OpenMessage_req.folder_handle_idx", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_recipients_headers_layout, - { "Layout", "mapi.recipients_headers.layout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_mapi_request_mapi_req, - { "Mapi Req", "mapi.mapi_request.mapi_req", FT_NONE, BASE_NONE, NULL, 0, "HFILL", HFILL }}, - { &hf_mapi_EcDoRpc_layout, - { "Layout", "mapi.EcDoRpc.layout", FT_UINT8, BASE_DEC, NULL, 0, "NULL", HFILL }}, - { &hf_mapi_EcDoConnect_code_page, - { "Code Page", "mapi.EcDoConnect.code_page", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_mapi_EcDoRpc_handle_index, - { "Handle index", "mapi.EcDoRpc.handle_index", FT_UINT8, BASE_DEC, NULL, 0, "NULL", HFILL }}, + { &hf_mapi_SPropValue_CTR_d, + { "D", "mapi.SPropValue_CTR.d", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore, + { "Mapi Openmsgstore", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenMsgStore", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_EcDoConnect_org_group, + { "Org Group", "mapi.EcDoConnect.org_group", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_mapi_OpenMessage_req_folder_id, + { "Folder Id", "mapi.OpenMessage_req.folder_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_mapi_ulEventType_fnevObjectModified, + { "Fnevobjectmodified", "mapi.ulEventType.fnevObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectModified_tfs), ( 0x00000010 ), NULL, HFILL }}, }; static gint *ett[] = { - &ett_mapi_mapi_request, - &ett_mapi_EcDoRpc_MAPI_REQ, - &ett_mapi_OpenFolder_req, - &ett_mapi_GetProps_req, - &ett_mapi_OpenMsgStore_req, - &ett_mapi_mapi_response, - &ett_mapi_EcDoRpc_MAPI_REPL, - &ett_mapi_OpenFolder_repl, - &ett_mapi_GetProps_repl, &ett_dcerpc_mapi, &ett_mapi_DATA_BLOB, &ett_mapi_input_locale, @@ -10427,6 +10889,8 @@ void proto_register_dcerpc_mapi(void) &ett_mapi_SRow, &ett_mapi_Release_req, &ett_mapi_Release_repl, + &ett_mapi_OpenFolder_req, + &ett_mapi_OpenFolder_repl, &ett_mapi_OpenMessage_req, &ett_mapi_RecipExchange, &ett_mapi_RecipSMTP, @@ -10434,9 +10898,16 @@ void proto_register_dcerpc_mapi(void) &ett_mapi_recipient_displayname_7bit, &ett_mapi_recipients_headers, &ett_mapi_OpenMessage_recipients, + &ett_mapi_GetProps_req, + &ett_mapi_GetProps_repl, &ett_mapi_ulEventType, + &ett_mapi_OpenMsgStore_req, &ett_mapi_EcDoRpc_MAPI_REQ_UNION, &ett_mapi_EcDoRpc_MAPI_REPL_UNION, + &ett_mapi_EcDoRpc_MAPI_REQ, + &ett_mapi_EcDoRpc_MAPI_REPL, + &ett_mapi_mapi_request, + &ett_mapi_mapi_response, }; proto_dcerpc_mapi = proto_register_protocol("Exchange 5.5 EMSMDB", "MAPI", "mapi"); diff --git a/epan/dissectors/packet-dcerpc-mapi.h b/epan/dissectors/packet-dcerpc-mapi.h index 16d0b7fe61..5088ebb6a6 100644 --- a/epan/dissectors/packet-dcerpc-mapi.h +++ b/epan/dissectors/packet-dcerpc-mapi.h @@ -1,6 +1,6 @@ /* DO NOT EDIT This file was automatically generated by Pidl - from mapi.idl and mapi.cnf. + from mapi/mapi.idl and mapi/mapi.cnf. Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. @@ -3617,6 +3617,8 @@ int mapi_dissect_enum_ulRowFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info int mapi_dissect_struct_SRow(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); int mapi_dissect_struct_Release_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); int mapi_dissect_struct_Release_repl(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); +int mapi_dissect_struct_OpenFolder_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); +int mapi_dissect_struct_OpenFolder_repl(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); int mapi_dissect_struct_OpenMessage_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); #define CP_USASCII (0x04E4) #define CP_UNICODE (0x04B0) @@ -3647,5 +3649,12 @@ extern const value_string mapi_OM_recipient_displayname_7bit_vals[]; int mapi_dissect_enum_OM_recipient_displayname_7bit(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint16 *param _U_); int mapi_dissect_struct_recipients_headers(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); int mapi_dissect_struct_OpenMessage_recipients(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); +int mapi_dissect_struct_GetProps_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); +int mapi_dissect_struct_GetProps_repl(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); int mapi_dissect_bitmap_ulEventType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); +int mapi_dissect_struct_OpenMsgStore_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); +int mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); +int mapi_dissect_struct_EcDoRpc_MAPI_REPL(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); +int mapi_dissect_struct_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); +int mapi_dissect_struct_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); #endif /* __PACKET_DCERPC_MAPI_H */ diff --git a/epan/dissectors/packet-dcerpc-mdssvc.c b/epan/dissectors/packet-dcerpc-mdssvc.c index 2a91d0babd..90e1a49e26 100644 --- a/epan/dissectors/packet-dcerpc-mdssvc.c +++ b/epan/dissectors/packet-dcerpc-mdssvc.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-mdssvc.h" +void proto_register_dcerpc_mdssvc(void); +void proto_reg_handoff_dcerpc_mdssvc(void); /* Ett declarations */ static gint ett_dcerpc_mdssvc = -1; diff --git a/epan/dissectors/packet-dcerpc-misc.c b/epan/dissectors/packet-dcerpc-misc.c index ca96dd7d6a..ea7a765459 100644 --- a/epan/dissectors/packet-dcerpc-misc.c +++ b/epan/dissectors/packet-dcerpc-misc.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-misc.h" +void proto_register_dcerpc_misc(void); +void proto_reg_handoff_dcerpc_misc(void); /* Ett declarations */ static gint ett_dcerpc_misc = -1; diff --git a/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c index 2c8588abfd..480129079a 100644 --- a/epan/dissectors/packet-dcerpc-nspi.c +++ b/epan/dissectors/packet-dcerpc-nspi.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-nspi.h" +void proto_register_dcerpc_nspi(void); +void proto_reg_handoff_dcerpc_nspi(void); /* Ett declarations */ static gint ett_dcerpc_nspi = -1; @@ -58,116 +60,116 @@ static gint ett_nspi_SRowSet = -1; /* Header field declarations */ -static gint hf_nspi_NspiDNToEph_size = -1; -static gint hf_nspi_NspiGetProps_flag = -1; -static gint hf_nspi_NspiGetMatches_instance_key = -1; -static gint hf_nspi_MAPINAMEID_lpguid = -1; -static gint hf_nspi_SDateTimeArray_cValues = -1; -static gint hf_nspi_SPropTagArray_cValues = -1; -static gint hf_nspi_NspiGetProps_REPL_values = -1; -static gint hf_nspi_SRow_cValues = -1; -static gint hf_nspi_NspiGetProps_REQ_properties = -1; -static gint hf_nspi_SSortOrder_ulOrder = -1; -static gint hf_nspi_SGuidArray_cValues = -1; -static gint hf_nspi_SSortOrderSet_cExpanded = -1; -static gint hf_nspi_SPropertyRestriction_lpProp = -1; -static gint hf_nspi_SSortOrderSet_cSorts = -1; -static gint hf_nspi_SBinary_cb = -1; -static gint hf_nspi_SRestriction_CTR_resAnd = -1; +static gint hf_nspi_NspiGetHierarchyInfo_unknown1 = -1; +static gint hf_nspi_SPropValue_CTR_ft = -1; +static gint hf_nspi_SPropValue_CTR_object = -1; +static gint hf_nspi_input_locale_language = -1; +static gint hf_nspi_SPropValue_CTR_MVft = -1; static gint hf_nspi_SDateTimeArray_lpft = -1; -static gint hf_nspi_SPropValue_CTR_MVbin = -1; -static gint hf_nspi_MV_UNICODE_STRUCT_cValues = -1; -static gint hf_nspi_MAPI_SETTINGS_service_provider = -1; -static gint hf_nspi_NspiQueryRows_instance_key = -1; +static gint hf_nspi_SSortOrderSet_aSort = -1; static gint hf_nspi_SGuidArray_lpguid = -1; -static gint hf_nspi_NspiQueryRows_unknown = -1; -static gint hf_nspi_MV_UNICODE_STRUCT_lpi = -1; -static gint hf_nspi_NspiDNToEph_flag = -1; -static gint hf_nspi_LPSTR_lppszA = -1; +static gint hf_nspi_SPropValue_dwAlignPad = -1; +static gint hf_nspi_NspiQueryRows_instance_key = -1; +static gint hf_nspi_SSortOrderSet_cCategories = -1; +static gint hf_nspi_MAPINAMEID_ulKind = -1; +static gint hf_nspi_NspiDNToEph_server_dn = -1; +static gint hf_nspi_MAPIUID_ab = -1; static gint hf_nspi_SPropValue_CTR_b = -1; -static gint hf_nspi_MAPINAMEID_lID = -1; -static gint hf_nspi_NspiGetMatches_unknown2 = -1; -static gint hf_nspi_NspiQueryRows_REQ_properties = -1; -static gint hf_nspi_NspiQueryRows_flag = -1; -static gint hf_nspi_SBinaryArray_cValues = -1; +static gint hf_nspi_SRow_ulAdrEntryPad = -1; +static gint hf_nspi_SPropValue_CTR_null = -1; +static gint hf_nspi_SBinary_cb = -1; +static gint hf_nspi_SBinaryArray_lpbin = -1; +static gint hf_nspi_SShortArray_cValues = -1; +static gint hf_nspi_SRowSet_aRow = -1; +static gint hf_nspi_NspiBind_mapiuid = -1; +static gint hf_nspi_SGuidArray_cValues = -1; static gint hf_nspi_instance_key_cValues = -1; +static gint hf_nspi_SRestriction_CTR_resProperty = -1; +static gint hf_nspi_NspiQueryRows_lRows = -1; +static gint hf_nspi_MV_UNICODE_STRUCT_cValues = -1; +static gint hf_nspi_SSortOrder_ulOrder = -1; +static gint hf_nspi_NspiGetHierarchyInfo_RowSet = -1; +static gint hf_nspi_MAPINAMEID_lID = -1; static gint hf_nspi_NspiQueryRows_settings = -1; -static gint hf_nspi_SPropValue_CTR_MVft = -1; -static gint hf_nspi_SPropValue_CTR_err = -1; -static gint hf_nspi_MAPI_SETTINGS_handle = -1; +static gint hf_nspi_SBinaryArray_cValues = -1; +static gint hf_nspi_NspiGetMatches_unknown2 = -1; +static gint hf_nspi_SLPSTRArray_strings = -1; +static gint hf_nspi_FILETIME_dwHighDateTime = -1; +static gint hf_nspi_NspiGetProps_REPL_values = -1; +static gint hf_nspi_SRow_cValues = -1; +static gint hf_nspi_SPropValue_ulPropTag = -1; static gint hf_nspi_NspiGetProps_settings = -1; -static gint hf_nspi_SPropValue_CTR_bin = -1; -static gint hf_nspi_NspiGetMatches_PropTagArray = -1; -static gint hf_nspi_NspiGetMatches_restrictions = -1; -static gint hf_nspi_SRestriction_PTTYPE = -1; -static gint hf_nspi_SPropertyRestriction_relop = -1; -static gint hf_nspi_NspiBind_mapiuid = -1; -static gint hf_nspi_input_locale_method = -1; -static gint hf_nspi_NspiGetHierarchyInfo_unknown1 = -1; -static gint hf_nspi_property_type = -1; -static gint hf_nspi_SSortOrderSet_cCategories = -1; -static gint hf_nspi_SPropTagArray_aulPropTag = -1; -static gint hf_nspi_instance_key_value = -1; -static gint hf_nspi_MV_LONG_STRUCT_lpl = -1; -static gint hf_nspi_SPropValue_CTR_MVguid = -1; static gint hf_nspi_NspiDNToEph_instance_key = -1; -static gint hf_nspi_MAPINAMEID_ulKind = -1; -static gint hf_nspi_SAndRestriction_lpRes = -1; -static gint hf_nspi_NspiGetMatches_unknown1 = -1; -static gint hf_nspi_SPropValue_CTR_MVszA = -1; -static gint hf_nspi_SSortOrderSet_aSort = -1; -static gint hf_nspi_SPropValue_ulPropTag = -1; -static gint hf_nspi_SPropValue_CTR_object = -1; -static gint hf_nspi_input_locale_language = -1; +static gint hf_nspi_SRestriction_CTR_resAnd = -1; +static gint hf_nspi_NspiGetMatches_RowSet = -1; +static gint hf_nspi_MV_UNICODE_STRUCT_lpi = -1; +static gint hf_nspi_SSortOrderSet_cSorts = -1; static gint hf_nspi_SSortOrder_ulPropTag = -1; -static gint hf_nspi_SPropertyRestriction_ulPropTag = -1; -static gint hf_nspi_NspiBind_unknown = -1; -static gint hf_nspi_SPropValue_CTR_MVszW = -1; +static gint hf_nspi_SPropValue_CTR_MVbin = -1; static gint hf_nspi_opnum = -1; -static gint hf_nspi_NspiGetMatches_REQ_properties = -1; -static gint hf_nspi_SPropValue_CTR_MVl = -1; -static gint hf_nspi_NspiGetMatches_settings = -1; -static gint hf_nspi_NspiGetMatches_RowSet = -1; -static gint hf_nspi_SPropValue_CTR_lpszA = -1; -static gint hf_nspi_MAPI_SETTINGS_flag = -1; static gint hf_nspi_NspiUnbind_status = -1; -static gint hf_nspi_SRow_ulAdrEntryPad = -1; -static gint hf_nspi_SPropValue_CTR_lpszW = -1; -static gint hf_nspi_SShortArray_cValues = -1; -static gint hf_nspi_MAPI_SETTINGS_codepage = -1; -static gint hf_nspi_SPropValue_dwAlignPad = -1; -static gint hf_nspi_MAPI_SETTINGS_input_locale = -1; -static gint hf_nspi_FILETIME_dwHighDateTime = -1; -static gint hf_nspi_FILETIME_dwLowDateTime = -1; -static gint hf_nspi_NspiDNToEph_server_dn = -1; -static gint hf_nspi_SPropValue_CTR_i = -1; -static gint hf_nspi_SLPSTRArray_strings = -1; +static gint hf_nspi_SAndRestriction_lpRes = -1; +static gint hf_nspi_NspiDNToEph_size = -1; +static gint hf_nspi_SPropValue_CTR_MVi = -1; +static gint hf_nspi_SPropertyRestriction_lpProp = -1; +static gint hf_nspi_NspiGetMatches_unknown3 = -1; +static gint hf_nspi_MAPI_SETTINGS_flag = -1; +static gint hf_nspi_instance_key_value = -1; +static gint hf_nspi_NspiGetMatches_settings = -1; static gint hf_nspi_MV_LONG_STRUCT_cValues = -1; +static gint hf_nspi_SRowSet_cRows = -1; +static gint hf_nspi_MAPI_SETTINGS_service_provider = -1; +static gint hf_nspi_SPropValue_CTR_l = -1; static gint hf_nspi_SAndRestriction_cRes = -1; -static gint hf_nspi_SRow_lpProps = -1; -static gint hf_nspi_NspiGetMatches_unknown3 = -1; -static gint hf_nspi_NspiQueryRows_lRows = -1; -static gint hf_nspi_SLPSTRArray_cValues = -1; -static gint hf_nspi_SRowSet_aRow = -1; -static gint hf_nspi_NspiGetHierarchyInfo_RowSet = -1; -static gint hf_nspi_NAME_STRING_str = -1; +static gint hf_nspi_NspiQueryRows_flag = -1; +static gint hf_nspi_NspiQueryRows_REQ_properties = -1; +static gint hf_nspi_SPropValue_CTR_MVl = -1; +static gint hf_nspi_NspiGetProps_flag = -1; static gint hf_nspi_MAPISTATUS_status = -1; -static gint hf_nspi_NspiGetHierarchyInfo_settings = -1; -static gint hf_nspi_NspiQueryRows_RowSet = -1; -static gint hf_nspi_SPropValue_CTR_l = -1; -static gint hf_nspi_SBinary_lpb = -1; +static gint hf_nspi_SPropValue_CTR_MVszW = -1; +static gint hf_nspi_LPSTR_lppszA = -1; +static gint hf_nspi_SPropValue_CTR_MVszA = -1; +static gint hf_nspi_property_type = -1; static gint hf_nspi_handle = -1; +static gint hf_nspi_NspiGetMatches_restrictions = -1; +static gint hf_nspi_NspiQueryRows_RowSet = -1; +static gint hf_nspi_SRow_lpProps = -1; +static gint hf_nspi_MAPI_SETTINGS_input_locale = -1; +static gint hf_nspi_SPropertyRestriction_ulPropTag = -1; +static gint hf_nspi_SPropTagArray_aulPropTag = -1; static gint hf_nspi_NspiGetHierarchyInfo_unknown2 = -1; -static gint hf_nspi_MAPIUID_ab = -1; -static gint hf_nspi_SRestriction_CTR_resProperty = -1; -static gint hf_nspi_NspiBind_settings = -1; -static gint hf_nspi_SPropValue_CTR_lpguid = -1; -static gint hf_nspi_SPropValue_CTR_ft = -1; -static gint hf_nspi_SBinaryArray_lpbin = -1; -static gint hf_nspi_SRowSet_cRows = -1; -static gint hf_nspi_SPropValue_CTR_null = -1; -static gint hf_nspi_SPropValue_CTR_MVi = -1; +static gint hf_nspi_SBinary_lpb = -1; +static gint hf_nspi_NspiGetHierarchyInfo_settings = -1; +static gint hf_nspi_SSortOrderSet_cExpanded = -1; +static gint hf_nspi_NspiQueryRows_unknown = -1; +static gint hf_nspi_input_locale_method = -1; +static gint hf_nspi_NspiGetMatches_instance_key = -1; +static gint hf_nspi_SPropValue_CTR_lpszA = -1; +static gint hf_nspi_SPropValue_CTR_bin = -1; static gint hf_nspi_SShortArray_lpi = -1; +static gint hf_nspi_SPropValue_CTR_lpszW = -1; +static gint hf_nspi_NspiGetMatches_PropTagArray = -1; +static gint hf_nspi_SLPSTRArray_cValues = -1; +static gint hf_nspi_SPropValue_CTR_err = -1; +static gint hf_nspi_SRestriction_PTTYPE = -1; +static gint hf_nspi_NAME_STRING_str = -1; +static gint hf_nspi_SPropertyRestriction_relop = -1; +static gint hf_nspi_SPropValue_CTR_MVguid = -1; +static gint hf_nspi_MAPINAMEID_lpguid = -1; +static gint hf_nspi_FILETIME_dwLowDateTime = -1; +static gint hf_nspi_NspiGetMatches_REQ_properties = -1; +static gint hf_nspi_SPropTagArray_cValues = -1; +static gint hf_nspi_SPropValue_CTR_lpguid = -1; +static gint hf_nspi_SPropValue_CTR_i = -1; +static gint hf_nspi_MAPI_SETTINGS_codepage = -1; +static gint hf_nspi_NspiDNToEph_flag = -1; +static gint hf_nspi_NspiBind_unknown = -1; +static gint hf_nspi_MAPI_SETTINGS_handle = -1; +static gint hf_nspi_NspiGetProps_REQ_properties = -1; +static gint hf_nspi_MV_LONG_STRUCT_lpl = -1; +static gint hf_nspi_NspiGetMatches_unknown1 = -1; +static gint hf_nspi_SDateTimeArray_cValues = -1; +static gint hf_nspi_NspiBind_settings = -1; static gint proto_dcerpc_nspi = -1; /* Version information */ @@ -7572,7 +7574,7 @@ nspi_dissect_struct_MAPI_SETTINGS(tvbuff_t *tvb _U_, int offset _U_, packet_info /* IDL: struct { */ -/* IDL: [unique(1)] [size_is(cValues-1)] [length_is(cValues-1)] MAPITAGS *aulPropTag; */ +/* IDL: [unique(1)] [length_is(cValues-1)] [size_is(cValues-1)] MAPITAGS *aulPropTag; */ /* IDL: uint32 cValues; */ /* IDL: } */ @@ -7641,7 +7643,7 @@ nspi_dissect_struct_SPropTagArray(tvbuff_t *tvb _U_, int offset _U_, packet_info /* IDL: struct { */ -/* IDL: [unique(1)] [size_is(cValues-1)] [length_is(cValues-1)] uint32 *value; */ +/* IDL: [unique(1)] [length_is(cValues-1)] [size_is(cValues-1)] uint32 *value; */ /* IDL: uint32 cValues; */ /* IDL: } */ @@ -8202,7 +8204,7 @@ nspi_dissect_struct_SSortOrderSet(tvbuff_t *tvb _U_, int offset _U_, packet_info /* IDL: struct { */ -/* IDL: [charset(DOS)] [unique(1)] uint8 *str; */ +/* IDL: [unique(1)] [charset(DOS)] uint8 *str; */ /* IDL: } */ static int @@ -8304,7 +8306,7 @@ nspi_dissect_enum_property_types(tvbuff_t *tvb _U_, int offset _U_, packet_info /* IDL: struct { */ /* IDL: uint32 cb; */ -/* IDL: [size_is(cb)] [unique(1)] uint8 *lpb; */ +/* IDL: [unique(1)] [size_is(cb)] uint8 *lpb; */ /* IDL: } */ static int @@ -8426,7 +8428,7 @@ nspi_dissect_struct_FILETIME(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin /* IDL: struct { */ /* IDL: uint32 cValues; */ -/* IDL: [size_is(cValues)] [unique(1)] uint16 *lpi; */ +/* IDL: [unique(1)] [size_is(cValues)] uint16 *lpi; */ /* IDL: } */ static int @@ -8495,7 +8497,7 @@ nspi_dissect_struct_SShortArray(tvbuff_t *tvb _U_, int offset _U_, packet_info * /* IDL: struct { */ /* IDL: uint32 cValues; */ -/* IDL: [size_is(cValues)] [unique(1)] uint32 *lpl; */ +/* IDL: [unique(1)] [size_is(cValues)] uint32 *lpl; */ /* IDL: } */ static int @@ -8609,7 +8611,7 @@ nspi_dissect_struct_LPSTR(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo /* IDL: struct { */ /* IDL: uint32 cValues; */ -/* IDL: [size_is(cValues)] [unique(1)] LPSTR **strings; */ +/* IDL: [unique(1)] [size_is(cValues)] LPSTR **strings; */ /* IDL: } */ static int @@ -8755,7 +8757,7 @@ nspi_dissect_struct_SBinaryArray(tvbuff_t *tvb _U_, int offset _U_, packet_info /* IDL: struct { */ /* IDL: uint32 cValues; */ -/* IDL: [size_is(cValues)] [unique(1)] uint32 *lpguid; */ +/* IDL: [unique(1)] [size_is(cValues)] uint32 *lpguid; */ /* IDL: } */ static int @@ -8963,9 +8965,9 @@ nspi_dissect_struct_SDateTimeArray(tvbuff_t *tvb _U_, int offset _U_, packet_inf /* IDL: [case(PT_I2)] [case(PT_I2)] uint16 i; */ /* IDL: [case(PT_LONG)] [case(PT_LONG)] uint32 l; */ /* IDL: [case(PT_BOOLEAN)] [case(PT_BOOLEAN)] uint16 b; */ -/* IDL: [case(PT_STRING8)] [case(PT_STRING8)] [unique(1)] [charset(DOS)] uint8 *lpszA; */ +/* IDL: [case(PT_STRING8)] [unique(1)] [charset(DOS)] [case(PT_STRING8)] uint8 *lpszA; */ /* IDL: [case(PT_BINARY)] [case(PT_BINARY)] SBinary bin; */ -/* IDL: [case(PT_UNICODE)] [case(PT_UNICODE)] [unique(1)] [charset(UTF16)] uint16 *lpszW; */ +/* IDL: [case(PT_UNICODE)] [unique(1)] [charset(UTF16)] [case(PT_UNICODE)] uint16 *lpszW; */ /* IDL: [case(PT_CLSID)] [unique(1)] [case(PT_CLSID)] MAPIUID *lpguid; */ /* IDL: [case(PT_SYSTIME)] [case(PT_SYSTIME)] FILETIME ft; */ /* IDL: [case(PT_ERROR)] [case(PT_ERROR)] MAPISTATUS err; */ @@ -9317,7 +9319,7 @@ nspi_dissect_struct_SPropValue(tvbuff_t *tvb _U_, int offset _U_, packet_info *p /* IDL: struct { */ /* IDL: uint32 ulAdrEntryPad; */ /* IDL: uint32 cValues; */ -/* IDL: [size_is(cValues)] [unique(1)] SPropValue *lpProps; */ +/* IDL: [unique(1)] [size_is(cValues)] SPropValue *lpProps; */ /* IDL: } */ static int @@ -9512,7 +9514,7 @@ nspi_dissect_element_NspiBind_handle_(tvbuff_t *tvb _U_, int offset _U_, packet_ /* IDL: MAPISTATUS NspiBind( */ /* IDL: [in] uint32 unknown, */ -/* IDL: [in] [ref] MAPI_SETTINGS *settings, */ +/* IDL: [ref] [in] MAPI_SETTINGS *settings, */ /* IDL: [out] [unique(1)] [in] GUID *mapiuid, */ /* IDL: [out] [ref] policy_handle *handle */ /* IDL: ); */ @@ -9746,12 +9748,12 @@ nspi_dissect_element_NspiQueryRows_RowSet__(tvbuff_t *tvb _U_, int offset _U_, p /* IDL: MAPISTATUS NspiQueryRows( */ /* IDL: [ref] [in] policy_handle *handle, */ /* IDL: [in] uint32 flag, */ -/* IDL: [ref] [in] [out] MAPI_SETTINGS *settings, */ +/* IDL: [out] [ref] [in] MAPI_SETTINGS *settings, */ /* IDL: [in] uint32 lRows, */ -/* IDL: [size_is(lRows)] [in] [unique(1)] uint32 *instance_key, */ +/* IDL: [unique(1)] [in] [size_is(lRows)] uint32 *instance_key, */ /* IDL: [in] uint32 unknown, */ /* IDL: [ref] [in] SPropTagArray *REQ_properties, */ -/* IDL: [ref] [out] SRowSet **RowSet */ +/* IDL: [out] [ref] SRowSet **RowSet */ /* IDL: ); */ static int @@ -9959,14 +9961,14 @@ nspi_dissect_element_NspiGetMatches_RowSet__(tvbuff_t *tvb _U_, int offset _U_, /* IDL: MAPISTATUS NspiGetMatches( */ /* IDL: [ref] [in] policy_handle *handle, */ /* IDL: [in] uint32 unknown1, */ -/* IDL: [in] [ref] [out] MAPI_SETTINGS *settings, */ -/* IDL: [in] [unique(1)] SPropTagArray *PropTagArray, */ +/* IDL: [out] [ref] [in] MAPI_SETTINGS *settings, */ +/* IDL: [unique(1)] [in] SPropTagArray *PropTagArray, */ /* IDL: [in] uint32 unknown2, */ -/* IDL: [in] [unique(1)] SRestriction *restrictions, */ +/* IDL: [unique(1)] [in] SRestriction *restrictions, */ /* IDL: [in] uint32 unknown3, */ /* IDL: [out] [ref] instance_key *instance_key, */ /* IDL: [unique(1)] [in] SPropTagArray *REQ_properties, */ -/* IDL: [ref] [out] SRowSet **RowSet */ +/* IDL: [out] [ref] SRowSet **RowSet */ /* IDL: ); */ static int @@ -10108,8 +10110,8 @@ nspi_dissect_element_NspiDNToEph_instance_key_(tvbuff_t *tvb _U_, int offset _U_ /* IDL: [ref] [in] policy_handle *handle, */ /* IDL: [in] uint32 flag, */ /* IDL: [in] uint32 size, */ -/* IDL: [ref] [size_is(size)] [in] NAME_STRING *server_dn, */ -/* IDL: [ref] [out] instance_key *instance_key */ +/* IDL: [ref] [in] [size_is(size)] NAME_STRING *server_dn, */ +/* IDL: [out] [ref] instance_key *instance_key */ /* IDL: ); */ static int @@ -10244,9 +10246,9 @@ nspi_dissect_element_NspiGetProps_REPL_values__(tvbuff_t *tvb _U_, int offset _U /* IDL: MAPISTATUS NspiGetProps( */ /* IDL: [ref] [in] policy_handle *handle, */ /* IDL: [in] uint32 flag, */ -/* IDL: [in] [ref] MAPI_SETTINGS *settings, */ +/* IDL: [ref] [in] MAPI_SETTINGS *settings, */ /* IDL: [ref] [in] SPropTagArray *REQ_properties, */ -/* IDL: [ref] [out] SRow **REPL_values */ +/* IDL: [out] [ref] SRow **REPL_values */ /* IDL: ); */ static int @@ -10397,11 +10399,11 @@ nspi_dissect_element_NspiGetHierarchyInfo_RowSet__(tvbuff_t *tvb _U_, int offset } /* IDL: MAPISTATUS NspiGetHierarchyInfo( */ -/* IDL: [in] [ref] policy_handle *handle, */ +/* IDL: [ref] [in] policy_handle *handle, */ /* IDL: [in] uint32 unknown1, */ /* IDL: [ref] [in] MAPI_SETTINGS *settings, */ -/* IDL: [ref] [in] [out] uint32 *unknown2, */ -/* IDL: [ref] [out] SRowSet **RowSet */ +/* IDL: [out] [ref] [in] uint32 *unknown2, */ +/* IDL: [out] [ref] SRowSet **RowSet */ /* IDL: ); */ static int @@ -10632,226 +10634,226 @@ static dcerpc_sub_dissector nspi_dissectors[] = { void proto_register_dcerpc_nspi(void) { static hf_register_info hf[] = { - { &hf_nspi_NspiDNToEph_size, - { "Size", "nspi.NspiDNToEph.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetProps_flag, - { "Flag", "nspi.NspiGetProps.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetMatches_instance_key, - { "Instance Key", "nspi.NspiGetMatches.instance_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MAPINAMEID_lpguid, - { "Lpguid", "nspi.MAPINAMEID.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SDateTimeArray_cValues, - { "Cvalues", "nspi.SDateTimeArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropTagArray_cValues, - { "Cvalues", "nspi.SPropTagArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetProps_REPL_values, - { "Repl Values", "nspi.NspiGetProps.REPL_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SRow_cValues, - { "Cvalues", "nspi.SRow.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetProps_REQ_properties, - { "Req Properties", "nspi.NspiGetProps.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SSortOrder_ulOrder, - { "Ulorder", "nspi.SSortOrder.ulOrder", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SGuidArray_cValues, - { "Cvalues", "nspi.SGuidArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SSortOrderSet_cExpanded, - { "Cexpanded", "nspi.SSortOrderSet.cExpanded", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropertyRestriction_lpProp, - { "Lpprop", "nspi.SPropertyRestriction.lpProp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SSortOrderSet_cSorts, - { "Csorts", "nspi.SSortOrderSet.cSorts", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SBinary_cb, - { "Cb", "nspi.SBinary.cb", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SRestriction_CTR_resAnd, - { "Resand", "nspi.SRestriction_CTR.resAnd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetHierarchyInfo_unknown1, + { "Unknown1", "nspi.NspiGetHierarchyInfo.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_ft, + { "Ft", "nspi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_object, + { "Object", "nspi.SPropValue_CTR.object", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_input_locale_language, + { "Language", "nspi.input_locale.language", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_MVft, + { "Mvft", "nspi.SPropValue_CTR.MVft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nspi_SDateTimeArray_lpft, { "Lpft", "nspi.SDateTimeArray.lpft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_MVbin, - { "Mvbin", "nspi.SPropValue_CTR.MVbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MV_UNICODE_STRUCT_cValues, - { "Cvalues", "nspi.MV_UNICODE_STRUCT.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MAPI_SETTINGS_service_provider, - { "Service Provider", "nspi.MAPI_SETTINGS.service_provider", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiQueryRows_instance_key, - { "Instance Key", "nspi.NspiQueryRows.instance_key", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SSortOrderSet_aSort, + { "Asort", "nspi.SSortOrderSet.aSort", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nspi_SGuidArray_lpguid, { "Lpguid", "nspi.SGuidArray.lpguid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiQueryRows_unknown, - { "Unknown", "nspi.NspiQueryRows.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MV_UNICODE_STRUCT_lpi, - { "Lpi", "nspi.MV_UNICODE_STRUCT.lpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiDNToEph_flag, - { "Flag", "nspi.NspiDNToEph.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_LPSTR_lppszA, - { "Lppsza", "nspi.LPSTR.lppszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_dwAlignPad, + { "Dwalignpad", "nspi.SPropValue.dwAlignPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiQueryRows_instance_key, + { "Instance Key", "nspi.NspiQueryRows.instance_key", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SSortOrderSet_cCategories, + { "Ccategories", "nspi.SSortOrderSet.cCategories", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MAPINAMEID_ulKind, + { "Ulkind", "nspi.MAPINAMEID.ulKind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiDNToEph_server_dn, + { "Server Dn", "nspi.NspiDNToEph.server_dn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MAPIUID_ab, + { "Ab", "nspi.MAPIUID.ab", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_nspi_SPropValue_CTR_b, { "B", "nspi.SPropValue_CTR.b", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MAPINAMEID_lID, - { "Lid", "nspi.MAPINAMEID.lID", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetMatches_unknown2, - { "Unknown2", "nspi.NspiGetMatches.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiQueryRows_REQ_properties, - { "Req Properties", "nspi.NspiQueryRows.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiQueryRows_flag, - { "Flag", "nspi.NspiQueryRows.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SBinaryArray_cValues, - { "Cvalues", "nspi.SBinaryArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SRow_ulAdrEntryPad, + { "Uladrentrypad", "nspi.SRow.ulAdrEntryPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_null, + { "Null", "nspi.SPropValue_CTR.null", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SBinary_cb, + { "Cb", "nspi.SBinary.cb", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SBinaryArray_lpbin, + { "Lpbin", "nspi.SBinaryArray.lpbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SShortArray_cValues, + { "Cvalues", "nspi.SShortArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SRowSet_aRow, + { "Arow", "nspi.SRowSet.aRow", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiBind_mapiuid, + { "Mapiuid", "nspi.NspiBind.mapiuid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SGuidArray_cValues, + { "Cvalues", "nspi.SGuidArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_nspi_instance_key_cValues, { "Cvalues", "nspi.instance_key.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SRestriction_CTR_resProperty, + { "Resproperty", "nspi.SRestriction_CTR.resProperty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiQueryRows_lRows, + { "Lrows", "nspi.NspiQueryRows.lRows", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MV_UNICODE_STRUCT_cValues, + { "Cvalues", "nspi.MV_UNICODE_STRUCT.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SSortOrder_ulOrder, + { "Ulorder", "nspi.SSortOrder.ulOrder", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetHierarchyInfo_RowSet, + { "Rowset", "nspi.NspiGetHierarchyInfo.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MAPINAMEID_lID, + { "Lid", "nspi.MAPINAMEID.lID", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_nspi_NspiQueryRows_settings, { "Settings", "nspi.NspiQueryRows.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_MVft, - { "Mvft", "nspi.SPropValue_CTR.MVft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_err, - { "Err", "nspi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, VALS(nspi_MAPISTATUS_vals), 0, NULL, HFILL }}, - { &hf_nspi_MAPI_SETTINGS_handle, - { "Handle", "nspi.MAPI_SETTINGS.handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SBinaryArray_cValues, + { "Cvalues", "nspi.SBinaryArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetMatches_unknown2, + { "Unknown2", "nspi.NspiGetMatches.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SLPSTRArray_strings, + { "Strings", "nspi.SLPSTRArray.strings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_FILETIME_dwHighDateTime, + { "Dwhighdatetime", "nspi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetProps_REPL_values, + { "Repl Values", "nspi.NspiGetProps.REPL_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SRow_cValues, + { "Cvalues", "nspi.SRow.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_ulPropTag, + { "Ulproptag", "nspi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }}, { &hf_nspi_NspiGetProps_settings, { "Settings", "nspi.NspiGetProps.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_bin, - { "Bin", "nspi.SPropValue_CTR.bin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetMatches_PropTagArray, - { "Proptagarray", "nspi.NspiGetMatches.PropTagArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetMatches_restrictions, - { "Restrictions", "nspi.NspiGetMatches.restrictions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SRestriction_PTTYPE, - { "Restriction Type", "nspi.property_type", FT_UINT32, BASE_HEX, VALS(nspi_nspi_RestrictionType_vals), 0, NULL, HFILL }}, - { &hf_nspi_SPropertyRestriction_relop, - { "Relop", "nspi.SPropertyRestriction.relop", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiBind_mapiuid, - { "Mapiuid", "nspi.NspiBind.mapiuid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_input_locale_method, - { "Method", "nspi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetHierarchyInfo_unknown1, - { "Unknown1", "nspi.NspiGetHierarchyInfo.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_property_type, - { "Value", "nspi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(nspi_property_types_vals), 0, NULL, HFILL }}, - { &hf_nspi_SSortOrderSet_cCategories, - { "Ccategories", "nspi.SSortOrderSet.cCategories", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropTagArray_aulPropTag, - { "Aulproptag", "nspi.SPropTagArray.aulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }}, - { &hf_nspi_instance_key_value, - { "Value", "nspi.instance_key.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MV_LONG_STRUCT_lpl, - { "Lpl", "nspi.MV_LONG_STRUCT.lpl", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_MVguid, - { "Mvguid", "nspi.SPropValue_CTR.MVguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nspi_NspiDNToEph_instance_key, { "Instance Key", "nspi.NspiDNToEph.instance_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MAPINAMEID_ulKind, - { "Ulkind", "nspi.MAPINAMEID.ulKind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SAndRestriction_lpRes, - { "Lpres", "nspi.SAndRestriction.lpRes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetMatches_unknown1, - { "Unknown1", "nspi.NspiGetMatches.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_MVszA, - { "Mvsza", "nspi.SPropValue_CTR.MVszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SSortOrderSet_aSort, - { "Asort", "nspi.SSortOrderSet.aSort", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_ulPropTag, - { "Ulproptag", "nspi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_object, - { "Object", "nspi.SPropValue_CTR.object", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_input_locale_language, - { "Language", "nspi.input_locale.language", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SRestriction_CTR_resAnd, + { "Resand", "nspi.SRestriction_CTR.resAnd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetMatches_RowSet, + { "Rowset", "nspi.NspiGetMatches.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MV_UNICODE_STRUCT_lpi, + { "Lpi", "nspi.MV_UNICODE_STRUCT.lpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SSortOrderSet_cSorts, + { "Csorts", "nspi.SSortOrderSet.cSorts", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_nspi_SSortOrder_ulPropTag, { "Ulproptag", "nspi.SSortOrder.ulPropTag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropertyRestriction_ulPropTag, - { "Ulproptag", "nspi.SPropertyRestriction.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }}, - { &hf_nspi_NspiBind_unknown, - { "Unknown", "nspi.NspiBind.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_MVszW, - { "Mvszw", "nspi.SPropValue_CTR.MVszW", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_MVbin, + { "Mvbin", "nspi.SPropValue_CTR.MVbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nspi_opnum, { "Operation", "nspi.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetMatches_REQ_properties, - { "Req Properties", "nspi.NspiGetMatches.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_MVl, - { "Mvl", "nspi.SPropValue_CTR.MVl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetMatches_settings, - { "Settings", "nspi.NspiGetMatches.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetMatches_RowSet, - { "Rowset", "nspi.NspiGetMatches.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_lpszA, - { "Lpsza", "nspi.SPropValue_CTR.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MAPI_SETTINGS_flag, - { "Flag", "nspi.MAPI_SETTINGS.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_nspi_NspiUnbind_status, { "Status", "nspi.NspiUnbind.status", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SRow_ulAdrEntryPad, - { "Uladrentrypad", "nspi.SRow.ulAdrEntryPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_lpszW, - { "Lpszw", "nspi.SPropValue_CTR.lpszW", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SShortArray_cValues, - { "Cvalues", "nspi.SShortArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MAPI_SETTINGS_codepage, - { "Codepage", "nspi.MAPI_SETTINGS.codepage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_dwAlignPad, - { "Dwalignpad", "nspi.SPropValue.dwAlignPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MAPI_SETTINGS_input_locale, - { "Input Locale", "nspi.MAPI_SETTINGS.input_locale", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_FILETIME_dwHighDateTime, - { "Dwhighdatetime", "nspi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_FILETIME_dwLowDateTime, - { "Dwlowdatetime", "nspi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiDNToEph_server_dn, - { "Server Dn", "nspi.NspiDNToEph.server_dn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_i, - { "I", "nspi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SLPSTRArray_strings, - { "Strings", "nspi.SLPSTRArray.strings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SAndRestriction_lpRes, + { "Lpres", "nspi.SAndRestriction.lpRes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiDNToEph_size, + { "Size", "nspi.NspiDNToEph.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_MVi, + { "Mvi", "nspi.SPropValue_CTR.MVi", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropertyRestriction_lpProp, + { "Lpprop", "nspi.SPropertyRestriction.lpProp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetMatches_unknown3, + { "Unknown3", "nspi.NspiGetMatches.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MAPI_SETTINGS_flag, + { "Flag", "nspi.MAPI_SETTINGS.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_instance_key_value, + { "Value", "nspi.instance_key.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetMatches_settings, + { "Settings", "nspi.NspiGetMatches.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nspi_MV_LONG_STRUCT_cValues, { "Cvalues", "nspi.MV_LONG_STRUCT.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SRowSet_cRows, + { "Crows", "nspi.SRowSet.cRows", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MAPI_SETTINGS_service_provider, + { "Service Provider", "nspi.MAPI_SETTINGS.service_provider", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_l, + { "L", "nspi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_nspi_SAndRestriction_cRes, { "Cres", "nspi.SAndRestriction.cRes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SRow_lpProps, - { "Lpprops", "nspi.SRow.lpProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetMatches_unknown3, - { "Unknown3", "nspi.NspiGetMatches.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiQueryRows_lRows, - { "Lrows", "nspi.NspiQueryRows.lRows", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SLPSTRArray_cValues, - { "Cvalues", "nspi.SLPSTRArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SRowSet_aRow, - { "Arow", "nspi.SRowSet.aRow", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiGetHierarchyInfo_RowSet, - { "Rowset", "nspi.NspiGetHierarchyInfo.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NAME_STRING_str, - { "Str", "nspi.NAME_STRING.str", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiQueryRows_flag, + { "Flag", "nspi.NspiQueryRows.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiQueryRows_REQ_properties, + { "Req Properties", "nspi.NspiQueryRows.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_MVl, + { "Mvl", "nspi.SPropValue_CTR.MVl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetProps_flag, + { "Flag", "nspi.NspiGetProps.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_nspi_MAPISTATUS_status, { "MAPISTATUS", "nspi.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(nspi_MAPISTATUS_vals), 0, NULL, HFILL }}, - { &hf_nspi_NspiGetHierarchyInfo_settings, - { "Settings", "nspi.NspiGetHierarchyInfo.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiQueryRows_RowSet, - { "Rowset", "nspi.NspiQueryRows.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_l, - { "L", "nspi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SBinary_lpb, - { "Lpb", "nspi.SBinary.lpb", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_MVszW, + { "Mvszw", "nspi.SPropValue_CTR.MVszW", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_LPSTR_lppszA, + { "Lppsza", "nspi.LPSTR.lppszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_MVszA, + { "Mvsza", "nspi.SPropValue_CTR.MVszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_property_type, + { "Value", "nspi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(nspi_property_types_vals), 0, NULL, HFILL }}, { &hf_nspi_handle, { "Handle", "nspi.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetMatches_restrictions, + { "Restrictions", "nspi.NspiGetMatches.restrictions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiQueryRows_RowSet, + { "Rowset", "nspi.NspiQueryRows.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SRow_lpProps, + { "Lpprops", "nspi.SRow.lpProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MAPI_SETTINGS_input_locale, + { "Input Locale", "nspi.MAPI_SETTINGS.input_locale", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropertyRestriction_ulPropTag, + { "Ulproptag", "nspi.SPropertyRestriction.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }}, + { &hf_nspi_SPropTagArray_aulPropTag, + { "Aulproptag", "nspi.SPropTagArray.aulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }}, { &hf_nspi_NspiGetHierarchyInfo_unknown2, { "Unknown2", "nspi.NspiGetHierarchyInfo.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_MAPIUID_ab, - { "Ab", "nspi.MAPIUID.ab", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SRestriction_CTR_resProperty, - { "Resproperty", "nspi.SRestriction_CTR.resProperty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_NspiBind_settings, - { "Settings", "nspi.NspiBind.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_lpguid, - { "Lpguid", "nspi.SPropValue_CTR.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_ft, - { "Ft", "nspi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SBinaryArray_lpbin, - { "Lpbin", "nspi.SBinaryArray.lpbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SRowSet_cRows, - { "Crows", "nspi.SRowSet.cRows", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_null, - { "Null", "nspi.SPropValue_CTR.null", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nspi_SPropValue_CTR_MVi, - { "Mvi", "nspi.SPropValue_CTR.MVi", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SBinary_lpb, + { "Lpb", "nspi.SBinary.lpb", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetHierarchyInfo_settings, + { "Settings", "nspi.NspiGetHierarchyInfo.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SSortOrderSet_cExpanded, + { "Cexpanded", "nspi.SSortOrderSet.cExpanded", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiQueryRows_unknown, + { "Unknown", "nspi.NspiQueryRows.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_input_locale_method, + { "Method", "nspi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetMatches_instance_key, + { "Instance Key", "nspi.NspiGetMatches.instance_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_lpszA, + { "Lpsza", "nspi.SPropValue_CTR.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_bin, + { "Bin", "nspi.SPropValue_CTR.bin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nspi_SShortArray_lpi, { "Lpi", "nspi.SShortArray.lpi", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_lpszW, + { "Lpszw", "nspi.SPropValue_CTR.lpszW", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetMatches_PropTagArray, + { "Proptagarray", "nspi.NspiGetMatches.PropTagArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SLPSTRArray_cValues, + { "Cvalues", "nspi.SLPSTRArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_err, + { "Err", "nspi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, VALS(nspi_MAPISTATUS_vals), 0, NULL, HFILL }}, + { &hf_nspi_SRestriction_PTTYPE, + { "Restriction Type", "nspi.property_type", FT_UINT32, BASE_HEX, VALS(nspi_nspi_RestrictionType_vals), 0, NULL, HFILL }}, + { &hf_nspi_NAME_STRING_str, + { "Str", "nspi.NAME_STRING.str", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropertyRestriction_relop, + { "Relop", "nspi.SPropertyRestriction.relop", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_MVguid, + { "Mvguid", "nspi.SPropValue_CTR.MVguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MAPINAMEID_lpguid, + { "Lpguid", "nspi.MAPINAMEID.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_FILETIME_dwLowDateTime, + { "Dwlowdatetime", "nspi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetMatches_REQ_properties, + { "Req Properties", "nspi.NspiGetMatches.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropTagArray_cValues, + { "Cvalues", "nspi.SPropTagArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_lpguid, + { "Lpguid", "nspi.SPropValue_CTR.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SPropValue_CTR_i, + { "I", "nspi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MAPI_SETTINGS_codepage, + { "Codepage", "nspi.MAPI_SETTINGS.codepage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiDNToEph_flag, + { "Flag", "nspi.NspiDNToEph.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiBind_unknown, + { "Unknown", "nspi.NspiBind.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MAPI_SETTINGS_handle, + { "Handle", "nspi.MAPI_SETTINGS.handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetProps_REQ_properties, + { "Req Properties", "nspi.NspiGetProps.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nspi_MV_LONG_STRUCT_lpl, + { "Lpl", "nspi.MV_LONG_STRUCT.lpl", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiGetMatches_unknown1, + { "Unknown1", "nspi.NspiGetMatches.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_SDateTimeArray_cValues, + { "Cvalues", "nspi.SDateTimeArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nspi_NspiBind_settings, + { "Settings", "nspi.NspiBind.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-dcerpc-rfr.c b/epan/dissectors/packet-dcerpc-rfr.c index 2eef4c9c99..da1fb7f359 100644 --- a/epan/dissectors/packet-dcerpc-rfr.c +++ b/epan/dissectors/packet-dcerpc-rfr.c @@ -25,22 +25,24 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-rfr.h" +void proto_register_dcerpc_rfr(void); +void proto_reg_handoff_dcerpc_rfr(void); /* Ett declarations */ static gint ett_dcerpc_rfr = -1; /* Header field declarations */ -static gint hf_rfr_RfrGetFQDNFromLegacyDN_szMailboxServerDN = -1; static gint hf_rfr_MAPISTATUS_status = -1; static gint hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags = -1; -static gint hf_rfr_RfrGetFQDNFromLegacyDN_cbMailboxServerDN = -1; -static gint hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN = -1; +static gint hf_rfr_RfrGetFQDNFromLegacyDN_szMailboxServerDN = -1; +static gint hf_rfr_opnum = -1; static gint hf_rfr_RfrGetNewDSA_ulFlags = -1; +static gint hf_rfr_RfrGetFQDNFromLegacyDN_cbMailboxServerDN = -1; static gint hf_rfr_RfrGetNewDSA_pUserDN = -1; -static gint hf_rfr_RfrGetNewDSA_ppszServer = -1; -static gint hf_rfr_opnum = -1; static gint hf_rfr_RfrGetNewDSA_ppszUnused = -1; +static gint hf_rfr_RfrGetNewDSA_ppszServer = -1; +static gint hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN = -1; static gint proto_dcerpc_rfr = -1; /* Version information */ @@ -315,9 +317,9 @@ rfr_dissect_element_RfrGetNewDSA_ppszServer__(tvbuff_t *tvb _U_, int offset _U_, /* IDL: MAPISTATUS RfrGetNewDSA( */ /* IDL: [in] uint32 ulFlags, */ -/* IDL: [in] [ref] [charset(DOS)] uint8 *pUserDN, */ -/* IDL: [charset(DOS)] [unique(1)] [out] [in] uint8 **ppszUnused, */ -/* IDL: [charset(DOS)] [unique(1)] [out] [in] uint8 **ppszServer */ +/* IDL: [ref] [in] [charset(DOS)] uint8 *pUserDN, */ +/* IDL: [out] [unique(1)] [in] [charset(DOS)] uint8 **ppszUnused, */ +/* IDL: [out] [unique(1)] [in] [charset(DOS)] uint8 **ppszServer */ /* IDL: ); */ static int @@ -419,8 +421,8 @@ rfr_dissect_element_RfrGetFQDNFromLegacyDN_ppszServerFQDN__(tvbuff_t *tvb _U_, i /* IDL: MAPISTATUS RfrGetFQDNFromLegacyDN( */ /* IDL: [in] uint32 ulFlags, */ /* IDL: [in] [range(10,1024)] uint32 cbMailboxServerDN, */ -/* IDL: [size_is(cbMailboxServerDN)] [charset(DOS)] [ref] [in] uint8 *szMailboxServerDN, */ -/* IDL: [out] [charset(DOS)] [ref] uint8 **ppszServerFQDN */ +/* IDL: [ref] [in] [charset(DOS)] [size_is(cbMailboxServerDN)] uint8 *szMailboxServerDN, */ +/* IDL: [out] [ref] [charset(DOS)] uint8 **ppszServerFQDN */ /* IDL: ); */ static int @@ -464,26 +466,26 @@ static dcerpc_sub_dissector rfr_dissectors[] = { void proto_register_dcerpc_rfr(void) { static hf_register_info hf[] = { - { &hf_rfr_RfrGetFQDNFromLegacyDN_szMailboxServerDN, - { "Szmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.szMailboxServerDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_rfr_MAPISTATUS_status, { "MAPISTATUS", "rfr.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(rfr_MAPISTATUS_vals), 0, NULL, HFILL }}, { &hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags, { "Ulflags", "rfr.RfrGetFQDNFromLegacyDN.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_rfr_RfrGetFQDNFromLegacyDN_cbMailboxServerDN, - { "Cbmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.cbMailboxServerDN", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN, - { "Ppszserverfqdn", "rfr.RfrGetFQDNFromLegacyDN.ppszServerFQDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_rfr_RfrGetFQDNFromLegacyDN_szMailboxServerDN, + { "Szmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.szMailboxServerDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_rfr_opnum, + { "Operation", "rfr.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rfr_RfrGetNewDSA_ulFlags, { "Ulflags", "rfr.RfrGetNewDSA.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_rfr_RfrGetFQDNFromLegacyDN_cbMailboxServerDN, + { "Cbmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.cbMailboxServerDN", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rfr_RfrGetNewDSA_pUserDN, { "Puserdn", "rfr.RfrGetNewDSA.pUserDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_rfr_RfrGetNewDSA_ppszServer, - { "Ppszserver", "rfr.RfrGetNewDSA.ppszServer", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_rfr_opnum, - { "Operation", "rfr.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rfr_RfrGetNewDSA_ppszUnused, { "Ppszunused", "rfr.RfrGetNewDSA.ppszUnused", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_rfr_RfrGetNewDSA_ppszServer, + { "Ppszserver", "rfr.RfrGetNewDSA.ppszServer", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN, + { "Ppszserverfqdn", "rfr.RfrGetFQDNFromLegacyDN.ppszServerFQDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 40102f79a5..aafddbe356 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-samr.h" +void proto_register_dcerpc_samr(void); +void proto_reg_handoff_dcerpc_samr(void); /* Ett declarations */ static gint ett_dcerpc_samr = -1; diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c index c1bbd2e454..41f2e37e82 100644 --- a/epan/dissectors/packet-dcerpc-winreg.c +++ b/epan/dissectors/packet-dcerpc-winreg.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-winreg.h" +void proto_register_dcerpc_winreg(void); +void proto_reg_handoff_dcerpc_winreg(void); /* Ett declarations */ static gint ett_dcerpc_winreg = -1; diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.c b/epan/dissectors/packet-dcerpc-wzcsvc.c index 93eb84de17..92bdc6b5a1 100644 --- a/epan/dissectors/packet-dcerpc-wzcsvc.c +++ b/epan/dissectors/packet-dcerpc-wzcsvc.c @@ -25,6 +25,8 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" #include "packet-dcerpc-wzcsvc.h" +void proto_register_dcerpc_wzcsvc(void); +void proto_reg_handoff_dcerpc_wzcsvc(void); /* Ett declarations */ static gint ett_dcerpc_wzcsvc = -1; diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 456d7ff506..010d4392a1 100644 --- a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -819,6 +819,8 @@ sub RegisterInterface($$) $self->pidl_code("{"); $self->indent; + $self->{res}->{headers} .= "void proto_register_dcerpc_$x->{NAME}(void);\n"; + $self->{res}->{code}.=$self->DumpHfList()."\n"; $self->{res}->{code}.="\n".DumpEttList($self->{ett})."\n"; @@ -871,6 +873,8 @@ sub RegisterInterfaceHandoff($$) $self->pidl_code("}"); $self->pidl_fn_end("proto_reg_handoff_dcerpc_$x->{NAME}"); + $self->{res}->{headers} .= "void proto_reg_handoff_dcerpc_$x->{NAME}(void);\n"; + $self->{hf_used}->{"hf_$x->{NAME}_opnum"} = 1; } } @@ -1072,12 +1076,12 @@ sub Parse($$$$$) my $h_basename = basename($h_filename); $self->{res}->{headers} .= "#include \"$h_basename\"\n"; + $self->pidl_code(""); if (defined($self->{conformance}->{ett})) { register_ett($self,$_) foreach(@{$self->{conformance}->{ett}}) } - # Wireshark protocol registration foreach (@$ndr) { |