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-rdp.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-rdp.c')
| -rw-r--r-- | epan/dissectors/packet-rdp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index f359770398..4ca94747ca 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -1495,7 +1495,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* if (rdp_info && ((rdp_info->licenseAgreed == 0) || - (pinfo->fd->num <= rdp_info->licenseAgreed))) { + (pinfo->num <= rdp_info->licenseAgreed))) { /* licensing stage hasn't been completed */ proto_tree *next_tree; @@ -1553,7 +1553,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* break; case ERROR_ALERT: /*offset =*/ dissect_rdp_fields(tvb, offset, pinfo, next_tree, error_fields, 0); - rdp_info->licenseAgreed = pinfo->fd->num; + rdp_info->licenseAgreed = pinfo->num; break; default: /* Unknown msgType */ @@ -1563,7 +1563,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* /*offset =*/ dissect_rdp_encrypted(tvb, offset, pinfo, next_tree, NULL); /* XXX: we assume the license is agreed in this exchange */ - rdp_info->licenseAgreed = pinfo->fd->num; + rdp_info->licenseAgreed = pinfo->num; } break; |