add parameter dcerpc_info to PIDL_dissect_ipv?address()

diff --git a/epan/dissectors/packet-dcerpc-witness-cnf.c b/epan/dissectors/packet-dcerpc-witness-cnf.c
index e4750126956fac1c2cbb264b90cb3348b7539f5b..f61dff3f509689de2f90986025b6abd979e65e8d 100644 (file)
--- a/epan/dissectors/packet-dcerpc-witness-cnf.c
+++ b/epan/dissectors/packet-dcerpc-witness-cnf.c
@@ -276,10 +276,9 @@ witness_dissect_element_interfaceInfo_group_name(tvbuff_t *tvb, int offset, pack
 }
 
 static int
-PIDL_dissect_ipv4address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep _U_, int hfindex, guint32 param)
+PIDL_dissect_ipv4address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep _U_, int hfindex, guint32 param)
 {
 //     guint32 ip = tvb_get_ipv4(tvb,offset); //tvb_get_ntohl(tvb, offset);
-       dcerpc_info *di = pinfo->private_data;
        if (di->conformant_run) {
                /* just a run to handle conformant arrays, no scalars to dissect */
                return offset;
@@ -305,10 +304,9 @@ PIDL_dissect_ipv4address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 }
 
 static int
-PIDL_dissect_ipv6address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep _U_, int hfindex, guint32 param)
+PIDL_dissect_ipv6address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep _U_, int hfindex, guint32 param)
 {
 //     tvb_get_ipv6(tvb, offset, &addr);
-       dcerpc_info *di = pinfo->private_data;
        if (di->conformant_run) {
                /* just a run to handle conformant arrays, no scalars to dissect */
                return offset;

diff --git a/epan/dissectors/packet-dcerpc-witness.c b/epan/dissectors/packet-dcerpc-witness.c
index 0dadd15028b5fb56964313f5f89d3ab298e77383..1419609f1ef1f8c1dea4f83e2ae663fe648ae04e 100644 (file)
--- a/epan/dissectors/packet-dcerpc-witness.c
+++ b/epan/dissectors/packet-dcerpc-witness.c
@@ -1,6 +1,6 @@
 /* DO NOT EDIT
        This filter was automatically generated
-       from epan/dissectors/pidl/witness.idl and epan/dissectors/pidl/witness.cnf.
+       from pidl/witness.idl and pidl/witness.cnf.
        
        Pidl is a perl based IDL compiler for DCE/RPC idl files.
        It is maintained by the Samba team, not the Wireshark team.
@@ -284,7 +284,7 @@ witness_dissect_element_interfaceInfo_state(tvbuff_t *tvb _U_, int offset _U_, p
 static int
 witness_dissect_element_interfaceInfo_ipv4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
-       offset=PIDL_dissect_ipv4address(tvb, offset, pinfo, tree, drep, hf_witness_witness_interfaceInfo_ipv4, PIDL_SET_COL_INFO);
+       offset=PIDL_dissect_ipv4address(tvb, offset, pinfo, tree, di, drep, hf_witness_witness_interfaceInfo_ipv4, PIDL_SET_COL_INFO);
 
        return offset;
 }
@@ -292,7 +292,7 @@ witness_dissect_element_interfaceInfo_ipv4(tvbuff_t *tvb _U_, int offset _U_, pa
 static int
 witness_dissect_element_interfaceInfo_ipv6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
-       offset=PIDL_dissect_ipv6address(tvb, offset, pinfo, tree, drep, hf_witness_witness_interfaceInfo_ipv6, PIDL_SET_COL_INFO);
+       offset=PIDL_dissect_ipv6address(tvb, offset, pinfo, tree, di, drep, hf_witness_witness_interfaceInfo_ipv6, PIDL_SET_COL_INFO);
 
        return offset;
 }

diff --git a/epan/dissectors/packet-dcerpc-witness.h b/epan/dissectors/packet-dcerpc-witness.h
index e8aecd8743548b5051c6d5d2e2f40974fe06d31c..0a794baaec15df04f622ee8be7cbd6213d46de3b 100644 (file)
--- a/epan/dissectors/packet-dcerpc-witness.h
+++ b/epan/dissectors/packet-dcerpc-witness.h
@@ -2,7 +2,7 @@
 
 /* DO NOT EDIT
        This filter was automatically generated
-       from epan/dissectors/pidl/witness.idl and epan/dissectors/pidl/witness.cnf.
+       from pidl/witness.idl and pidl/witness.cnf.
        
        Pidl is a perl based IDL compiler for DCE/RPC idl files.
        It is maintained by the Samba team, not the Wireshark team.

diff --git a/epan/dissectors/pidl/witness.cnf b/epan/dissectors/pidl/witness.cnf
index a88663c3f280a14b553f7a8653de97b50d4841ed..c76a89f86cf21c89a92198412b96c7419c42d3b5 100644 (file)
--- a/epan/dissectors/pidl/witness.cnf
+++ b/epan/dissectors/pidl/witness.cnf
@@ -4,11 +4,11 @@ MANUAL witness_dissect_struct_notifyResponse
 MANUAL witness_dissect_element_notifyResponse_message_buffer_
 MANUAL witness_dissect_enum_interfaceInfo_state
 
-TYPE ipv4address "offset=PIDL_dissect_ipv4address(tvb, offset, pinfo, tree, drep, @HF@, PIDL_SET_COL_INFO);" FT_IPv4 BASE_NONE 0 NULL 4
+TYPE ipv4address "offset=PIDL_dissect_ipv4address(tvb, offset, pinfo, tree, di, drep, @HF@, PIDL_SET_COL_INFO);" FT_IPv4 BASE_NONE 0 NULL 4
 
 #PARAM_VALUE witness_dissect_element_interfaceInfo_state PIDL_SET_COL_INFO
 
-TYPE ipv6address "offset=PIDL_dissect_ipv6address(tvb, offset, pinfo, tree, drep, @HF@, PIDL_SET_COL_INFO);" FT_IPv6 BASE_NONE 0 NULL 2
+TYPE ipv6address "offset=PIDL_dissect_ipv6address(tvb, offset, pinfo, tree, di, drep, @HF@, PIDL_SET_COL_INFO);" FT_IPv6 BASE_NONE 0 NULL 2
 
 HF_RENAME hf_witness_witness_interfaceInfo_group_name hf_dummy
 HF_FIELD hf_witness_witness_interfaceInfo_group_name "Group Name" "witness.witness_interfaceInfo.group_name" FT_STRING BASE_NONE NULL 0 "" "" ""