diff options
author | Bill Meier <wmeier@newsguy.com> | 2010-05-10 15:54:57 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2010-05-10 15:54:57 +0000 |
commit | 10ffd14b8f9c052a9d44faaba462ff36f5542f7a (patch) | |
tree | a705161815ce4b6ab546dbeb6743658d6d50cfe0 /epan/dissectors/packet-dcom-remact.c | |
parent | 33dc9a3eb4a71ef14038f611b5d9f0bcad5d5e1a (diff) |
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces)
svn path=/trunk/; revision=32735
Diffstat (limited to 'epan/dissectors/packet-dcom-remact.c')
-rw-r--r-- | epan/dissectors/packet-dcom-remact.c | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c index 64bd69b56e..ca7d393162 100644 --- a/epan/dissectors/packet-dcom-remact.c +++ b/epan/dissectors/packet-dcom-remact.c @@ -57,7 +57,7 @@ static guint16 ver_remact = 0; static int dissect_remact_remote_activation_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, guint8 *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { guint32 u32ClientImpLevel; guint32 u32Mode; @@ -66,58 +66,58 @@ dissect_remact_remote_activation_rqst(tvbuff_t *tvb, int offset, guint32 u32ArraySize; guint32 u32ItemIdx; guint16 u16ProtSeqs; - e_uuid_t clsid; - e_uuid_t iid; + e_uuid_t clsid; + e_uuid_t iid; gchar szObjName[1000] = { 0 }; guint32 u32ObjNameLen = sizeof(szObjName); - offset = dissect_dcom_this(tvb, offset, pinfo, tree, drep); + offset = dissect_dcom_this(tvb, offset, pinfo, tree, drep); offset = dissect_dcom_append_UUID(tvb, offset, pinfo, tree, drep, - hf_dcom_clsid, -1, &clsid); - - offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, - &u32Pointer); + hf_dcom_clsid, -1, &clsid); + + offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, + &u32Pointer); if (u32Pointer) { - offset = dissect_dcom_BSTR(tvb, offset, pinfo, tree, drep, - hf_remact_object_name, szObjName, u32ObjNameLen); + offset = dissect_dcom_BSTR(tvb, offset, pinfo, tree, drep, + hf_remact_object_name, szObjName, u32ObjNameLen); } - offset = dissect_dcom_PMInterfacePointer(tvb, offset, pinfo, tree, drep, - hf_remact_object_storage, NULL /* XXX */); + offset = dissect_dcom_PMInterfacePointer(tvb, offset, pinfo, tree, drep, + hf_remact_object_storage, NULL /* XXX */); - offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, - hf_remact_client_impl_level, &u32ClientImpLevel); - offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, - hf_remact_mode, &u32Mode); + offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, + hf_remact_client_impl_level, &u32ClientImpLevel); + offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, + hf_remact_mode, &u32Mode); /* Interfaces */ - offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, - hf_remact_interfaces, &u32Interfaces); - offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, - &u32Pointer); + offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, + hf_remact_interfaces, &u32Interfaces); + offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, + &u32Pointer); if (u32Pointer) { - offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, + offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, &u32ArraySize); u32ItemIdx = 1; while (u32Interfaces--) { offset = dissect_dcom_append_UUID(tvb, offset, pinfo, tree, drep, - hf_dcom_iid, u32ItemIdx, &iid); + hf_dcom_iid, u32ItemIdx, &iid); u32ItemIdx++; } } - offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, - hf_remact_requested_protseqs, &u16ProtSeqs); + offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, + hf_remact_requested_protseqs, &u16ProtSeqs); - offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, + offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, &u32ArraySize); u32ItemIdx = 1; while (u32ArraySize--) { - offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, - hf_remact_protseqs, &u16ProtSeqs); + offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, + hf_remact_protseqs, &u16ProtSeqs); u32ItemIdx++; } @@ -127,7 +127,7 @@ dissect_remact_remote_activation_rqst(tvbuff_t *tvb, int offset, static int dissect_remact_remote_activation_resp(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, guint8 *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { guint32 u32Pointer; e_uuid_t ipid; @@ -140,64 +140,64 @@ dissect_remact_remote_activation_resp(tvbuff_t *tvb, int offset, guint32 u32VariableOffset; - offset = dissect_dcom_that(tvb, offset, pinfo, tree, drep); + offset = dissect_dcom_that(tvb, offset, pinfo, tree, drep); - offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep, - hf_dcom_oxid, NULL); - offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, - &u32Pointer); + offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep, + hf_dcom_oxid, NULL); + offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, + &u32Pointer); if (u32Pointer) { - offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, + offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, &u32ArraySize); - offset = dissect_dcom_DUALSTRINGARRAY(tvb, offset, pinfo, tree, drep, - hf_remact_oxid_bindings, NULL); + offset = dissect_dcom_DUALSTRINGARRAY(tvb, offset, pinfo, tree, drep, + hf_remact_oxid_bindings, NULL); } - offset = dissect_dcom_UUID(tvb, offset, pinfo, tree, drep, - hf_dcom_ipid, &ipid); - offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, - hf_remact_authn_hint, &u32AuthnHint); + offset = dissect_dcom_UUID(tvb, offset, pinfo, tree, drep, + hf_dcom_ipid, &ipid); + offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, + hf_remact_authn_hint, &u32AuthnHint); offset = dissect_dcom_COMVERSION(tvb, offset, pinfo, tree, drep, - &u16VersionMajor, &u16VersionMinor); + &u16VersionMajor, &u16VersionMinor); offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, - &u32HResult); + &u32HResult); - offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, + offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, &u32ArraySize); u32VariableOffset = offset + u32ArraySize * 4; while (u32ArraySize--) { - offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, - &u32Pointer); + offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, + &u32Pointer); if (u32Pointer) { u32VariableOffset = dissect_dcom_MInterfacePointer(tvb, u32VariableOffset, pinfo, tree, drep, - hf_remact_interface_data, NULL /* XXX */); + hf_remact_interface_data, NULL /* XXX */); } } offset = u32VariableOffset; - offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, + offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, &u32ArraySize); u32Idx = 1; while (u32ArraySize--) { offset = dissect_dcom_indexed_HRESULT(tvb, offset, pinfo, tree, drep, - &u32HResult, u32Idx); + &u32HResult, u32Idx); /* update column info now */ if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " %s[%u]", - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)"), - u32Idx); + col_append_fstr(pinfo->cinfo, COL_INFO, " %s[%u]", + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)"), + u32Idx); } u32Idx++; } offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, - &u32HResult); + &u32HResult); /* update column info now */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)")); + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)")); } return offset; @@ -205,8 +205,8 @@ dissect_remact_remote_activation_resp(tvbuff_t *tvb, int offset, static dcerpc_sub_dissector remact_dissectors[] = { - { 0, "RemoteActivation", dissect_remact_remote_activation_rqst, dissect_remact_remote_activation_resp }, - { 0, NULL, NULL, NULL }, + { 0, "RemoteActivation", dissect_remact_remote_activation_rqst, dissect_remact_remote_activation_resp }, + { 0, NULL, NULL, NULL }, }; @@ -214,36 +214,36 @@ void proto_register_remact (void) { static hf_register_info hf_remact[] = { - { &hf_remact_opnum, - { "Operation", "remact_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_remact_opnum, + { "Operation", "remact_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_remact_requested_protseqs, - { "RequestedProtSeqs", "remact_req_prot_seqs", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { "RequestedProtSeqs", "remact_req_prot_seqs", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_remact_protseqs, - { "ProtSeqs", "remact_prot_seqs", FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, NULL, HFILL }}, + { "ProtSeqs", "remact_prot_seqs", FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, NULL, HFILL }}, { &hf_remact_interfaces, - { "Interfaces", "remact_interfaces", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { "Interfaces", "remact_interfaces", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_remact_mode, - { "Mode", "remact_mode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { "Mode", "remact_mode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_remact_client_impl_level, - { "ClientImplLevel", "remact_client_impl_level", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { "ClientImplLevel", "remact_client_impl_level", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_remact_object_name, - { "ObjectName", "remact_object_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "ObjectName", "remact_object_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_remact_object_storage, - { "ObjectStorage", "remact_object_storage", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "ObjectStorage", "remact_object_storage", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_remact_interface_data, - { "InterfaceData", "remact_interface_data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "InterfaceData", "remact_interface_data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_remact_oxid_bindings, - { "OxidBindings", "hf_remact_oxid_bindings", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "OxidBindings", "hf_remact_oxid_bindings", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_remact_authn_hint, - { "AuthnHint", "remact_authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { "AuthnHint", "remact_authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, }; static gint *ett[] = { &ett_remact }; - + proto_remact = proto_register_protocol ("DCOM IRemoteActivation", "REMACT", "remact"); proto_register_field_array (proto_remact, hf_remact, array_length (hf_remact)); proto_register_subtree_array (ett, array_length (ett)); |