From 87e55cb9e046e4d7749333c67862e5bf935ed6a1 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Mon, 21 Oct 2013 19:41:54 +0000 Subject: Sync with latest SAMBA PIDL source per http://www.wireshark.org/lists/wireshark-dev/201310/msg00217.html Didn't integrate 0010-frsrpc-Regenerate-frsrpc-due-to-changes-in-the-pidl-.patch 0016-Regenerate-the-dnserver.patch due to compilation errors on Windows. svn path=/trunk/; revision=52744 --- epan/dissectors/packet-dcerpc-dssetup.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'epan/dissectors/packet-dcerpc-dssetup.h') diff --git a/epan/dissectors/packet-dcerpc-dssetup.h b/epan/dissectors/packet-dcerpc-dssetup.h index 5a0e7c1754..f815890fde 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.h +++ b/epan/dissectors/packet-dcerpc-dssetup.h @@ -13,6 +13,8 @@ */ +#include "packet-dcerpc-misc.h" + #ifndef __PACKET_DCERPC_DSSETUP_H #define __PACKET_DCERPC_DSSETUP_H @@ -23,28 +25,28 @@ #define DS_ROLE_BACKUP_DC (4) #define DS_ROLE_PRIMARY_DC (5) extern const value_string dssetup_dssetup_DsRole_vals[]; -int dssetup_dissect_enum_DsRole(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param); -int dssetup_dissect_bitmap_DsRoleFlags(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param); -int dssetup_dissect_struct_DsRolePrimaryDomInfoBasic(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint8 *drep, int hf_index, guint32 param _U_); +int dssetup_dissect_enum_DsRole(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_); +int dssetup_dissect_bitmap_DsRoleFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); +int dssetup_dissect_struct_DsRolePrimaryDomInfoBasic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); #define DS_ROLE_NOT_UPGRADING (0) #define DS_ROLE_UPGRADING (1) extern const value_string dssetup_dssetup_DsUpgrade_vals[]; -int dssetup_dissect_enum_DsUpgrade(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param); +int dssetup_dissect_enum_DsUpgrade(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_); #define DS_ROLE_PREVIOUS_UNKNOWN (0) #define DS_ROLE_PREVIOUS_PRIMARY (1) #define DS_ROLE_PREVIOUS_BACKUP (2) extern const value_string dssetup_dssetup_DsPrevious_vals[]; -int dssetup_dissect_enum_DsPrevious(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param); -int dssetup_dissect_struct_DsRoleUpgradeStatus(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint8 *drep, int hf_index, guint32 param _U_); +int dssetup_dissect_enum_DsPrevious(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_); +int dssetup_dissect_struct_DsRoleUpgradeStatus(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); #define DS_ROLE_OP_IDLE (0) #define DS_ROLE_OP_ACTIVE (1) #define DS_ROLE_OP_NEEDS_REBOOT (2) extern const value_string dssetup_dssetup_DsRoleOp_vals[]; -int dssetup_dissect_enum_DsRoleOp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param); -int dssetup_dissect_struct_DsRoleOpStatus(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint8 *drep, int hf_index, guint32 param _U_); +int dssetup_dissect_enum_DsRoleOp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_); +int dssetup_dissect_struct_DsRoleOpStatus(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_); #define DS_ROLE_BASIC_INFORMATION (1) #define DS_ROLE_UPGRADE_STATUS (2) #define DS_ROLE_OP_STATUS (3) extern const value_string dssetup_dssetup_DsRoleInfoLevel_vals[]; -int dssetup_dissect_enum_DsRoleInfoLevel(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param); +int dssetup_dissect_enum_DsRoleInfoLevel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_); #endif /* __PACKET_DCERPC_DSSETUP_H */ -- cgit v1.2.3