diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-02 00:36:30 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-02 00:36:30 +0000 |
| commit | f8f1f483713edc82c51656580e67f5d21ba2adef (patch) | |
| tree | 724e691cfbd818a3c191335e83121d0a3ad897f8 /epan/dissectors/packet-iwarp-mpa.c | |
| parent | b6484432aaa2eb6787cc54cc4a7b489ae70e57aa (diff) | |
Pass struct tcpinfo into all TCP subdissectors instead of through pinfo->private_data.
svn path=/trunk/; revision=53036
Diffstat (limited to 'epan/dissectors/packet-iwarp-mpa.c')
| -rw-r--r-- | epan/dissectors/packet-iwarp-mpa.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index dd22971f21..71cf53c1bb 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -780,20 +780,18 @@ dissect_mpa_fpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * Main dissection routine. */ static gboolean -dissect_iwarp_mpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_iwarp_mpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { tvbuff_t *next_tvb = NULL; conversation_t *conversation = NULL; mpa_state_t *state = NULL; - struct tcpinfo *tcpinfo = NULL; + struct tcpinfo *tcpinfo = (struct tcpinfo *)data; guint8 endpoint = 3; guint16 ulpdu_length = 0; /* FPDU */ if (tvb_length(tvb) >= MPA_SMALLEST_FPDU_LEN && is_mpa_fpdu(pinfo)) { - tcpinfo = (struct tcpinfo *)pinfo->private_data; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); |