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-wsp.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-wsp.c')
| -rw-r--r-- | epan/dissectors/packet-wsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 6ea68954f9..45ea866c7c 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -3993,10 +3993,10 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, redir_address.len = 4; redir_address.data = (const guint8 *)&address_ipv4; /* Find a conversation based on redir_address and pinfo->dst */ - conv = find_conversation(pinfo->fd->num, &redir_address, &pinfo->dst, + conv = find_conversation(pinfo->num, &redir_address, &pinfo->dst, PT_UDP, port_num, 0, NO_PORT_B); if (conv == NULL) { /* This conversation does not exist yet */ - conv = conversation_new(pinfo->fd->num, &redir_address, + conv = conversation_new(pinfo->num, &redir_address, &pinfo->dst, PT_UDP, port_num, 0, NO_PORT2); } /* Apply WSP dissection to the conversation */ @@ -4029,10 +4029,10 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, redir_address.len = 16; redir_address.data = (const guint8 *)&address_ipv6; /* Find a conversation based on redir_address and pinfo->dst */ - conv = find_conversation(pinfo->fd->num, &redir_address, &pinfo->dst, + conv = find_conversation(pinfo->num, &redir_address, &pinfo->dst, PT_UDP, port_num, 0, NO_PORT_B); if (conv == NULL) { /* This conversation does not exist yet */ - conv = conversation_new(pinfo->fd->num, &redir_address, + conv = conversation_new(pinfo->num, &redir_address, &pinfo->dst, PT_UDP, port_num, 0, NO_PORT2); } /* Apply WSP dissection to the conversation */ |