diff options
author | Michael Mann <mmann78@netscape.net> | 2013-11-10 03:20:04 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-11-10 03:20:04 +0000 |
commit | af0819f942fc85919fe9e81a9e990b0f9bf50ca2 (patch) | |
tree | c9f62d5848425f56a87583227b0672dbf1787c83 /epan/dissectors/packet-teklink.c | |
parent | 2965a6bf250609ee3536ebf9fbc44864b55f6931 (diff) |
Add data parameter to dissect_function_t in vsff structure. The intention here is to use it to replace some pinfo->private_data.
I didn't realize how expansive this change would be, so committing it now before replacing the pinfo->private_data, so if something needs to be reverted, all of this is not lost.
svn path=/trunk/; revision=53213
Diffstat (limited to 'epan/dissectors/packet-teklink.c')
-rw-r--r-- | epan/dissectors/packet-teklink.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-teklink.c b/epan/dissectors/packet-teklink.c index d312d207a8..30fbeb63fd 100644 --- a/epan/dissectors/packet-teklink.c +++ b/epan/dissectors/packet-teklink.c @@ -170,7 +170,7 @@ static const value_string teklink_vtc_modes[] = { }; static int dissect_teklink_tlaframeopen_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_string(tvb, tree, hf_teklink_unknown_string, offset, NULL); @@ -180,21 +180,21 @@ static int dissect_teklink_tlaframeopen_call(tvbuff_t *tvb, int offset, packet_i } static int dissect_teklink_tlaframeclose_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); return offset; } static int dissect_teklink_tlaframeclose_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); return offset; } static int dissect_teklink_tlaframeopen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -203,7 +203,7 @@ static int dissect_teklink_tlaframeopen_reply(tvbuff_t *tvb, int offset, packet_ } static int dissect_teklink_get_software_version_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -213,7 +213,7 @@ static int dissect_teklink_get_software_version_reply(tvbuff_t *tvb, int offset, } static int dissect_teklink_call65_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_cmd, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -225,14 +225,14 @@ static int dissect_teklink_call65_call(tvbuff_t *tvb, int offset, packet_info *p } static int dissect_teklink_call65_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); return offset; } static int dissect_teklink_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_locked, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -247,7 +247,7 @@ static int dissect_teklink_info_reply(tvbuff_t *tvb, int offset, packet_info *pi } static int dissect_teklink_info_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -256,7 +256,7 @@ static int dissect_teklink_info_call(tvbuff_t *tvb, int offset, packet_info *pin static int dissect_teklink_vtc_ident(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -264,7 +264,7 @@ static int dissect_teklink_vtc_ident(tvbuff_t *tvb, int offset, packet_info *pin } static int dissect_teklink_vtc_sigstatall(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -272,7 +272,7 @@ static int dissect_teklink_vtc_sigstatall(tvbuff_t *tvb, int offset, packet_info } static int dissect_teklink_vtc_outen(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 sig = tvb_get_ntohl(tvb, offset); guint32 sigon = tvb_get_ntohl(tvb, offset + 4); @@ -287,7 +287,7 @@ static int dissect_teklink_vtc_outen(tvbuff_t *tvb, int offset, packet_info *pin } static int dissect_teklink_vtc_map(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 src, dst; @@ -304,7 +304,7 @@ static int dissect_teklink_vtc_map(tvbuff_t *tvb, int offset, packet_info *pinfo } static int dissect_teklink_vtc_clk(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 sig, clksource, clkedge, clkmode; @@ -327,7 +327,7 @@ static int dissect_teklink_vtc_clk(tvbuff_t *tvb, int offset, packet_info *pinfo } static int dissect_teklink_vtc_mode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 sig, edge, mode; @@ -348,7 +348,7 @@ static int dissect_teklink_vtc_mode(tvbuff_t *tvb, int offset, packet_info *pinf } static int dissect_teklink_vtc_outsetup(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 sig, en, pol, feedback; @@ -371,7 +371,7 @@ static int dissect_teklink_vtc_outsetup(tvbuff_t *tvb, int offset, packet_info * } static int dissect_teklink_vtc_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 sig = tvb_get_ntohl(tvb, offset); @@ -383,14 +383,14 @@ static int dissect_teklink_vtc_res(tvbuff_t *tvb, int offset, packet_info *pinfo } static int dissect_teklink_vtl_spinbits(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); return offset; } static int dissect_teklink_vtl_zmode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); return offset; |