diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-23 19:40:51 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-24 03:41:28 +0000 |
| commit | bc5a0374bfd162d08834f5f7503bebd33d8ec943 (patch) | |
| tree | 6d5be93a3e35c6eb144ce6d2b1d95650b5cbbd86 /epan/dissectors/packet-x11.c | |
| parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
Add the packet number to the packet_info structure, and use it.
That removes most of the uses of the frame number field in the
frame_data structure.
Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-x11.c')
| -rw-r--r-- | epan/dissectors/packet-x11.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index a5aa07a3cf..30a2c83a5f 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -3106,7 +3106,7 @@ static void dissect_x11_initial_conn(tvbuff_t *tvb, packet_info *pinfo, /* * This is the initial connection request... */ - state->iconn_frame = pinfo->fd->num; + state->iconn_frame = pinfo->num; /* * ...and we're expecting a reply to it. @@ -3134,7 +3134,7 @@ static void dissect_x11_initial_reply(tvbuff_t *tvb, packet_info *pinfo, proto_item_append_text(ti, ", Reply, Initial connection reply"); t = proto_item_add_subtree(ti, ett_x11); - state->iconn_reply = pinfo->fd->num; + state->iconn_reply = pinfo->num; success = INT8(success); if (success) { UNUSED(1); @@ -4566,7 +4566,7 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo, return; } - if (state->iconn_frame == pinfo->fd->num || + if (state->iconn_frame == pinfo->num || (g_hash_table_lookup(state->seqtable, GINT_TO_POINTER(state->sequencenumber)) == (int *)NOTHING_SEEN && (opcode == 'B' || opcode == 'l') && @@ -4879,7 +4879,7 @@ dissect_x11_replies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (g_hash_table_lookup(state->seqtable, GINT_TO_POINTER(state->sequencenumber)) == (int *)INITIAL_CONN - || (state->iconn_reply == pinfo->fd->num)) { + || (state->iconn_reply == pinfo->num)) { /* * Either the connection is in the "initial * connection" state, or this frame is known |