Revert "WHY??? git add -f bin/default/librpc/gen_ndr/packet-dcerpc-*"

[metze/samba/wip.git] / bin / default / librpc / gen_ndr / packet-dcerpc-dcerpc.c

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c
index 6586ee2a838c80734bdcd5af0484326ceb2e3b10..b05ef0278b4e0d747e8ffce83aa63e27e5b69372 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c
@@ -82,165 +82,165 @@ static gint ett_dcerpc_ncadg_packet = -1;
 
 
 /* Header field declarations */
-static gint hf_dcerpc_dcerpc_rts_cmds_val0xE_PingTrafficSentNotify = -1;
 static gint hf_dcerpc_dcerpc_auth_auth_reserved = -1;
+static gint hf_dcerpc_dcerpc_payload_cancel_ack = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_secondary_address_size = -1;
 static gint hf_dcerpc_dcerpc_request_stub_and_verifier = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_PING = -1;
 static gint hf_dcerpc_ncadg_packet_u = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x2_ConnectionTimeout = -1;
 static gint hf_dcerpc_dcerpc_fack_serial_no = -1;
 static gint hf_dcerpc_dcerpc_cl_cancel_version = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x1_FlowControlAck = -1;
 static gint hf_dcerpc_dcerpc_orphaned_auth_info = -1;
 static gint hf_dcerpc_dcerpc_ack_ctx_result = -1;
+static gint hf_dcerpc_dcerpc_payload_response = -1;
 static gint hf_dcerpc_dcerpc_co_cancel_auth_info = -1;
 static gint hf_dcerpc_dcerpc_auth_auth_context_id = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Command = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x8_Padding = -1;
+static gint hf_dcerpc_dcerpc_payload_fack = -1;
 static gint hf_dcerpc_ncadg_packet_fragnum = -1;
 static gint hf_dcerpc_ncadg_packet_pfc_flags = -1;
 static gint hf_dcerpc_ncacn_packet_u = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x4_ChannelLifetime = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REQUEST_request = -1;
 static gint hf_dcerpc_dcerpc_bind_nak_versions_num_versions = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0xB_ClientAddress = -1;
 static gint hf_dcerpc_ncacn_packet_auth_length = -1;
 static gint hf_dcerpc_ncadg_packet_ihint = -1;
 static gint hf_dcerpc_ncadg_packet_iface = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Padding_ConformanceCount = -1;
 static gint hf_dcerpc_dcerpc_request_object = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_AUTH3_auth3 = -1;
 static gint hf_dcerpc_ncacn_packet_call_id = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_ACK_bind_ack = -1;
+static gint hf_dcerpc_dcerpc_payload_nocall = -1;
 static gint hf_dcerpc_dcerpc_request_alloc_hint = -1;
 static gint hf_dcerpc_dcerpc_bind_ctx_list = -1;
 static gint hf_dcerpc_dcerpc_ack_ctx_reason = -1;
 static gint hf_dcerpc_dcerpc_bind_max_xmit_frag = -1;
 static gint hf_dcerpc_dcerpc_bind_num_contexts = -1;
 static gint hf_dcerpc_dcerpc_cl_cancel_id = -1;
+static gint hf_dcerpc_dcerpc_payload_auth3 = -1;
 static gint hf_dcerpc_dcerpc_ack_ctx_syntax = -1;
-static gint hf_dcerpc_ClientAddressType_valRTS_IPV4_ClientAddressIPV4 = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_max_xmit_frag = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x6_Version = -1;
 static gint hf_dcerpc_dcerpc_fack_max_frag_size = -1;
 static gint hf_dcerpc_dcerpc_orphaned__pad = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_max_recv_frag = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x0_ReceiveWindowSize = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack = -1;
-static gint hf_dcerpc_ClientAddressType_valRTS_IPV6_ClientAddressIPV6 = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_SHUTDOWN_shutdown = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_PingTrafficSentNotify = -1;
+static gint hf_dcerpc_dcerpc_payload_co_cancel = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_Padding = -1;
 static gint hf_dcerpc_ncadg_packet_ncadg_flags = -1;
 static gint hf_dcerpc_dcerpc_ctx_list_context_id = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x5_ClientKeepalive = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_FlowControlAck_Ack = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x7_Empty = -1;
 static gint hf_dcerpc_dcerpc_bind_max_recv_frag = -1;
 static gint hf_dcerpc_dcerpc_fack_selack_size = -1;
+static gint hf_dcerpc_dcerpc_payload_request = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_secondary_address = -1;
 static gint hf_dcerpc_dcerpc_response__pad = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_PingTrafficSentNotify_PingTrafficSent = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FAULT_fault = -1;
+static gint hf_dcerpc_dcerpc_payload_orphaned = -1;
 static gint hf_dcerpc_dcerpc_rts_NumberOfCommands = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_ClientKeepalive_ClientKeepalive = -1;
 static gint hf_dcerpc_ncadg_packet_server_boot = -1;
 static gint hf_dcerpc_ncacn_packet_rpc_vers_minor = -1;
 static gint hf_dcerpc_dcerpc_rts_Commands = -1;
+static gint hf_dcerpc_dcerpc_payload_bind_nak = -1;
+static gint hf_dcerpc_dcerpc_payload_bind_ack = -1;
 static gint hf_dcerpc_dcerpc_fault__pad = -1;
 static gint hf_dcerpc_dcerpc_cancel_ack_id = -1;
+static gint hf_dcerpc_dcerpc_payload_alter_resp = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ConnectionTimeout = -1;
+static gint hf_dcerpc_dcerpc_object_object = -1;
+static gint hf_dcerpc_dcerpc_payload_reject = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Destination_ForwardDestination = -1;
 static gint hf_dcerpc_dcerpc_fack_selack = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_PING_ping = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RESPONSE_response = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_EOF = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0xD_Destination = -1;
 static gint hf_dcerpc_ClientAddress_Padding = -1;
 static gint hf_dcerpc_dcerpc_bind_assoc_group_id = -1;
 static gint hf_dcerpc_dcerpc_fault_cancel_count = -1;
 static gint hf_dcerpc_dcerpc_response_alloc_hint = -1;
 static gint hf_dcerpc_dcerpc_fack_window_size = -1;
+static gint hf_dcerpc_dcerpc_payload_ping = -1;
 static gint hf_dcerpc_dcerpc_auth_auth_pad_length = -1;
 static gint hf_dcerpc_ncadg_packet_serial_low = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_NOCALL_nocall = -1;
 static gint hf_dcerpc_ncadg_packet_opnum = -1;
 static gint hf_dcerpc_dcerpc_response_stub_and_verifier = -1;
 static gint hf_dcerpc_FlowControlAcknowledgment_BytesReceived = -1;
 static gint hf_dcerpc_dcerpc_auth_auth_type = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ACK_ack = -1;
+static gint hf_dcerpc_dcerpc_object_empty = -1;
 static gint hf_dcerpc_dcerpc_request_opnum = -1;
 static gint hf_dcerpc_ncadg_packet_seq_num = -1;
 static gint hf_dcerpc_dcerpc_cancel_ack_version = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x9_NegativeANCE = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_IN_CHANNEL = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ClientKeepalive = -1;
+static gint hf_dcerpc_dcerpc_payload_cl_cancel = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_num_results = -1;
 static gint hf_dcerpc_FlowControlAcknowledgment_ChannelCookie = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_AssociationGroupId_AssociationGroupId = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RTS_rts = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ClientAddress = -1;
 static gint hf_dcerpc_dcerpc_co_cancel__pad = -1;
 static gint hf_dcerpc_dcerpc_request__pad = -1;
 static gint hf_dcerpc_dcerpc_auth_credentials = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_OTHER_CMD = -1;
 static gint hf_dcerpc_dcerpc_bind_nak_versions_versions = -1;
 static gint hf_dcerpc_ncadg_packet_activity = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_ChannelLifetime_ChannelLifetime = -1;
 static gint hf_dcerpc_ncadg_packet_auth_proto = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_assoc_group_id = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_RESP_alter_resp = -1;
 static gint hf_dcerpc_dcerpc_fault_context_id = -1;
+static gint hf_dcerpc_dcerpc_payload_rts = -1;
 static gint hf_dcerpc_ncacn_packet_drep = -1;
+static gint hf_dcerpc_dcerpc_payload_ack = -1;
 static gint hf_dcerpc_dcerpc_bind_nak_reject_reason = -1;
 static gint hf_dcerpc_dcerpc_cancel_ack_server_is_accepting = -1;
+static gint hf_dcerpc_dcerpc_payload_bind = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_ClientAddress_ClientAddress = -1;
 static gint hf_dcerpc_dcerpc_auth3_auth_info = -1;
-static gint hf_dcerpc_dcerpc_object_valLIBNDR_FLAG_OBJECT_PRESENT_object = -1;
 static gint hf_dcerpc_FlowControlAcknowledgment_AvailableWindow = -1;
 static gint hf_dcerpc_ncacn_packet_frag_length = -1;
+static gint hf_dcerpc_dcerpc_payload_alter = -1;
 static gint hf_dcerpc_dcerpc_bind_ack__pad1 = -1;
 static gint hf_dcerpc_dcerpc_ctx_list_num_transfer_syntaxes = -1;
 static gint hf_dcerpc_dcerpc_bind_auth_info = -1;
 static gint hf_dcerpc_dcerpc_auth_auth_level = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_WORKING_working = -1;
 static gint hf_dcerpc_ncadg_packet_ptype = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CO_CANCEL_co_cancel = -1;
 static gint hf_dcerpc_ncacn_packet_ptype = -1;
 static gint hf_dcerpc_dcerpc_fault_status = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0xA_ANCE = -1;
+static gint hf_dcerpc_dcerpc_payload_fault = -1;
 static gint hf_dcerpc_ncadg_packet_serial_high = -1;
 static gint hf_dcerpc_dcerpc_auth3__pad = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Padding_Padding = -1;
 static gint hf_dcerpc_ClientAddress_ClientAddress = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Cookie_Cookie = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FACK_fack = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REJECT_reject = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ChannelLifetime = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_ConnectionTimeout_ConnectionTimeout = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ReceiveWindowSize = -1;
 static gint hf_dcerpc_ncadg_packet_iface_version = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_ECHO = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x3_Cookie = -1;
-static gint hf_dcerpc_dcerpc_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v = -1;
+static gint hf_dcerpc_dcerpc_bind_nak_versions_ctr_v = -1;
+static gint hf_dcerpc_ClientAddressType_ClientAddressIPV6 = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_NegativeANCE = -1;
 static gint hf_dcerpc_dcerpc_fack_max_tdsu = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_NAK_bind_nak = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_AssociationGroupId = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_CommandType = -1;
 static gint hf_dcerpc_ncacn_packet_rpc_vers = -1;
 static gint hf_dcerpc_dcerpc_bind_nak_versions = -1;
 static gint hf_dcerpc_dcerpc_request_context_id = -1;
 static gint hf_dcerpc_ncadg_packet_ahint = -1;
+static gint hf_dcerpc_dcerpc_payload_shutdown = -1;
+static gint hf_dcerpc_ClientAddressType_ClientAddressIPV4 = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_OUT_CHANNEL = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_ctx_list = -1;
 static gint hf_dcerpc_dcerpc_fack_version = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Version_Version = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0xC_AssociationGroupId = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_ReceiveWindowSize_ReceiveWindowSize = -1;
 static gint hf_dcerpc_ncadg_packet_rpc_vers = -1;
+static gint hf_dcerpc_dcerpc_payload_working = -1;
 static gint hf_dcerpc_RTSCookie_Cookie = -1;
 static gint hf_dcerpc_dcerpc_rts_Flags = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_alter = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_Version = -1;
 static gint hf_dcerpc_ClientAddress_AddressType = -1;
 static gint hf_dcerpc_dcerpc_response_context_id = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_bind = -1;
 static gint hf_dcerpc_ncadg_packet_drep = -1;
 static gint hf_dcerpc_ncadg_packet_len = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_Empty = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_Destination = -1;
 static gint hf_dcerpc_opnum = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ANCE = -1;
 static gint hf_dcerpc_dcerpc_fault_alloc_hint = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_NONE = -1;
 static gint hf_dcerpc_ncadg_packet_object = -1;
@@ -249,8 +249,8 @@ static gint hf_dcerpc_dcerpc_fack__pad1 = -1;
 static gint hf_dcerpc_dcerpc_ctx_list_abstract_syntax = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_RECYCLE_CHANNEL = -1;
 static gint hf_dcerpc_ncacn_packet_pfc_flags = -1;
-static gint hf_dcerpc_dcerpc_object_valdefault_empty = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ORPHANED_orphaned = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_FlowControlAck = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_Cookie = -1;
 static gint hf_dcerpc_dcerpc_ctx_list_transfer_syntaxes = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_auth_info = -1;
 
@@ -276,8 +276,8 @@ static int dcerpc_dissect_element_bind_num_contexts(tvbuff_t *tvb _U_, int offse
 static int dcerpc_dissect_element_bind_ctx_list(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_ctx_list_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_auth_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_object_valdefault_empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_object_valLIBNDR_FLAG_OBJECT_PRESENT_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_object_empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_object_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_request_alloc_hint(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_request_context_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_request_opnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -301,7 +301,7 @@ static int dcerpc_dissect_element_bind_ack_auth_info(tvbuff_t *tvb _U_, int offs
 static int dcerpc_dissect_element_bind_nak_versions_num_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_nak_versions_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_nak_versions_versions_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_bind_nak_versions_ctr_v(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_nak_reject_reason(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *reject_reason);
 static int dcerpc_dissect_element_bind_nak_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *reject_reason);
 static int dcerpc_dissect_element_response_alloc_hint(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -419,8 +419,8 @@ const value_string dcerpc_AddressType_vals[] = {
        { RTS_IPV6, "RTS_IPV6" },
 { 0, NULL }
 };
-static int dcerpc_dissect_element_ClientAddressType_valRTS_IPV4_ClientAddressIPV4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_ClientAddressType_valRTS_IPV6_ClientAddressIPV6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_ClientAddressType_ClientAddressIPV4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_ClientAddressType_ClientAddressIPV6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ClientAddress_AddressType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *AddressType);
 static int dcerpc_dissect_element_ClientAddress_ClientAddress(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *AddressType);
 static int dcerpc_dissect_element_ClientAddress_Padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -449,21 +449,21 @@ static int dcerpc_dissect_element_rts_cmd_ClientAddress_ClientAddress(tvbuff_t *
 static int dcerpc_dissect_element_rts_cmd_AssociationGroupId_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_rts_cmd_Destination_ForwardDestination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_rts_cmd_PingTrafficSentNotify_PingTrafficSent(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x0_ReceiveWindowSize(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x1_FlowControlAck(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x2_ConnectionTimeout(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x3_Cookie(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x4_ChannelLifetime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x5_ClientKeepalive(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x6_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x7_Empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x8_Padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x9_NegativeANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0xA_ANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0xB_ClientAddress(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0xC_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0xD_Destination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0xE_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ReceiveWindowSize(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_FlowControlAck(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ConnectionTimeout(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_Cookie(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ChannelLifetime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ClientKeepalive(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_Empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_Padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_NegativeANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ClientAddress(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_Destination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_rts_cmd_CommandType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *CommandType);
 static int dcerpc_dissect_element_rts_cmd_Command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *CommandType);
 static const true_false_string dcerpc_rts_flags_RTS_FLAG_NONE_tfs = {
@@ -526,27 +526,27 @@ const value_string dcerpc_dcerpc_pkt_type_vals[] = {
        { DCERPC_PKT_RTS, "DCERPC_PKT_RTS" },
 { 0, NULL }
 };
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_REQUEST_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_PING_ping(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_RESPONSE_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_FAULT_fault(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_WORKING_working(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_NOCALL_nocall(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_REJECT_reject(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_ACK_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_FACK_fack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_bind(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_ACK_bind_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_NAK_bind_nak(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_alter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_RESP_alter_resp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_SHUTDOWN_shutdown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_CO_CANCEL_co_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_ORPHANED_orphaned(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_AUTH3_auth3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_RTS_rts(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_ping(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_fault(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_working(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_nocall(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_reject(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_cl_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_fack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_cancel_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_bind(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_bind_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_bind_nak(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_alter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_alter_resp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_shutdown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_co_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_orphaned(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_auth3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_rts(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncacn_packet_rpc_vers(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncacn_packet_rpc_vers_minor(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncacn_packet_ptype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *ptype);
@@ -800,17 +800,17 @@ dcerpc_dissect_struct_empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_object_valdefault_empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_object_empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_empty(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_object_valdefault_empty,0);
+       offset = dcerpc_dissect_struct_empty(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_object_empty,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_object_valLIBNDR_FLAG_OBJECT_PRESENT_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_object_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_dcerpc_dcerpc_object_valLIBNDR_FLAG_OBJECT_PRESENT_object, NULL);
+       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_dcerpc_dcerpc_object_object, NULL);
 
        return offset;
 }
@@ -831,11 +831,11 @@ dcerpc_dissect_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_,
 
        switch(level) {
                default:
-                       offset = dcerpc_dissect_element_object_valdefault_empty(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_object_empty(tvb, offset, pinfo, tree, drep);
                break;
 
                case LIBNDR_FLAG_OBJECT_PRESENT:
-                       offset = dcerpc_dissect_element_object_valLIBNDR_FLAG_OBJECT_PRESENT_object(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_object_object(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -1219,9 +1219,9 @@ dcerpc_dissect_struct_bind_nak_versions(tvbuff_t *tvb _U_, int offset _U_, packe
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_bind_nak_versions_ctr_v(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind_nak_versions(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v,0);
+       offset = dcerpc_dissect_struct_bind_nak_versions(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_bind_nak_versions_ctr_v,0);
 
        return offset;
 }
@@ -1242,7 +1242,7 @@ dcerpc_dissect_bind_nak_versions_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
        switch(level) {
                case DECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED:
-                       offset = dcerpc_dissect_element_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_bind_nak_versions_ctr_v(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -2280,17 +2280,17 @@ dcerpc_dissect_enum_AddressType(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_ClientAddressType_valRTS_IPV4_ClientAddressIPV4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_ClientAddressType_ClientAddressIPV4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_ipv4address(tvb,offset,pinfo,tree,drep,hf_dcerpc_ClientAddressType_valRTS_IPV4_ClientAddressIPV4,0);
+       offset = dcerpc_dissect_struct_ipv4address(tvb,offset,pinfo,tree,drep,hf_dcerpc_ClientAddressType_ClientAddressIPV4,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_ClientAddressType_valRTS_IPV6_ClientAddressIPV6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_ClientAddressType_ClientAddressIPV6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_ipv6address(tvb,offset,pinfo,tree,drep,hf_dcerpc_ClientAddressType_valRTS_IPV6_ClientAddressIPV6,0);
+       offset = dcerpc_dissect_struct_ipv6address(tvb,offset,pinfo,tree,drep,hf_dcerpc_ClientAddressType_ClientAddressIPV6,0);
 
        return offset;
 }
@@ -2311,11 +2311,11 @@ dcerpc_dissect_ClientAddressType(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case RTS_IPV4:
-                       offset = dcerpc_dissect_element_ClientAddressType_valRTS_IPV4_ClientAddressIPV4(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_ClientAddressType_ClientAddressIPV4(tvb, offset, pinfo, tree, drep);
                break;
 
                case RTS_IPV6:
-                       offset = dcerpc_dissect_element_ClientAddressType_valRTS_IPV6_ClientAddressIPV6(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_ClientAddressType_ClientAddressIPV6(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -3120,121 +3120,121 @@ dcerpc_dissect_struct_rts_cmd_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offse
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x0_ReceiveWindowSize(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ReceiveWindowSize(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ReceiveWindowSize(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x0_ReceiveWindowSize,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ReceiveWindowSize(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ReceiveWindowSize,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x1_FlowControlAck(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_FlowControlAck(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_FlowControlAck(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x1_FlowControlAck,0);
+       offset = dcerpc_dissect_struct_rts_cmd_FlowControlAck(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_FlowControlAck,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x2_ConnectionTimeout(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ConnectionTimeout(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ConnectionTimeout(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x2_ConnectionTimeout,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ConnectionTimeout(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ConnectionTimeout,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x3_Cookie(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_Cookie(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_Cookie(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x3_Cookie,0);
+       offset = dcerpc_dissect_struct_rts_cmd_Cookie(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_Cookie,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x4_ChannelLifetime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ChannelLifetime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ChannelLifetime(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x4_ChannelLifetime,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ChannelLifetime(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ChannelLifetime,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x5_ClientKeepalive(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ClientKeepalive(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ClientKeepalive(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x5_ClientKeepalive,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ClientKeepalive(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ClientKeepalive,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x6_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_Version(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x6_Version,0);
+       offset = dcerpc_dissect_struct_rts_cmd_Version(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_Version,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x7_Empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_Empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_Empty(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x7_Empty,0);
+       offset = dcerpc_dissect_struct_rts_cmd_Empty(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_Empty,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x8_Padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_Padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_Padding(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x8_Padding,0);
+       offset = dcerpc_dissect_struct_rts_cmd_Padding(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_Padding,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x9_NegativeANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_NegativeANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_NegativeANCE(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x9_NegativeANCE,0);
+       offset = dcerpc_dissect_struct_rts_cmd_NegativeANCE(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_NegativeANCE,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0xA_ANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ANCE(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0xA_ANCE,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ANCE(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ANCE,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0xB_ClientAddress(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ClientAddress(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ClientAddress(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0xB_ClientAddress,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ClientAddress(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ClientAddress,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0xC_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_AssociationGroupId(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0xC_AssociationGroupId,0);
+       offset = dcerpc_dissect_struct_rts_cmd_AssociationGroupId(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_AssociationGroupId,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0xD_Destination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_Destination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_Destination(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0xD_Destination,0);
+       offset = dcerpc_dissect_struct_rts_cmd_Destination(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_Destination,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0xE_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_PingTrafficSentNotify(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0xE_PingTrafficSentNotify,0);
+       offset = dcerpc_dissect_struct_rts_cmd_PingTrafficSentNotify(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_PingTrafficSentNotify,0);
 
        return offset;
 }
@@ -3255,63 +3255,63 @@ dcerpc_dissect_rts_cmds(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 
        switch(level) {
                case 0x0:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x0_ReceiveWindowSize(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ReceiveWindowSize(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x1:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x1_FlowControlAck(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_FlowControlAck(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x2:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x2_ConnectionTimeout(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ConnectionTimeout(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x3:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x3_Cookie(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_Cookie(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x4:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x4_ChannelLifetime(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ChannelLifetime(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x5:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x5_ClientKeepalive(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ClientKeepalive(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x6:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x6_Version(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_Version(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x7:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x7_Empty(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_Empty(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x8:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x8_Padding(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_Padding(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x9:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x9_NegativeANCE(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_NegativeANCE(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xA:
-                       offset = dcerpc_dissect_element_rts_cmds_val0xA_ANCE(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ANCE(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xB:
-                       offset = dcerpc_dissect_element_rts_cmds_val0xB_ClientAddress(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ClientAddress(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xC:
-                       offset = dcerpc_dissect_element_rts_cmds_val0xC_AssociationGroupId(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_AssociationGroupId(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xD:
-                       offset = dcerpc_dissect_element_rts_cmds_val0xD_Destination(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_Destination(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xE:
-                       offset = dcerpc_dissect_element_rts_cmds_val0xE_PingTrafficSentNotify(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_PingTrafficSentNotify(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -3615,169 +3615,169 @@ dcerpc_dissect_enum_pkt_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_REQUEST_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_request(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REQUEST_request,0);
+       offset = dcerpc_dissect_struct_request(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_request,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_PING_ping(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_ping(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_ping(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_PING_ping,0);
+       offset = dcerpc_dissect_struct_ping(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_ping,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_RESPONSE_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_response(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RESPONSE_response,0);
+       offset = dcerpc_dissect_struct_response(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_response,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_FAULT_fault(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_fault(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_fault(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FAULT_fault,0);
+       offset = dcerpc_dissect_struct_fault(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_fault,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_WORKING_working(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_working(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_working(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_WORKING_working,0);
+       offset = dcerpc_dissect_struct_working(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_working,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_NOCALL_nocall(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_nocall(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_fack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_NOCALL_nocall,0);
+       offset = dcerpc_dissect_struct_fack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_nocall,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_REJECT_reject(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_reject(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_fault(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REJECT_reject,0);
+       offset = dcerpc_dissect_struct_fault(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_reject,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_ACK_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ACK_ack,0);
+       offset = dcerpc_dissect_struct_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_ack,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_cl_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_cl_cancel(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel,0);
+       offset = dcerpc_dissect_struct_cl_cancel(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_cl_cancel,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_FACK_fack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_fack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_fack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FACK_fack,0);
+       offset = dcerpc_dissect_struct_fack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_fack,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_cancel_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_cancel_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack,0);
+       offset = dcerpc_dissect_struct_cancel_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_cancel_ack,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_bind(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_bind(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_bind,0);
+       offset = dcerpc_dissect_struct_bind(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_bind,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_ACK_bind_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_bind_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_ACK_bind_ack,0);
+       offset = dcerpc_dissect_struct_bind_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_bind_ack,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_NAK_bind_nak(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_bind_nak(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind_nak(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_NAK_bind_nak,0);
+       offset = dcerpc_dissect_struct_bind_nak(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_bind_nak,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_alter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_alter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_alter,0);
+       offset = dcerpc_dissect_struct_bind(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_alter,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_RESP_alter_resp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_alter_resp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_RESP_alter_resp,0);
+       offset = dcerpc_dissect_struct_bind_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_alter_resp,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_SHUTDOWN_shutdown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_shutdown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_shutdown(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_SHUTDOWN_shutdown,0);
+       offset = dcerpc_dissect_struct_shutdown(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_shutdown,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_CO_CANCEL_co_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_co_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_co_cancel(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CO_CANCEL_co_cancel,0);
+       offset = dcerpc_dissect_struct_co_cancel(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_co_cancel,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_ORPHANED_orphaned(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_orphaned(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_orphaned(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ORPHANED_orphaned,0);
+       offset = dcerpc_dissect_struct_orphaned(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_orphaned,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_AUTH3_auth3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_auth3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_auth3(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_AUTH3_auth3,0);
+       offset = dcerpc_dissect_struct_auth3(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_auth3,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_RTS_rts(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_rts(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RTS_rts,0);
+       offset = dcerpc_dissect_struct_rts(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_rts,0);
 
        return offset;
 }
@@ -3798,87 +3798,87 @@ dcerpc_dissect_payload(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_
 
        switch(level) {
                case DCERPC_PKT_REQUEST:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_REQUEST_request(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_request(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_PING:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_PING_ping(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_ping(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_RESPONSE:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_RESPONSE_response(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_response(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_FAULT:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_FAULT_fault(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_fault(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_WORKING:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_WORKING_working(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_working(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_NOCALL:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_NOCALL_nocall(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_nocall(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_REJECT:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_REJECT_reject(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_reject(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_ACK:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_ACK_ack(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_ack(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_CL_CANCEL:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_cl_cancel(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_FACK:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_FACK_fack(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_fack(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_CANCEL_ACK:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_cancel_ack(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_BIND:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_bind(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_bind(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_BIND_ACK:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_ACK_bind_ack(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_bind_ack(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_BIND_NAK:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_NAK_bind_nak(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_bind_nak(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_ALTER:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_alter(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_alter(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_ALTER_RESP:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_RESP_alter_resp(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_alter_resp(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_SHUTDOWN:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_SHUTDOWN_shutdown(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_shutdown(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_CO_CANCEL:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_CO_CANCEL_co_cancel(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_co_cancel(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_ORPHANED:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_ORPHANED_orphaned(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_orphaned(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_AUTH3:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_AUTH3_auth3(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_auth3(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_RTS:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_RTS_rts(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_rts(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -4303,10 +4303,10 @@ static dcerpc_sub_dissector dcerpc_dissectors[] = {
 void proto_register_dcerpc_dcerpc(void)
 {
        static hf_register_info hf[] = {
-       { &hf_dcerpc_dcerpc_rts_cmds_val0xE_PingTrafficSentNotify,
-         { "Pingtrafficsentnotify", "dcerpc.dcerpc_rts_cmds_val0xE.PingTrafficSentNotify", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth_auth_reserved,
          { "Auth Reserved", "dcerpc.dcerpc_auth.auth_reserved", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_cancel_ack,
+         { "Cancel Ack", "dcerpc.dcerpc_payload.cancel_ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_secondary_address_size,
          { "Secondary Address Size", "dcerpc.dcerpc_bind_ack.secondary_address_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_request_stub_and_verifier,
@@ -4315,40 +4315,32 @@ void proto_register_dcerpc_dcerpc(void)
          { "Rts Flag Ping", "dcerpc.dcerpc_rts_flags.RTS_FLAG_PING", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_PING_tfs), ( 0x0001 ), NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_u,
          { "U", "dcerpc.ncadg_packet.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x2_ConnectionTimeout,
-         { "Connectiontimeout", "dcerpc.dcerpc_rts_cmds_val0x2.ConnectionTimeout", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_serial_no,
          { "Serial No", "dcerpc.dcerpc_fack.serial_no", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_cl_cancel_version,
          { "Version", "dcerpc.dcerpc_cl_cancel.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x1_FlowControlAck,
-         { "Flowcontrolack", "dcerpc.dcerpc_rts_cmds_val0x1.FlowControlAck", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_orphaned_auth_info,
          { "Auth Info", "dcerpc.dcerpc_orphaned.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_ack_ctx_result,
          { "Result", "dcerpc.dcerpc_ack_ctx.result", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_response,
+         { "Response", "dcerpc.dcerpc_payload.response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_co_cancel_auth_info,
          { "Auth Info", "dcerpc.dcerpc_co_cancel.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth_auth_context_id,
          { "Auth Context Id", "dcerpc.dcerpc_auth.auth_context_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_Command,
          { "Command", "dcerpc.dcerpc_rts_cmd.Command", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x8_Padding,
-         { "Padding", "dcerpc.dcerpc_rts_cmds_val0x8.Padding", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_fack,
+         { "Fack", "dcerpc.dcerpc_payload.fack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_fragnum,
          { "Fragnum", "dcerpc.ncadg_packet.fragnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_pfc_flags,
          { "Pfc Flags", "dcerpc.ncadg_packet.pfc_flags", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_u,
          { "U", "dcerpc.ncacn_packet.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x4_ChannelLifetime,
-         { "Channellifetime", "dcerpc.dcerpc_rts_cmds_val0x4.ChannelLifetime", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REQUEST_request,
-         { "Request", "dcerpc.dcerpc_payload_valDCERPC_PKT_REQUEST.request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_nak_versions_num_versions,
          { "Num Versions", "dcerpc.dcerpc_bind_nak_versions.num_versions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0xB_ClientAddress,
-         { "Clientaddress", "dcerpc.dcerpc_rts_cmds_val0xB.ClientAddress", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_auth_length,
          { "Auth Length", "dcerpc.ncacn_packet.auth_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_ihint,
@@ -4359,12 +4351,10 @@ void proto_register_dcerpc_dcerpc(void)
          { "Conformancecount", "dcerpc.dcerpc_rts_cmd_Padding.ConformanceCount", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_request_object,
          { "Object", "dcerpc.dcerpc_request.object", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_AUTH3_auth3,
-         { "Auth3", "dcerpc.dcerpc_payload_valDCERPC_PKT_AUTH3.auth3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_call_id,
          { "Call Id", "dcerpc.ncacn_packet.call_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_ACK_bind_ack,
-         { "Bind Ack", "dcerpc.dcerpc_payload_valDCERPC_PKT_BIND_ACK.bind_ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_nocall,
+         { "Nocall", "dcerpc.dcerpc_payload.nocall", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_request_alloc_hint,
          { "Alloc Hint", "dcerpc.dcerpc_request.alloc_hint", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ctx_list,
@@ -4377,50 +4367,44 @@ void proto_register_dcerpc_dcerpc(void)
          { "Num Contexts", "dcerpc.dcerpc_bind.num_contexts", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_cl_cancel_id,
          { "Id", "dcerpc.dcerpc_cl_cancel.id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_auth3,
+         { "Auth3", "dcerpc.dcerpc_payload.auth3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_ack_ctx_syntax,
          { "Syntax", "dcerpc.dcerpc_ack_ctx.syntax", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_ClientAddressType_valRTS_IPV4_ClientAddressIPV4,
-         { "Clientaddressipv4", "dcerpc.ClientAddressType_valRTS_IPV4.ClientAddressIPV4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_max_xmit_frag,
          { "Max Xmit Frag", "dcerpc.dcerpc_bind_ack.max_xmit_frag", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x6_Version,
-         { "Version", "dcerpc.dcerpc_rts_cmds_val0x6.Version", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_max_frag_size,
          { "Max Frag Size", "dcerpc.dcerpc_fack.max_frag_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_orphaned__pad,
          { " Pad", "dcerpc.dcerpc_orphaned._pad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_max_recv_frag,
          { "Max Recv Frag", "dcerpc.dcerpc_bind_ack.max_recv_frag", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x0_ReceiveWindowSize,
-         { "Receivewindowsize", "dcerpc.dcerpc_rts_cmds_val0x0.ReceiveWindowSize", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack,
-         { "Cancel Ack", "dcerpc.dcerpc_payload_valDCERPC_PKT_CANCEL_ACK.cancel_ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_ClientAddressType_valRTS_IPV6_ClientAddressIPV6,
-         { "Clientaddressipv6", "dcerpc.ClientAddressType_valRTS_IPV6.ClientAddressIPV6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_SHUTDOWN_shutdown,
-         { "Shutdown", "dcerpc.dcerpc_payload_valDCERPC_PKT_SHUTDOWN.shutdown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_PingTrafficSentNotify,
+         { "Pingtrafficsentnotify", "dcerpc.dcerpc_rts_cmds.PingTrafficSentNotify", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_co_cancel,
+         { "Co Cancel", "dcerpc.dcerpc_payload.co_cancel", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_Padding,
+         { "Padding", "dcerpc.dcerpc_rts_cmds.Padding", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_ncadg_flags,
          { "Ncadg Flags", "dcerpc.ncadg_packet.ncadg_flags", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_ctx_list_context_id,
          { "Context Id", "dcerpc.dcerpc_ctx_list.context_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x5_ClientKeepalive,
-         { "Clientkeepalive", "dcerpc.dcerpc_rts_cmds_val0x5.ClientKeepalive", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_FlowControlAck_Ack,
          { "Ack", "dcerpc.dcerpc_rts_cmd_FlowControlAck.Ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x7_Empty,
-         { "Empty", "dcerpc.dcerpc_rts_cmds_val0x7.Empty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_max_recv_frag,
          { "Max Recv Frag", "dcerpc.dcerpc_bind.max_recv_frag", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_selack_size,
          { "Selack Size", "dcerpc.dcerpc_fack.selack_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_request,
+         { "Request", "dcerpc.dcerpc_payload.request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_secondary_address,
          { "Secondary Address", "dcerpc.dcerpc_bind_ack.secondary_address", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_response__pad,
          { " Pad", "dcerpc.dcerpc_response._pad", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_PingTrafficSentNotify_PingTrafficSent,
          { "Pingtrafficsent", "dcerpc.dcerpc_rts_cmd_PingTrafficSentNotify.PingTrafficSent", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FAULT_fault,
-         { "Fault", "dcerpc.dcerpc_payload_valDCERPC_PKT_FAULT.fault", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_orphaned,
+         { "Orphaned", "dcerpc.dcerpc_payload.orphaned", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_NumberOfCommands,
          { "Numberofcommands", "dcerpc.dcerpc_rts.NumberOfCommands", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_ClientKeepalive_ClientKeepalive,
@@ -4431,22 +4415,28 @@ void proto_register_dcerpc_dcerpc(void)
          { "Rpc Vers Minor", "dcerpc.ncacn_packet.rpc_vers_minor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_Commands,
          { "Commands", "dcerpc.dcerpc_rts.Commands", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_bind_nak,
+         { "Bind Nak", "dcerpc.dcerpc_payload.bind_nak", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_bind_ack,
+         { "Bind Ack", "dcerpc.dcerpc_payload.bind_ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fault__pad,
          { " Pad", "dcerpc.dcerpc_fault._pad", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_cancel_ack_id,
          { "Id", "dcerpc.dcerpc_cancel_ack.id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_alter_resp,
+         { "Alter Resp", "dcerpc.dcerpc_payload.alter_resp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ConnectionTimeout,
+         { "Connectiontimeout", "dcerpc.dcerpc_rts_cmds.ConnectionTimeout", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_object_object,
+         { "Object", "dcerpc.dcerpc_object.object", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_reject,
+         { "Reject", "dcerpc.dcerpc_payload.reject", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_Destination_ForwardDestination,
          { "Forwarddestination", "dcerpc.dcerpc_rts_cmd_Destination.ForwardDestination", FT_UINT32, BASE_DEC, VALS(dcerpc_ForwardDestination_vals), 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_selack,
          { "Selack", "dcerpc.dcerpc_fack.selack", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_PING_ping,
-         { "Ping", "dcerpc.dcerpc_payload_valDCERPC_PKT_PING.ping", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RESPONSE_response,
-         { "Response", "dcerpc.dcerpc_payload_valDCERPC_PKT_RESPONSE.response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_EOF,
          { "Rts Flag Eof", "dcerpc.dcerpc_rts_flags.RTS_FLAG_EOF", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_EOF_tfs), ( 0x0020 ), NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0xD_Destination,
-         { "Destination", "dcerpc.dcerpc_rts_cmds_val0xD.Destination", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ClientAddress_Padding,
          { "Padding", "dcerpc.ClientAddress.Padding", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_assoc_group_id,
@@ -4457,12 +4447,12 @@ void proto_register_dcerpc_dcerpc(void)
          { "Alloc Hint", "dcerpc.dcerpc_response.alloc_hint", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_window_size,
          { "Window Size", "dcerpc.dcerpc_fack.window_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_ping,
+         { "Ping", "dcerpc.dcerpc_payload.ping", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth_auth_pad_length,
          { "Auth Pad Length", "dcerpc.dcerpc_auth.auth_pad_length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_serial_low,
          { "Serial Low", "dcerpc.ncadg_packet.serial_low", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_NOCALL_nocall,
-         { "Nocall", "dcerpc.dcerpc_payload_valDCERPC_PKT_NOCALL.nocall", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_opnum,
          { "Opnum", "dcerpc.ncadg_packet.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_response_stub_and_verifier,
@@ -4471,26 +4461,28 @@ void proto_register_dcerpc_dcerpc(void)
          { "Bytesreceived", "dcerpc.FlowControlAcknowledgment.BytesReceived", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth_auth_type,
          { "Auth Type", "dcerpc.dcerpc_auth.auth_type", FT_UINT8, BASE_DEC, VALS(dcerpc_dcerpc_AuthType_vals), 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ACK_ack,
-         { "Ack", "dcerpc.dcerpc_payload_valDCERPC_PKT_ACK.ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_object_empty,
+         { "Empty", "dcerpc.dcerpc_object.empty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_request_opnum,
          { "Opnum", "dcerpc.dcerpc_request.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_seq_num,
          { "Seq Num", "dcerpc.ncadg_packet.seq_num", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_cancel_ack_version,
          { "Version", "dcerpc.dcerpc_cancel_ack.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x9_NegativeANCE,
-         { "Negativeance", "dcerpc.dcerpc_rts_cmds_val0x9.NegativeANCE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_IN_CHANNEL,
          { "Rts Flag In Channel", "dcerpc.dcerpc_rts_flags.RTS_FLAG_IN_CHANNEL", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_IN_CHANNEL_tfs), ( 0x0008 ), NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ClientKeepalive,
+         { "Clientkeepalive", "dcerpc.dcerpc_rts_cmds.ClientKeepalive", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_cl_cancel,
+         { "Cl Cancel", "dcerpc.dcerpc_payload.cl_cancel", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_num_results,
          { "Num Results", "dcerpc.dcerpc_bind_ack.num_results", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_FlowControlAcknowledgment_ChannelCookie,
          { "Channelcookie", "dcerpc.FlowControlAcknowledgment.ChannelCookie", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_AssociationGroupId_AssociationGroupId,
          { "Associationgroupid", "dcerpc.dcerpc_rts_cmd_AssociationGroupId.AssociationGroupId", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RTS_rts,
-         { "Rts", "dcerpc.dcerpc_payload_valDCERPC_PKT_RTS.rts", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ClientAddress,
+         { "Clientaddress", "dcerpc.dcerpc_rts_cmds.ClientAddress", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_co_cancel__pad,
          { " Pad", "dcerpc.dcerpc_co_cancel._pad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_request__pad,
@@ -4503,34 +4495,36 @@ void proto_register_dcerpc_dcerpc(void)
          { "Versions", "dcerpc.dcerpc_bind_nak_versions.versions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_activity,
          { "Activity", "dcerpc.ncadg_packet.activity", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel,
-         { "Cl Cancel", "dcerpc.dcerpc_payload_valDCERPC_PKT_CL_CANCEL.cl_cancel", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_ChannelLifetime_ChannelLifetime,
          { "Channellifetime", "dcerpc.dcerpc_rts_cmd_ChannelLifetime.ChannelLifetime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_auth_proto,
          { "Auth Proto", "dcerpc.ncadg_packet.auth_proto", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_assoc_group_id,
          { "Assoc Group Id", "dcerpc.dcerpc_bind_ack.assoc_group_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_RESP_alter_resp,
-         { "Alter Resp", "dcerpc.dcerpc_payload_valDCERPC_PKT_ALTER_RESP.alter_resp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fault_context_id,
          { "Context Id", "dcerpc.dcerpc_fault.context_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_rts,
+         { "Rts", "dcerpc.dcerpc_payload.rts", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_drep,
          { "Drep", "dcerpc.ncacn_packet.drep", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_ack,
+         { "Ack", "dcerpc.dcerpc_payload.ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_nak_reject_reason,
          { "Reject Reason", "dcerpc.dcerpc_bind_nak.reject_reason", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_cancel_ack_server_is_accepting,
          { "Server Is Accepting", "dcerpc.dcerpc_cancel_ack.server_is_accepting", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_bind,
+         { "Bind", "dcerpc.dcerpc_payload.bind", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_ClientAddress_ClientAddress,
          { "Clientaddress", "dcerpc.dcerpc_rts_cmd_ClientAddress.ClientAddress", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth3_auth_info,
          { "Auth Info", "dcerpc.dcerpc_auth3.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_object_valLIBNDR_FLAG_OBJECT_PRESENT_object,
-         { "Object", "dcerpc.dcerpc_object_valLIBNDR_FLAG_OBJECT_PRESENT.object", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_FlowControlAcknowledgment_AvailableWindow,
          { "Availablewindow", "dcerpc.FlowControlAcknowledgment.AvailableWindow", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_frag_length,
          { "Frag Length", "dcerpc.ncacn_packet.frag_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_alter,
+         { "Alter", "dcerpc.dcerpc_payload.alter", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack__pad1,
          { " Pad1", "dcerpc.dcerpc_bind_ack._pad1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_ctx_list_num_transfer_syntaxes,
@@ -4539,18 +4533,14 @@ void proto_register_dcerpc_dcerpc(void)
          { "Auth Info", "dcerpc.dcerpc_bind.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth_auth_level,
          { "Auth Level", "dcerpc.dcerpc_auth.auth_level", FT_UINT8, BASE_DEC, VALS(dcerpc_dcerpc_AuthLevel_vals), 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_WORKING_working,
-         { "Working", "dcerpc.dcerpc_payload_valDCERPC_PKT_WORKING.working", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_ptype,
          { "Ptype", "dcerpc.ncadg_packet.ptype", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CO_CANCEL_co_cancel,
-         { "Co Cancel", "dcerpc.dcerpc_payload_valDCERPC_PKT_CO_CANCEL.co_cancel", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_ptype,
          { "Ptype", "dcerpc.ncacn_packet.ptype", FT_UINT8, BASE_DEC, VALS(dcerpc_dcerpc_pkt_type_vals), 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fault_status,
          { "Status", "dcerpc.dcerpc_fault.status", FT_UINT32, BASE_DEC, VALS(dcerpc_dcerpc_nca_status_vals), 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0xA_ANCE,
-         { "Ance", "dcerpc.dcerpc_rts_cmds_val0xA.ANCE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_fault,
+         { "Fault", "dcerpc.dcerpc_payload.fault", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_serial_high,
          { "Serial High", "dcerpc.ncadg_packet.serial_high", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth3__pad,
@@ -4561,24 +4551,26 @@ void proto_register_dcerpc_dcerpc(void)
          { "Clientaddress", "dcerpc.ClientAddress.ClientAddress", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_Cookie_Cookie,
          { "Cookie", "dcerpc.dcerpc_rts_cmd_Cookie.Cookie", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FACK_fack,
-         { "Fack", "dcerpc.dcerpc_payload_valDCERPC_PKT_FACK.fack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REJECT_reject,
-         { "Reject", "dcerpc.dcerpc_payload_valDCERPC_PKT_REJECT.reject", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ChannelLifetime,
+         { "Channellifetime", "dcerpc.dcerpc_rts_cmds.ChannelLifetime", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_ConnectionTimeout_ConnectionTimeout,
          { "Connectiontimeout", "dcerpc.dcerpc_rts_cmd_ConnectionTimeout.ConnectionTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ReceiveWindowSize,
+         { "Receivewindowsize", "dcerpc.dcerpc_rts_cmds.ReceiveWindowSize", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_iface_version,
          { "Iface Version", "dcerpc.ncadg_packet.iface_version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_ECHO,
          { "Rts Flag Echo", "dcerpc.dcerpc_rts_flags.RTS_FLAG_ECHO", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_ECHO_tfs), ( 0x0040 ), NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x3_Cookie,
-         { "Cookie", "dcerpc.dcerpc_rts_cmds_val0x3.Cookie", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v,
-         { "V", "dcerpc.dcerpc_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_bind_nak_versions_ctr_v,
+         { "V", "dcerpc.dcerpc_bind_nak_versions_ctr.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_ClientAddressType_ClientAddressIPV6,
+         { "Clientaddressipv6", "dcerpc.ClientAddressType.ClientAddressIPV6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_NegativeANCE,
+         { "Negativeance", "dcerpc.dcerpc_rts_cmds.NegativeANCE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_max_tdsu,
          { "Max Tdsu", "dcerpc.dcerpc_fack.max_tdsu", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_NAK_bind_nak,
-         { "Bind Nak", "dcerpc.dcerpc_payload_valDCERPC_PKT_BIND_NAK.bind_nak", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_AssociationGroupId,
+         { "Associationgroupid", "dcerpc.dcerpc_rts_cmds.AssociationGroupId", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_CommandType,
          { "Commandtype", "dcerpc.dcerpc_rts_cmd.CommandType", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_rpc_vers,
@@ -4589,6 +4581,10 @@ void proto_register_dcerpc_dcerpc(void)
          { "Context Id", "dcerpc.dcerpc_request.context_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_ahint,
          { "Ahint", "dcerpc.ncadg_packet.ahint", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_shutdown,
+         { "Shutdown", "dcerpc.dcerpc_payload.shutdown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_ClientAddressType_ClientAddressIPV4,
+         { "Clientaddressipv4", "dcerpc.ClientAddressType.ClientAddressIPV4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_OUT_CHANNEL,
          { "Rts Flag Out Channel", "dcerpc.dcerpc_rts_flags.RTS_FLAG_OUT_CHANNEL", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_OUT_CHANNEL_tfs), ( 0x0010 ), NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_ctx_list,
@@ -4597,30 +4593,34 @@ void proto_register_dcerpc_dcerpc(void)
          { "Version", "dcerpc.dcerpc_fack.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_Version_Version,
          { "Version", "dcerpc.dcerpc_rts_cmd_Version.Version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0xC_AssociationGroupId,
-         { "Associationgroupid", "dcerpc.dcerpc_rts_cmds_val0xC.AssociationGroupId", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_ReceiveWindowSize_ReceiveWindowSize,
          { "Receivewindowsize", "dcerpc.dcerpc_rts_cmd_ReceiveWindowSize.ReceiveWindowSize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_rpc_vers,
          { "Rpc Vers", "dcerpc.ncadg_packet.rpc_vers", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_working,
+         { "Working", "dcerpc.dcerpc_payload.working", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_RTSCookie_Cookie,
          { "Cookie", "dcerpc.RTSCookie.Cookie", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_Flags,
          { "Flags", "dcerpc.dcerpc_rts.Flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_alter,
-         { "Alter", "dcerpc.dcerpc_payload_valDCERPC_PKT_ALTER.alter", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_Version,
+         { "Version", "dcerpc.dcerpc_rts_cmds.Version", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ClientAddress_AddressType,
          { "Addresstype", "dcerpc.ClientAddress.AddressType", FT_UINT32, BASE_DEC, VALS(dcerpc_AddressType_vals), 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_response_context_id,
          { "Context Id", "dcerpc.dcerpc_response.context_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_bind,
-         { "Bind", "dcerpc.dcerpc_payload_valDCERPC_PKT_BIND.bind", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_drep,
          { "Drep", "dcerpc.ncadg_packet.drep", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_len,
          { "Len", "dcerpc.ncadg_packet.len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_Empty,
+         { "Empty", "dcerpc.dcerpc_rts_cmds.Empty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_Destination,
+         { "Destination", "dcerpc.dcerpc_rts_cmds.Destination", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_opnum,
          { "Operation", "dcerpc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ANCE,
+         { "Ance", "dcerpc.dcerpc_rts_cmds.ANCE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fault_alloc_hint,
          { "Alloc Hint", "dcerpc.dcerpc_fault.alloc_hint", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_NONE,
@@ -4637,10 +4637,10 @@ void proto_register_dcerpc_dcerpc(void)
          { "Rts Flag Recycle Channel", "dcerpc.dcerpc_rts_flags.RTS_FLAG_RECYCLE_CHANNEL", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_RECYCLE_CHANNEL_tfs), ( 0x0004 ), NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_pfc_flags,
          { "Pfc Flags", "dcerpc.ncacn_packet.pfc_flags", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_object_valdefault_empty,
-         { "Empty", "dcerpc.dcerpc_object_valdefault.empty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ORPHANED_orphaned,
-         { "Orphaned", "dcerpc.dcerpc_payload_valDCERPC_PKT_ORPHANED.orphaned", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_FlowControlAck,
+         { "Flowcontrolack", "dcerpc.dcerpc_rts_cmds.FlowControlAck", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_Cookie,
+         { "Cookie", "dcerpc.dcerpc_rts_cmds.Cookie", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_ctx_list_transfer_syntaxes,
          { "Transfer Syntaxes", "dcerpc.dcerpc_ctx_list.transfer_syntaxes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_auth_info,