Revert "WRONG! git add -f bin/default/librpc/gen_ndr/packet-dcerpc-*"

This reverts commit 6ff2a976b5f7b302e9c0dcb17775331482295536.

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c
index 7b88706b10a700204c035a87292cf0f28cb85063..5be2b572526498816162c2f297094521e7bd6306 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c
@@ -246,11 +246,11 @@ dfsblobs_dissect_bitmap_DFS_HEADER_FLAG(tvbuff_t *tvb _U_, int offset _U_, packe
 int
 dfsblobs_dissect_enum_DFS_SERVER_TYPE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -266,11 +266,11 @@ dfsblobs_dissect_enum_DFS_SERVER_TYPE(tvbuff_t *tvb _U_, int offset _U_, packet_
 int
 dfsblobs_dissect_enum_DFS_FLAGS_REFERRAL(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dns.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dns.c
index f3f32b9fae91cde8c347cd5a656d2cf2931359f2..a29db104e2c21b3b1ef60ce8a86b701b2a8c0a51 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dns.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dns.c
@@ -568,11 +568,11 @@ dns_dissect_enum_rcode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_
 int
 dns_dissect_enum_qclass(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -630,11 +630,11 @@ dns_dissect_enum_qclass(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 int
 dns_dissect_enum_qtype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -655,11 +655,11 @@ dns_dissect_enum_qtype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_
 int
 dns_dissect_enum_tkey_mode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c b/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
index 65b4205e225ae8e7719654d1a6db0ca9d01fce87..b0ead08e97e332480cacb67a5ab23c213487a3fe 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
@@ -12630,11 +12630,11 @@ drsuapi_dissect_struct_NameResOp_V1(tvbuff_t *tvb _U_, int offset _U_, packet_in
 int
 drsuapi_dissect_enum_DsAddEntry_RefType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c b/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c
index d32923bbceab5d0f76de004f4ee0c07465e75f10..6d4076d1129840605502aae5f57dd3abf7bb46f9 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c
@@ -1228,11 +1228,11 @@ nbt_dissect_struct_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 int
 nbt_dissect_enum_qclass(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -1251,11 +1251,11 @@ nbt_dissect_enum_qclass(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 int
 nbt_dissect_enum_qtype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -3742,11 +3742,11 @@ nbt_dissect_bitmap_netlogon_nt_version_flags(tvbuff_t *tvb _U_, int offset _U_,
 int
 nbt_dissect_enum_netlogon_command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c b/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
index 34856b23d377ddd2fbbe7a6c87cfe000a5487d32..4507dcbd4078d28900015a6f3259d4479ed4d1c7 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
@@ -9085,11 +9085,11 @@ spoolss_dissect_bitmap_DeviceModeFields(tvbuff_t *tvb _U_, int offset _U_, packe
 int
 spoolss_dissect_enum_DeviceModeSpecVersion(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -9105,11 +9105,11 @@ spoolss_dissect_enum_DeviceModeSpecVersion(tvbuff_t *tvb _U_, int offset _U_, pa
 int
 spoolss_dissect_enum_DeviceModeOrientation(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -9214,11 +9214,11 @@ spoolss_dissect_enum_DeviceModeOrientation(tvbuff_t *tvb _U_, int offset _U_, pa
 int
 spoolss_dissect_enum_DeviceModePaperSize(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -9245,11 +9245,11 @@ spoolss_dissect_enum_DeviceModePaperSize(tvbuff_t *tvb _U_, int offset _U_, pack
 int
 spoolss_dissect_enum_DeviceModeDefaultSource(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -9267,11 +9267,11 @@ spoolss_dissect_enum_DeviceModeDefaultSource(tvbuff_t *tvb _U_, int offset _U_,
 int
 spoolss_dissect_enum_DeviceModePrintQuality(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -9287,11 +9287,11 @@ spoolss_dissect_enum_DeviceModePrintQuality(tvbuff_t *tvb _U_, int offset _U_, p
 int
 spoolss_dissect_enum_DeviceModeColor(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -9308,11 +9308,11 @@ spoolss_dissect_enum_DeviceModeColor(tvbuff_t *tvb _U_, int offset _U_, packet_i
 int
 spoolss_dissect_enum_DeviceModeDuplex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -9330,11 +9330,11 @@ spoolss_dissect_enum_DeviceModeDuplex(tvbuff_t *tvb _U_, int offset _U_, packet_
 int
 spoolss_dissect_enum_DeviceModeTTOption(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -9350,11 +9350,11 @@ spoolss_dissect_enum_DeviceModeTTOption(tvbuff_t *tvb _U_, int offset _U_, packe
 int
 spoolss_dissect_enum_DeviceModeCollate(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -23993,11 +23993,11 @@ spoolss_dissect_struct_PortVarContainer(tvbuff_t *tvb _U_, int offset _U_, packe
 int
 spoolss_dissect_enum_JobNotifyField(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -24039,11 +24039,11 @@ spoolss_dissect_enum_JobNotifyField(tvbuff_t *tvb _U_, int offset _U_, packet_in
 int
 spoolss_dissect_enum_PrintNotifyField(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }
@@ -24059,11 +24059,11 @@ spoolss_dissect_enum_PrintNotifyField(tvbuff_t *tvb _U_, int offset _U_, packet_
 int
 spoolss_dissect_enum_NotifyType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
-       guint1632 parameter=0;
+       guint16 parameter=0;
        if(param){
-               parameter=(guint1632)*param;
+               parameter=(guint16)*param;
        }
-       offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
+       offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
        if(param){
                *param=(guint32)parameter;
        }