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

72 files changed, 102 insertions, 101 deletions

diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c
index c9bb0034a1..c42e49e508 100644
--- a/epan/dissectors/packet-6lowpan.c
+++ b/epan/dissectors/packet-6lowpan.c
@@ -2260,7 +2260,7 @@ dissect_6lowpan_frag_first(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     /* Reassembly parameters. */
     tvbuff_t *          new_tvb = NULL;
     tvbuff_t *          frag_tvb = NULL;
-    fragment_data *     frag_data = NULL;
+    fragment_head *     frag_data = NULL;
     gboolean            save_fragmented;
 
     /* Create a tree for the fragmentation header. */
@@ -2378,7 +2378,7 @@ dissect_6lowpan_frag_middle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     proto_item *        ti = NULL;
     /* Reassembly parameters. */
     tvbuff_t *          new_tvb = NULL;
-    fragment_data *     frag_data = NULL;
+    fragment_head *     frag_data = NULL;
     gboolean            save_fragmented;
 
     /* Create a tree for the fragmentation header. */
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 273f211599..2f8f92729a 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -888,7 +888,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
      move asp back in atp?
   */
   if (atp_defragment && aspinfo.reply && (more_fragment || frag_number != 0)) {
-    fragment_data *fd_head;
+    fragment_head *fd_head;
     int hdr;
 
     hdr = ATP_HDRSIZE -1;
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 1bd189eb48..d387fc1b2d 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -10797,7 +10797,7 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             /* not resetting the offset so the remaining can be done */
 
     if (fragment) { /* fragmented */
-        fragment_data *frag_msg;
+        fragment_head *frag_msg;
 
         pinfo->fragmented = TRUE;
 
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index 357ab2d69c..b32c7ae68c 100644
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -2240,7 +2240,7 @@ static void dissect_batadv_unicast_frag_v12(tvbuff_t *tvb, packet_info *pinfo, p
 	struct unicast_frag_packet_v12 *unicast_frag_packeth;
 	const guint8  *dest_addr, *orig_addr;
 	gboolean save_fragmented = FALSE;
-	fragment_data *frag_msg = NULL;
+	fragment_head *frag_msg = NULL;
 	proto_tree *batadv_unicast_frag_tree = NULL, *flag_tree;
 
 	tvbuff_t *new_tvb;
@@ -2346,7 +2346,7 @@ static void dissect_batadv_unicast_frag_v14(tvbuff_t *tvb, packet_info *pinfo, p
 	struct unicast_frag_packet_v14 *unicast_frag_packeth;
 	const guint8  *dest_addr, *orig_addr;
 	gboolean save_fragmented = FALSE;
-	fragment_data *frag_msg = NULL;
+	fragment_head *frag_msg = NULL;
 	proto_tree *batadv_unicast_frag_tree = NULL, *flag_tree;
 
 	tvbuff_t *new_tvb;
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index f6b5f11413..3fbc143f14 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -1349,7 +1349,7 @@ static void ber_defragment_init(void) {
 static int
 reassemble_octet_string(asn1_ctx_t *actx, proto_tree *tree, gint hf_id, tvbuff_t *tvb, int offset, guint32 con_len, gboolean ind, tvbuff_t **out_tvb)
 {
-    fragment_data *fd_head         = NULL;
+    fragment_head *fd_head         = NULL;
     tvbuff_t      *next_tvb        = NULL;
     tvbuff_t      *reassembled_tvb = NULL;
     guint16        dst_ref         = 0;
diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c
index e64f79f7ac..c3e3fd3d70 100644
--- a/epan/dissectors/packet-btobex.c
+++ b/epan/dissectors/packet-btobex.c
@@ -1250,7 +1250,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
 static void
 dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-    fragment_data *frag_msg       = NULL;
+    fragment_head *frag_msg       = NULL;
     gboolean       save_fragmented, complete;
     tvbuff_t*      new_tvb        = NULL;
     tvbuff_t*      next_tvb       = NULL;
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index 8a74c52c91..dcee1551ea 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -1374,7 +1374,7 @@ dissect_capwap_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
     gboolean fragment_more;
     guint32 fragment_id;
     guint32 fragment_offset;
-    fragment_data *frag_msg = NULL;
+    fragment_head *frag_msg = NULL;
     gboolean save_fragmented;
 
     /* Make entries in Protocol column and Info column on summary display */
@@ -1461,7 +1461,7 @@ dissect_capwap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     gboolean fragment_more;
     guint32 fragment_id;
     guint32 fragment_offset;
-    fragment_data *frag_msg = NULL;
+    fragment_head *frag_msg = NULL;
     gboolean save_fragmented;
 
     /* Make entries in Protocol column and Info column on summary display */
diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c
index 78d520f976..bd5736840b 100644
--- a/epan/dissectors/packet-cell_broadcast.c
+++ b/epan/dissectors/packet-cell_broadcast.c
@@ -316,7 +316,7 @@ dissect_gsm_cell_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
    guint16       serial_number, message_id;
    tvbuff_t      *cbs_page_tvb = NULL;
    tvbuff_t      *cbs_msg_tvb = NULL;
-   fragment_data * frag_data = NULL;
+   fragment_head * frag_data = NULL;
 
    len = tvb_length(tvb);
 
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index 03165d6c30..a216a506d6 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -232,7 +232,7 @@ dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint           next_length;
     proto_tree     *discpdu_tree;
     gboolean        save_in_error_pkt;
-    fragment_data  *fd_head;
+    fragment_head  *fd_head;
     tvbuff_t       *next_tvb;
     gboolean        update_col_info = TRUE;
     gboolean        save_fragmented;
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index f7f5cf192e..4b91698926 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -3257,7 +3257,7 @@ dissect_dcerpc_cn_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
 {
     gint           length, reported_length;
     gboolean       save_fragmented;
-    fragment_data *fd_head = NULL;
+    fragment_head *fd_head = NULL;
 
     tvbuff_t *auth_tvb, *payload_tvb, *decrypted_tvb;
     proto_item *pi;
@@ -4056,7 +4056,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                     }
                 } else if (hdr->flags&PFC_LAST_FRAG) {  /* LAST fragment */
                     if ( value->rep_frame ) {
-                        fragment_data *fd_head;
+                        fragment_head *fd_head;
 
                         fd_head = fragment_add_seq_next(&dcerpc_co_reassembly_table,
                                                         tvb, offset,
@@ -4990,7 +4990,7 @@ dissect_dcerpc_dg_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
 {
     int            length, reported_length, stub_length;
     gboolean       save_fragmented;
-    fragment_data *fd_head;
+    fragment_head *fd_head;
     tvbuff_t      *next_tvb;
     proto_item    *pi;
     proto_item    *parent_pi;
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index 1dd89591f4..6c86508de1 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -6640,7 +6640,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     dcm_state_pdv_t *pdv = NULL;
 
     tvbuff_t *next_tvb = NULL;
-    fragment_data *head = NULL;
+    fragment_head *head = NULL;
 
     guint32 reassembly_id;
     guint32 pdv_body_len;
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index 7b70fe0641..c7b5ddfc26 100644
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -256,7 +256,7 @@ dissect_pft_fec_detailed(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
   gboolean fec _U_,
   guint16 rsk,
   guint16 rsz,
-  fragment_data *fdx
+  fragment_head *fdx
 )
 {
   guint32 decoded_size;
@@ -281,8 +281,8 @@ dissect_pft_fec_detailed(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
   else {
     guint fragments=0;
     guint32 *got;
-    fragment_data *fd;
-    fragment_data *fd_head;
+    fragment_item *fd;
+    fragment_head *fd_head;
 
     if(tree)
       proto_tree_add_text (tree, tvb, 0, -1, "want %d, got %d need %d",
@@ -300,7 +300,7 @@ dissect_pft_fec_detailed(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
     /* have we got enough for Reed Solomon to try to correct ? */
     if(fragments>=rx_min) { /* yes, in theory */
       guint i,current_findex;
-      fragment_data *frag=NULL;
+      fragment_head *frag=NULL;
       guint8 *dummy_data = (guint8*) ep_alloc0 (plen);
       tvbuff_t *dummytvb = tvb_new_real_data(dummy_data, plen, plen);
       /* try and decode with missing fragments */
@@ -393,7 +393,7 @@ dissect_pft_fragmented(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
 {
   gboolean first, last;
   tvbuff_t *new_tvb=NULL;
-  fragment_data *frag_edcp = NULL;
+  fragment_head *frag_edcp = NULL;
   pinfo->fragmented = TRUE;
   first = findex == 0;
   last = fcount == (findex+1);
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 085b15ddb6..e1928e8a18 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -3025,7 +3025,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       if (! (tr_fir && tr_fin))
       {
         guint                  conv_seq_number;
-        fragment_data         *frag_msg;
+        fragment_head         *frag_msg;
         conversation_t        *conversation;
         dnp3_conv_t           *conv_data_ptr;
         dl_conversation_key_t  dl_conversation_key;
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 1d3dfff439..801c371ed6 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -1250,7 +1250,7 @@ dissect_dtls_handshake(tvbuff_t *tvb, packet_info *pinfo,
   for (; offset < record_length; offset += fragment_length,
          first_iteration = FALSE) /* set up for next pass, if any */
     {
-      fragment_data *frag_msg = NULL;
+      fragment_head *frag_msg = NULL;
       tvbuff_t      *new_tvb  = NULL;
       const gchar   *frag_str = NULL;
       gboolean       fragmented;
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c
index 77fa0db503..517ea220b7 100644
--- a/epan/dissectors/packet-dtn.c
+++ b/epan/dissectors/packet-dtn.c
@@ -326,7 +326,7 @@ dissect_tcp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
         conv_hdr = tvb_get_guint8(tvb, frame_offset);
         if((conv_hdr & TCP_CONVERGENCE_TYPE_MASK) == TCP_CONVERGENCE_DATA_SEGMENT) {
-            fragment_data *frag_msg;
+            fragment_head *frag_msg;
             tvbuff_t      *new_tvb;
             proto_tree    *bundle_tree;
             proto_tree    *conv_proto_tree;
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index f3bbb575f6..d17b18ee10 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -4207,7 +4207,7 @@ dissect_dvbci_tpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     guint8         hdr_tag                = NO_TAG;
     tvbuff_t      *body_tvb, *payload_tvb = NULL;
     proto_item    *pi;
-    fragment_data *frag_msg               = NULL;
+    fragment_head *frag_msg               = NULL;
 
 
     tpdu_len = tvb_reported_length(tvb);
@@ -4282,7 +4282,7 @@ dissect_dvbci_lpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     guint8         tcid, more_last;
     proto_item    *pi;
     tvbuff_t      *payload_tvb = NULL;
-    fragment_data *frag_msg    = NULL;
+    fragment_head *frag_msg    = NULL;
 
 
     payload_len = tvb_reported_length(tvb);
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index 2261b26117..3d76511df0 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -997,7 +997,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
             otherwise we just call dissector.
           */
           if (needs_reassembly) {
-            fragment_data   *fd_head;
+            fragment_head   *fd_head;
 
             /*
              * Yes, this frame contains a fragment that requires
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 7cde39d6d4..f35b808d06 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -692,7 +692,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
     int vft_offset = -1;
     gboolean is_lastframe_inseq, is_1frame_inseq/*, is_valid_frame*/;
     gboolean is_exchg_resp = 0;
-    fragment_data *fcfrag_head;
+    fragment_head *fcfrag_head;
     guint32 frag_id;
     guint32 frag_size;
     guint8 df_ctl, seq_id;
diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c
index 340fcbfb52..8c253cd90c 100644
--- a/epan/dissectors/packet-gsm_cbch.c
+++ b/epan/dissectors/packet-gsm_cbch.c
@@ -331,7 +331,7 @@ dissect_schedule_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree
 static void
 dissect_cbch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-    fragment_data *frag_data = NULL;
+    fragment_head *frag_data = NULL;
     guint8         octet, lb, lpd, seq_num;
     guint32        offset;
     guint32        len;
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index b695aaaf01..b14b2516da 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -2643,7 +2643,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset
     proto_item        *item;
     proto_tree        *subtree = NULL;
     tvbuff_t          *sm_tvb = NULL;
-    fragment_data     *fd_sm = NULL;
+    fragment_head     *fd_sm = NULL;
     guint8            fill_bits;
     guint32           out_len, total_sms_len, len_sms, length_ucs2, i;
     char              *ustr;
diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index e6cd369c45..7982c49e3d 100644
--- a/epan/dissectors/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
@@ -205,7 +205,7 @@ parse_gsm_sms_ud_message(proto_tree *sm_tree, tvbuff_t *tvb, packet_info *pinfo,
     guint32        i                         = 0;
     /* Multiple Messages UDH */
     gboolean       is_fragmented             = FALSE;
-    fragment_data *fd_sm                     = NULL;
+    fragment_head *fd_sm                     = NULL;
     guint16        sm_id                     = 0;
     guint16        frags                     = 0;
     guint16        frag                      = 0;
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index 7e2fb4f4ad..ad8c616d29 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -191,7 +191,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	gint32 tag;
 	guint32 len1;
 	const char *oid;
-	fragment_data *fd_head=NULL;
+	fragment_head *fd_head=NULL;
 	gssapi_frag_info_t *fi;
 	tvbuff_t *volatile gss_tvb=NULL;
 	asn1_ctx_t asn1_ctx;
diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c
index 859c55f801..ffedc46ea8 100644
--- a/epan/dissectors/packet-hci_usb.c
+++ b/epan/dissectors/packet-hci_usb.c
@@ -104,7 +104,7 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
     hci_data_t     *hci_data;
     gint            p2p_dir_save;
     guint32         session_id;
-    fragment_data  *reassembled;
+    fragment_head  *reassembled;
 
     if (tvb_length_remaining(tvb, offset) <= 0)
         return 0;
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 51b94feee5..278e6223fa 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -2147,7 +2147,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr
   iax_call_dirdata *dirdata;
   gpointer          value          = NULL;
   guint32           frag_offset    = 0;
-  fragment_data    *fd_head;
+  fragment_head    *fd_head;
   gboolean          must_desegment = FALSE;
 
   DISSECTOR_ASSERT(iax_call);
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c
index 8510b144e1..011af56a33 100644
--- a/epan/dissectors/packet-idmp.c
+++ b/epan/dissectors/packet-idmp.c
@@ -636,7 +636,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/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index f987bd6b65..ea2d0eaec1 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -5921,7 +5921,7 @@ dissect_gas_comeback_response(proto_tree *tree, tvbuff_t *tvb, packet_info *pinf
     if (anqp && (frag == 0) && !more)
       dissect_anqp(query, tvb, pinfo, offset, FALSE);
     else {
-      fragment_data *frag_msg;
+      fragment_head *frag_msg;
       gboolean save_fragmented;
       tvbuff_t *new_tvb;
 
@@ -14296,7 +14296,7 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
    */
   save_fragmented = pinfo->fragmented;
   if (wlan_defragment && (more_frags || (frag_number != 0))) {
-    fragment_data *fd_head;
+    fragment_head *fd_head;
 
     /*
      * If we've already seen this frame, look it up in the
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index ea691640a1..6321e503ba 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -1928,7 +1928,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
   guint16    flags;
   guint8     nxt;
   guint16    ipsum;
-  fragment_data *ipfd_head = NULL;
+  fragment_head *ipfd_head = NULL;
   tvbuff_t   *next_tvb;
   gboolean   update_col_info = TRUE;
   gboolean   save_fragmented;
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index a88397e38a..d98cb4a407 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -1679,7 +1679,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint16 offlg;
   guint32 ident;
   int offset;
-  fragment_data *ipfd_head;
+  fragment_head *ipfd_head;
   tvbuff_t   *next_tvb;
   gboolean update_col_info = TRUE;
   gboolean save_fragmented = FALSE;
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index f96e8846da..b391e3a09e 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -3814,7 +3814,7 @@ dissect_cisco_fragmentation(tvbuff_t *tvb, int offset, int length, proto_tree *t
   {
     gboolean save_fragmented;
     tvbuff_t *defrag_isakmp_tvb = NULL;
-    fragment_data *frag_msg = NULL;
+    fragment_head *frag_msg = NULL;
 
     save_fragmented = pinfo->fragmented;
     pinfo->fragmented = TRUE;
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 32fafdc217..3e6979211d 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -4912,7 +4912,7 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf
 
   tvbuff_t      *new_tvb  = NULL;
   tvbuff_t      *next_tvb = NULL;
-  fragment_data *frag_msg = NULL;
+  fragment_head *frag_msg = NULL;
 
   proto_tree_add_text(parameter_tree, parameter_tvb, offset, -1, "Application transport parameter fields:");
   proto_item_set_text(parameter_item, "Application transport, (%u byte%s length)", length , plurality(length, "", "s"));
diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c
index 35b272a3aa..8a8867bd51 100644
--- a/epan/dissectors/packet-lapdm.c
+++ b/epan/dissectors/packet-lapdm.c
@@ -286,7 +286,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
      */
     if( (control & XDLC_I_MASK) == XDLC_I && reassemble_lapdm )
     {
-            fragment_data *fd_m = NULL;
+            fragment_head *fd_m = NULL;
             tvbuff_t *reassembled = NULL;
             guint32 fragment_id;
             gboolean save_fragmented = pinfo->fragmented;
diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c
index f614b0ce6f..beda41f7d8 100644
--- a/epan/dissectors/packet-lapsat.c
+++ b/epan/dissectors/packet-lapsat.c
@@ -520,7 +520,7 @@ dissect_lapsat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		/*
 		 * Potentially fragmented I frames
 		 */
-		fragment_data *fd_m = NULL;
+		fragment_head *fd_m = NULL;
 		tvbuff_t *reassembled = NULL;
 		guint32 fragment_id;
 		gboolean save_fragmented = pinfo->fragmented;
diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c
index 5bdbb97f56..2671cc355f 100644
--- a/epan/dissectors/packet-ltp.c
+++ b/epan/dissectors/packet-ltp.c
@@ -233,7 +233,7 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int
 
 	tvbuff_t *datatvb;
 
-	fragment_data *frag_msg = NULL;
+	fragment_head *frag_msg = NULL;
 	gboolean more_frags = TRUE;
 
 	tvbuff_t *new_tvb = NULL;
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index b1de4cc001..270d6b8285 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -463,7 +463,7 @@ mp2t_get_packet_length(tvbuff_t *tvb, guint offset, packet_info *pinfo,
 			guint32 frag_id, enum pid_payload_type pload_type)
 {
 
-	fragment_data *frag    = NULL;
+	fragment_head *frag    = NULL;
 	tvbuff_t      *len_tvb = NULL, *frag_tvb = NULL, *data_tvb = NULL;
 	gint           pkt_len = 0;
 	guint          remaining_len;
@@ -532,7 +532,7 @@ mp2t_fragment_handle(tvbuff_t *tvb, guint offset, packet_info *pinfo,
 		     gboolean fragment_last, enum pid_payload_type pload_type)
 {
 	/* proto_item *ti; */
-	fragment_data *frag_msg = NULL;
+	fragment_head *frag_msg = NULL;
 	tvbuff_t      *new_tvb  = NULL;
 	gboolean       save_fragmented;
 
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index 0e6bebefb8..cc6d55a7b7 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -2384,7 +2384,7 @@ reassemble_mq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 if (mq_reassembly)
                 {
                     tvbuff_t* next_tvb;
-                    fragment_data* fd_head;
+                    fragment_head* fd_head;
                     guint32 iConnectionId = (pinfo->srcport + pinfo->destport);
                     if (opcode > 0x80 && !bFirstSegment) iBeginLength = 28;
                     fd_head = fragment_add_seq_next(&mq_reassembly_table,
diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c
index ba89506c4e..2f272bc8e0 100644
--- a/epan/dissectors/packet-mux27010.c
+++ b/epan/dissectors/packet-mux27010.c
@@ -901,7 +901,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             guint8 msg_end;
             guint8 msg_flag;
 
-            fragment_data *frag_msg = NULL;
+            fragment_head *frag_msg = NULL;
             tvbuff_t *new_tvb = NULL;
             tvbuff_t *next_tvb2 = NULL;
 
diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc
index 478dd8e491..c0e96f4018 100644
--- a/epan/dissectors/packet-ncp2222.inc
+++ b/epan/dissectors/packet-ncp2222.inc
@@ -7120,7 +7120,7 @@ nds_defrag(tvbuff_t *tvb, packet_info *pinfo, guint32 nw_connection, guint8 sequ
     guint               len=0;
     guint32             tid = 1;
     tvbuff_t            *frag_tvb = NULL;
-    fragment_data       *fd_head;
+    fragment_head       *fd_head;
     ncp_req_hash_value  *request_value = NULL;
     conversation_t      *conversation;
     guint32             nds_frag;
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 28b28b9477..2653c88739 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -3100,7 +3100,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	gboolean save_fragmented, save_writable;
 	gboolean do_frag = TRUE;
 	tvbuff_t* new_tvb = NULL;
-	fragment_data *frag_msg = NULL;
+	fragment_head *frag_msg = NULL;
 
 	top_tree=tree; /* scsi should open its expansions on the top level */
 
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index 8dc1f83855..27daf7eaf0 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -4332,7 +4332,7 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     guint                 len=0;
     tvbuff_t            *next_tvb = NULL;
-    fragment_data       *fd_head;
+    fragment_head       *fd_head;
     spx_info            *spx_info_p;
     ndps_req_hash_value *request_value = NULL;
     conversation_t      *conversation;
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index b3bdbeaca0..ffc5dc0ab4 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -1070,7 +1070,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	guint16			session_id;
 	gboolean		save_fragmented;
 	int			len;
-	fragment_data		*fd_head;
+	fragment_head		*fd_head;
 	tvbuff_t		*next_tvb;
 
 	int offset = 0;
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c
index 38a8a52bbc..927294dcf4 100644
--- a/epan/dissectors/packet-opensafety.c
+++ b/epan/dissectors/packet-opensafety.c
@@ -1085,7 +1085,7 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb , packet_info *pinfo, prot
     gint        calcDataLength;
     gboolean    isResponse, decodePayload, isEndSegment, isSegmented, saveFragmented;
     tvbuff_t* new_tvb = NULL;
-	fragment_data *frag_msg = NULL;
+    fragment_head *frag_msg = NULL;
 
     dataLength = tvb_get_guint8(message_tvb, OSS_FRAME_POS_LEN + frameStart1);
     decodePayload = FALSE;
diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c
index a4871d5136..5bc1e54db6 100644
--- a/epan/dissectors/packet-openvpn.c
+++ b/epan/dissectors/packet-openvpn.c
@@ -197,7 +197,7 @@ dissect_openvpn_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_tree    *type_tree;
   guint32        msg_length_remaining;
   gboolean       msg_lastframe;
-  fragment_data *frag_msg;
+  fragment_head *frag_msg;
   tvbuff_t      *new_tvb;
   gboolean       save_fragmented;
 
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index bc134c74a1..3b334475b5 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -924,7 +924,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu,
   gboolean fragment = FALSE;
   guint32  fragment_length = 0;
   tvbuff_t *next_tvb;
-  fragment_data *fd_head;
+  fragment_head *fd_head;
   conversation_t *conv;
   guint     tpdu_len;
 
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index 03ccf0a3c3..36b72969ce 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -1291,7 +1291,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       fragment_start_seq_check (&p_mul_reassembly_table,
                                 pinfo, message_id, NULL, no_pdus - 1);
     } else if (pdu_type == Data_PDU) {
-      fragment_data *frag_msg;
+      fragment_head *frag_msg;
       tvbuff_t      *new_tvb;
 
       pinfo->fragmented = TRUE;
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index d31193824b..249cc28237 100644
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -134,7 +134,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   int                    linelen;
   int                    tokenlen;
   const guchar           *next_token;
-  fragment_data          *frag_msg = NULL;
+  fragment_head          *frag_msg = NULL;
   tvbuff_t               *next_tvb = NULL;
   conversation_t         *conversation = NULL;
   struct pop_data_val    *data_val = NULL;
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index 31bac84b1b..146f5ef9c0 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -736,7 +736,8 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint32        dlt;
     guint32        n_ext_flags = 0;
     guint32        ampdu_id    = 0;
-    fragment_data *fd_head     = NULL, *ft_fdh = NULL;
+    fragment_head *fd_head     = NULL;
+    fragment_item *ft_fdh      = NULL;
     gint           mpdu_count  = 0;
     gchar         *mpdu_str;
     gboolean       first_mpdu  = TRUE;
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index 37b1154317..737cdf7fa5 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -2575,7 +2575,7 @@ dissect_q931_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	guint16		info_element_len;
 	gboolean	first_frag, more_frags;
 	guint32		frag_len;
-	fragment_data *fd_head;
+	fragment_head *fd_head;
 	tvbuff_t *next_tvb = NULL;
 
 	q931_pi=ep_new(q931_packet_info);
diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index 81cd125255..a727d8f2ca 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -3926,7 +3926,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   const char           *msg_method_str  = NULL;
   gboolean              fragmented      = FALSE;
   gboolean              last_fragment   = FALSE;
-  fragment_data        *reload_fd_head  = NULL;
+  fragment_head        *reload_fd_head  = NULL;
   guint32               fragment        = 0;
   gboolean              save_fragmented = FALSE;
   gboolean              update_col_info = TRUE;
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index ecdef223b6..58c778c59d 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -1864,7 +1864,7 @@ make_fake_rpc_prog_if_needed (rpc_prog_info_key *prpc_prog_key, guint prog_ver)
 
 static gboolean
 dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-    tvbuff_t *frag_tvb, fragment_data *ipfd_head, gboolean is_tcp,
+    tvbuff_t *frag_tvb, fragment_head *ipfd_head, gboolean is_tcp,
     guint32 rpc_rm, gboolean first_pdu)
 {
 	guint32	msg_type;
@@ -3009,7 +3009,7 @@ make_frag_tree(tvbuff_t *tvb, proto_tree *tree, int proto, gint ett,
 
 void
 show_rpc_fraginfo(tvbuff_t *tvb, tvbuff_t *frag_tvb, proto_tree *tree,
-    guint32 rpc_rm, fragment_data *ipfd_head, packet_info *pinfo)
+    guint32 rpc_rm, fragment_head *ipfd_head, packet_info *pinfo)
 {
     proto_item *frag_tree_item;
 
@@ -3041,7 +3041,7 @@ show_rpc_fraginfo(tvbuff_t *tvb, tvbuff_t *frag_tvb, proto_tree *tree,
 static gboolean
 call_message_dissector(tvbuff_t *tvb, tvbuff_t *rec_tvb, packet_info *pinfo,
     proto_tree *tree, tvbuff_t *frag_tvb, rec_dissector_t dissector,
-    fragment_data *ipfd_head, guint32 rpc_rm, gboolean first_pdu)
+    fragment_head *ipfd_head, guint32 rpc_rm, gboolean first_pdu)
 {
 	const char *saved_proto;
 	volatile gboolean rpc_succeeded;
@@ -3101,7 +3101,7 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	gboolean save_fragmented;
 	rpc_fragment_key old_rfk, *rfk, *new_rfk;
 	conversation_t *conversation;
-	fragment_data *ipfd_head;
+	fragment_head *ipfd_head;
 	tvbuff_t *rec_tvb;
 
 	if (pinfo == NULL || pinfo->private_data == NULL) {
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index fac8fea3c2..8d0901fb60 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -1107,7 +1107,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 	if(msp && msp->startseq < seqno && msp->endseq >= seqno) {
 		guint32 fid = msp->startseq;
-		fragment_data *fd_head;
+		fragment_head *fd_head;
 
 #ifdef DEBUG_FRAGMENTS
 		g_debug("\tContinues fragment %d", fid);
@@ -1192,7 +1192,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	{
 		guint32 deseg_offset = pinfo->desegment_offset;
 		guint32 frag_len = tvb_reported_length_remaining(newtvb, deseg_offset);
-		fragment_data *fd_head = NULL;
+		fragment_head *fd_head = NULL;
 
 #ifdef DEBUG_FRAGMENTS
 		g_debug("\tRTP Must Desegment: tvb_len=%d ds_len=%d %d frag_len=%d ds_off=%d",
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c
index 47af605438..f1c2b538b7 100644
--- a/epan/dissectors/packet-rtse.c
+++ b/epan/dissectors/packet-rtse.c
@@ -748,7 +748,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/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index e2e2b0dfd0..1b02b33ec2 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -2631,7 +2631,7 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree,
   guint16   offset = 0;
   gboolean  save_fragmented;
   tvbuff_t *new_tvb = NULL;
-  fragment_data *frag_msg = NULL;
+  fragment_head *frag_msg = NULL;
   guint32   source_local_ref = 0;
   guint8    more;
   guint     msg_offset = tvb_offset_from_real_beginning(tvb);
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index d9e2fa592b..a7116e323b 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -5477,7 +5477,7 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     const char       *old_proto;
     cmdset_t         *csdata;
     guint32           expected_length;
-    fragment_data    *ipfd_head;
+    fragment_head    *ipfd_head;
     tvbuff_t         *next_tvb        = tvb;
     gboolean          update_col_info = TRUE;
     gboolean          more_frags      = FALSE;
diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c
index 293d144e10..9eb49ae31e 100644
--- a/epan/dissectors/packet-selfm.c
+++ b/epan/dissectors/packet-selfm.c
@@ -1548,7 +1548,7 @@ dissect_fastser_readresp_frame(tvbuff_t *tvb, proto_tree *fastser_tree, packet_i
 
     /* Check for fragmented packet by looking at the FIR and FIN bits */
     if (! (seq_fir && seq_fin)) {
-        fragment_data         *frag_msg;
+        fragment_head         *frag_msg;
 
         /* This is a fragmented packet, mark it as such */
         pinfo->fragmented = TRUE;
diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c
index d52506e8bd..6102410af0 100644
--- a/epan/dissectors/packet-ses.c
+++ b/epan/dissectors/packet-ses.c
@@ -1132,7 +1132,7 @@ dissect_spdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
 		}
 	} else {
 		conversation_t *conversation = NULL;
-		fragment_data *frag_msg = NULL;
+		fragment_head *frag_msg = NULL;
 		gint fragment_len;
 		guint32 ses_id = 0;
 
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index f9fffcac88..3e9f9f47af 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -3286,7 +3286,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree
 	gboolean save_fragmented;
 	guint reported_len;
 
-	fragment_data *fd_head;
+	fragment_head *fd_head;
 	tvbuff_t *new_tvb;
     proto_item *frag_tree_item;
 
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 6850b620dd..5841d576b5 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -1057,11 +1057,11 @@ smb_trans_reassembly_init(void)
 	    &addresses_reassembly_table_functions);
 }
 
-static fragment_data *
+static fragment_head *
 smb_trans_defragment(proto_tree *tree _U_, packet_info *pinfo, tvbuff_t *tvb,
 		     int offset, guint count, guint pos, guint totlen)
 {
-	fragment_data *fd_head = NULL;
+	fragment_head *fd_head = NULL;
 	smb_info_t    *si;
 	int            more_frags;
 
@@ -8968,7 +8968,7 @@ dissect_nt_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
 	guint16                 bc;
 	guint32                 padcnt;
 	smb_nt_transact_info_t *nti    = NULL;
-	fragment_data          *r_fd   = NULL;
+	fragment_head          *r_fd   = NULL;
 	tvbuff_t               *pd_tvb = NULL;
 	gboolean                save_fragmented;
 
@@ -9584,7 +9584,7 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 	static nt_trans_data    ntd;
 	guint16                 bc;
 	gint32                  padcnt;
-	fragment_data          *r_fd   = NULL;
+	fragment_head          *r_fd   = NULL;
 	tvbuff_t               *pd_tvb = NULL;
 	gboolean                save_fragmented;
 
@@ -16486,7 +16486,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
 	guint16               bc;
 	int                   padcnt;
 	gboolean              dissected_trans;
-	fragment_data        *r_fd   = NULL;
+	fragment_head        *r_fd   = NULL;
 	tvbuff_t             *pd_tvb = NULL, *d_tvb = NULL, *p_tvb = NULL;
 	tvbuff_t             *s_tvb  = NULL, *sp_tvb = NULL;
 	gboolean              save_fragmented;
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 672ceac1b5..be321fdbad 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -365,7 +365,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   gint                       next_offset;
   gint                       loffset   = 0;
   int                        cmdlen;
-  fragment_data             *frag_msg  = NULL;
+  fragment_head             *frag_msg  = NULL;
   tvbuff_t                  *next_tvb;
   guint8                    *decrypt   = NULL;
   guint8                    *base64_string   = NULL;
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index 23cc6a52bb..ca821808e7 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -1653,7 +1653,7 @@ static tvbuff_t*
 defragment_by_sequence(packet_info *pinfo, tvbuff_t *tvb, int offset, int mpf,
     int id)
 {
-	fragment_data *fd_head;
+	fragment_head *fd_head;
 	int frag_number = -1;
 	int more_frags = TRUE;
 	tvbuff_t *rh_tvb = NULL;
diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c
index 4846746521..55ed2c36bf 100644
--- a/epan/dissectors/packet-sndcp.c
+++ b/epan/dissectors/packet-sndcp.c
@@ -316,7 +316,7 @@ dissect_sndcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   else {
     /* Try reassembling fragments
      */
-    fragment_data  *fd_npdu         = NULL;
+    fragment_head  *fd_npdu         = NULL;
     guint32         reassembled_in  = 0;
     gboolean        save_fragmented = pinfo->fragmented;
 
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 1009ab1190..2f7903bd4b 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -974,7 +974,7 @@ desegment_ssl(tvbuff_t *tvb, packet_info *pinfo, int offset,
               proto_tree *root_tree, proto_tree *tree,
               SslFlow *flow)
 {
-    fragment_data *ipfd_head;
+    fragment_head *ipfd_head;
     gboolean       must_desegment;
     gboolean       called_dissector;
     int            another_pdu_follows;
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*/
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index e2817bb8ce..69d78e723c 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -1569,7 +1569,7 @@ tcp_print_sequence_number_analysis(packet_info *pinfo, tvbuff_t *tvb, proto_tree
 }
 
 static void
-print_tcp_fragment_tree(fragment_data *ipfd_head, proto_tree *tree, proto_tree *tcp_tree, packet_info *pinfo, tvbuff_t *next_tvb)
+print_tcp_fragment_tree(fragment_head *ipfd_head, proto_tree *tree, proto_tree *tcp_tree, packet_info *pinfo, tvbuff_t *next_tvb)
 {
     proto_item *tcp_tree_item, *frag_tree_item;
 
@@ -1615,7 +1615,7 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset,
               struct tcp_analysis *tcpd)
 {
     struct tcpinfo *tcpinfo = (struct tcpinfo *)pinfo->private_data;
-    fragment_data *ipfd_head;
+    fragment_head *ipfd_head;
     int last_fragment_len;
     gboolean must_desegment;
     gboolean called_dissector;
@@ -4659,7 +4659,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             tcpd->fwd->fin = pinfo->fd->num;
             msp=(struct tcp_multisegment_pdu *)se_tree_lookup32_le(tcpd->fwd->multisegment_pdus, tcph->th_seq-1);
             if(msp) {
-                fragment_data *ipfd_head;
+                fragment_head *ipfd_head;
 
                 ipfd_head = fragment_add(&tcp_reassembly_table, tvb, offset,
                                          pinfo, msp->first_frame, NULL,
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 6e05a7b1a8..8de38ee32e 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -2321,7 +2321,7 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint8 packet_number;
     gboolean save_fragmented;
     int len;
-    fragment_data *fd_head;
+    fragment_head *fd_head;
     tvbuff_t *next_tvb;
     conversation_t *conv;
     tds_conv_info_t *tds_info;
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 7204f0f766..90177b5a66 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -379,7 +379,7 @@ static void ts2_standard_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 {
     guint8 save_fragmented;
     tvbuff_t *new_tvb, *next_tvb;
-    fragment_data *frag_msg ;
+    fragment_head *frag_msg ;
     guint16 fragment_number;
     ts2_frag *frag;
     gboolean outoforder;
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c
index ea5094d348..e06a8e79f1 100644
--- a/epan/dissectors/packet-tipc.c
+++ b/epan/dissectors/packet-tipc.c
@@ -836,7 +836,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i
 	gboolean save_fragmented;
 	guint32 frag_no, frag_msg_no;
 	tvbuff_t* new_tvb = NULL;
-	fragment_data *frag_msg = NULL;
+	fragment_head *frag_msg = NULL;
 
 	message_type = (tvb_get_guint8(tipc_tvb, offset) >>5) & 0x7;
 
@@ -1811,7 +1811,7 @@ dissect_tipc_int_prot_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tipc_tr
 	gboolean save_fragmented;
 	tvbuff_t* new_tvb = NULL;
 	tvbuff_t* next_tvb = NULL;
-	fragment_data *frag_msg = NULL;
+	fragment_head *frag_msg = NULL;
 	proto_item *item;
 
 	link_lev_seq_no = tvb_get_ntohl(tvb, 4) & 0xffff;
diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c
index 1d7d551796..aa3b03e58a 100644
--- a/epan/dissectors/packet-usb-audio.c
+++ b/epan/dissectors/packet-usb-audio.c
@@ -175,7 +175,7 @@ dissect_usb_midi_event(tvbuff_t *tvb, packet_info *pinfo,
     if (is_sysex_code(code))
     {
         tvbuff_t* new_tvb = NULL;
-        fragment_data *frag_sysex_msg = NULL;
+        fragment_head *frag_sysex_msg = NULL;
 
         pinfo->fragmented = TRUE;
 
diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c
index 810b449d4d..f9446f10ba 100644
--- a/epan/dissectors/packet-wai.c
+++ b/epan/dissectors/packet-wai.c
@@ -831,7 +831,7 @@ Figure 18 from [ref:1]
     guint16        packet_num;
     guint8         fragment_num;
     guint8         flags;
-    fragment_data *frag_msg;
+    fragment_head *frag_msg;
     proto_tree    *wai_tree     = NULL;
     tvbuff_t      *next_tvb;
     tvbuff_t      *new_tvb;
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index 946b9fb1de..219822bee3 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -681,7 +681,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
              ) && tvb_bytes_exist(tvb, dataOffset, dataLen) )
         {
             /* Try reassembling fragments */
-            fragment_data *fd_wtp = NULL;
+            fragment_head *fd_wtp = NULL;
             guint32 reassembled_in = 0;
             gboolean save_fragmented = pinfo->fragmented;
 
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index 0060674bd7..fd35798720 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -1295,7 +1295,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     gint payload_len;
     guint32 frag_key;
     void *saved_private_data;
-    fragment_data *fd_head;
+    fragment_head *fd_head;
 
 
     guint8 spi;
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c
index bf1c18ae8f..869f5cdfce 100644
--- a/epan/dissectors/packet-zbee-aps.c
+++ b/epan/dissectors/packet-zbee-aps.c
@@ -876,7 +876,7 @@ dissect_zbee_aps_no_endpt:
     if ((payload_tvb) && (packet.fragmentation != ZBEE_APS_EXT_FCF_FRAGMENT_NONE)) {
         guint32         msg_id;
         guint32         block_num;
-        fragment_data   *frag_msg = NULL;
+        fragment_head   *frag_msg = NULL;
         tvbuff_t        *new_tvb;
 
         /* Set the fragmented flag. */
diff --git a/epan/dissectors/rpc_defrag.h b/epan/dissectors/rpc_defrag.h
index dde0c57662..3bf5c434cd 100644
--- a/epan/dissectors/rpc_defrag.h
+++ b/epan/dissectors/rpc_defrag.h
@@ -34,10 +34,10 @@
 #define RPC_RM_FRAGLEN	0x7fffffffU
 
 typedef gboolean (*rec_dissector_t)(tvbuff_t *, packet_info *, proto_tree *,
-	tvbuff_t *, fragment_data *, gboolean, guint32, gboolean);
+	tvbuff_t *, fragment_head *, gboolean, guint32, gboolean);
 
 extern void show_rpc_fraginfo(tvbuff_t *tvb, tvbuff_t *frag_tvb,
-	proto_tree *tree, guint32 rpc_rm, fragment_data *ipfd_head, packet_info *pinfo);
+	proto_tree *tree, guint32 rpc_rm, fragment_head *ipfd_head, packet_info *pinfo);
 extern int dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	proto_tree *tree, rec_dissector_t dissector, gboolean is_heur,
 	int proto, int ett, gboolean defragment, gboolean first_pdu);