diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-17 21:12:24 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-17 21:12:24 +0000 |
| commit | a18172147f2c64d3bd143de0309278b7491d21f4 (patch) | |
| tree | 2af594855291ec55f5313826b45a66e6deb4adcd /asn1 | |
| parent | f3a2aba863df76151c77a43893478be297142a2d (diff) | |
| download | wireshark-a18172147f2c64d3bd143de0309278b7491d21f4.tar.gz | |
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 'asn1')
| -rw-r--r-- | asn1/idmp/packet-idmp-template.c | 2 | ||||
| -rw-r--r-- | asn1/rtse/packet-rtse-template.c | 2 | ||||
| -rw-r--r-- | asn1/t38/packet-t38-template.c | 8 | ||||
| -rw-r--r-- | asn1/t38/t38.cnf | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/asn1/idmp/packet-idmp-template.c b/asn1/idmp/packet-idmp-template.c index 88fdbd05c1..ba5b295e22 100644 --- a/asn1/idmp/packet-idmp-template.c +++ b/asn1/idmp/packet-idmp-template.c @@ -154,7 +154,7 @@ static void dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t struct SESSION_DATA_STRUCTURE session; gboolean idmp_final; guint32 idmp_length; - fragment_data *fd_head; + fragment_head *fd_head; conversation_t *conv; guint32 dst_ref = 0; diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index bcaf10fcd4..d3fb26f02a 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -197,7 +197,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) proto_tree *next_tree=NULL; tvbuff_t *next_tvb = NULL; tvbuff_t *data_tvb = NULL; - fragment_data *frag_msg = NULL; + fragment_head *frag_msg = NULL; guint32 fragment_length; guint32 rtse_id = 0; gboolean data_handled = FALSE; diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index c439f84e23..48e03d7c52 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -292,12 +292,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; diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index 0a81847f06..0108b520c3 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -71,7 +71,7 @@ VAL_PTR=&Data_Field_field_type_value /* 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; @@ -176,7 +176,7 @@ VAL_PTR=&Data_Field_field_type_value /* 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*/ |