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 /asn1/t38 | |
| parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
| download | wireshark-bc5a0374bfd162d08834f5f7503bebd33d8ec943.tar.gz | |
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 'asn1/t38')
| -rw-r--r-- | asn1/t38/packet-t38-template.c | 6 | ||||
| -rw-r--r-- | asn1/t38/t38.cnf | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index c459c31dab..9866309247 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -378,7 +378,7 @@ force_reassemble_seq(reassembly_table *table, packet_info *pinfo, guint32 id) /* mark this packet as defragmented */ fd_head->flags |= FD_DEFRAGMENTED; - fd_head->reassembled_in=pinfo->fd->num; + fd_head->reassembled_in=pinfo->num; col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost); @@ -428,13 +428,13 @@ init_t38_info_conv(packet_info *pinfo) /* find the conversation used for Reassemble and Setup Info */ - p_conv = find_conversation(pinfo->fd->num, &pinfo->net_dst, &pinfo->net_src, + p_conv = find_conversation(pinfo->num, &pinfo->net_dst, &pinfo->net_src, pinfo->ptype, pinfo->destport, pinfo->srcport, NO_ADDR_B | NO_PORT_B); /* create a conv if it doen't exist */ if (!p_conv) { - p_conv = conversation_new(pinfo->fd->num, &pinfo->net_src, &pinfo->net_dst, + p_conv = conversation_new(pinfo->num, &pinfo->net_src, &pinfo->net_dst, pinfo->ptype, pinfo->srcport, pinfo->destport, NO_ADDR_B | NO_PORT_B); /* Set dissector */ diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index c0629d2262..db61672b71 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -182,7 +182,7 @@ VAL_PTR=&Data_Field_field_type_value /* if we have not reassembled this packet and it is the first fragment, reset the reassemble ID and the start seq number*/ if (p_t38_packet_conv && p_t38_conv && (p_t38_packet_conv_info->reass_ID == 0)) { /* we use the first fragment's frame_number as fragment ID because the protocol doesn't provide it */ - p_t38_conv_info->reass_ID = actx->pinfo->fd->num; + p_t38_conv_info->reass_ID = actx->pinfo->num; p_t38_conv_info->reass_start_seqnum = seq_number; p_t38_conv_info->time_first_t4_data = nstime_to_sec(&actx->pinfo->rel_ts); p_t38_conv_info->additional_hdlc_data_field_counter = 0; |