aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-t38.c
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2013-07-17 21:12:24 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2013-07-17 21:12:24 +0000
commita18172147f2c64d3bd143de0309278b7491d21f4 (patch)
tree2af594855291ec55f5313826b45a66e6deb4adcd /epan/dissectors/packet-t38.c
parentf3a2aba863df76151c77a43893478be297142a2d (diff)
Remove fragment_data, add fragment_head, fragment_item - for now alias it to the same structure.
This is begin of work to split fragment head and fragments items. svn path=/trunk/; revision=50708
Diffstat (limited to 'epan/dissectors/packet-t38.c')
-rw-r--r--epan/dissectors/packet-t38.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 101aff6999..b0b046a424 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -337,12 +337,12 @@ void t38_add_address(packet_info *pinfo,
}
-fragment_data *
+fragment_head *
force_reassemble_seq(reassembly_table *table, packet_info *pinfo, guint32 id)
{
- fragment_data *fd_head;
- fragment_data *fd_i;
- fragment_data *last_fd;
+ fragment_head *fd_head;
+ fragment_item *fd_i;
+ fragment_item *last_fd;
guint32 dfpos, size, packet_lost, burst_lost, seq_num;
guint8 *data;
@@ -587,7 +587,7 @@ dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
/* TODO: reassemble all the Items in one frame */
if (primary_part && (Data_Field_item_num<2)) {
if (Data_Field_field_type_value == 2 || Data_Field_field_type_value == 4 || Data_Field_field_type_value == 7) {/* hdlc-fcs-OK or hdlc-fcs-OK-sig-end or t4-non-ecm-sig-end*/
- fragment_data *frag_msg = NULL;
+ fragment_head *frag_msg = NULL;
tvbuff_t* new_tvb = NULL;
gboolean save_fragmented = actx->pinfo->fragmented;
@@ -702,7 +702,7 @@ dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
/* using the current ressaemble functions. */
/* TODO: reassemble all the Items in one frame */
if (primary_part && (Data_Field_item_num<2)) {
- fragment_data *frag_msg = NULL;
+ fragment_head *frag_msg = NULL;
/* HDLC Data or t4-non-ecm-data */
if (Data_Field_field_type_value == 0 || Data_Field_field_type_value == 6) { /* 0=HDLC Data or 6=t4-non-ecm-data*/