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 /plugins | |
| parent | f3a2aba863df76151c77a43893478be297142a2d (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 'plugins')
| -rw-r--r-- | plugins/m2m/packet-m2m.c | 2 | ||||
| -rw-r--r-- | plugins/opcua/opcua.c | 2 | ||||
| -rw-r--r-- | plugins/profinet/packet-pn-rt.c | 4 | ||||
| -rw-r--r-- | plugins/wimax/mac_hd_generic_decoder.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index 81c43ecb9d..59df3fd3bc 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -435,7 +435,7 @@ static void cdma_code_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint /* Decode and display the PDU Burst */ static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo, gint burst_number, gint frag_type, gint frag_number) { - fragment_data *pdu_frag; + fragment_head *pdu_frag; tvbuff_t *pdu_tvb = NULL; /* update the info column */ diff --git a/plugins/opcua/opcua.c b/plugins/opcua/opcua.c index 524ff3a38d..ddd32e5a4e 100644 --- a/plugins/opcua/opcua.c +++ b/plugins/opcua/opcua.c @@ -313,7 +313,7 @@ static void dissect_opcua_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree guint32 opcua_seqid = 0; guint32 opcua_num = 0; guint32 opcua_seqnum = 0; - fragment_data *frag_msg = NULL; + fragment_head *frag_msg = NULL; offset = 3; diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index e86832f28d..13d5bcd246 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -429,7 +429,7 @@ dissect_FRAG_PDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void { guint32 u32FragID; guint32 u32ReasembleID /*= 0xfedc ??*/; - fragment_data *pdu_frag; + fragment_head *pdu_frag; u32FragID = (u16FrameID & 0xf); if (uFragNumber == 0) @@ -452,7 +452,7 @@ dissect_FRAG_PDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void } if (!bMoreFollows) /* last fragment */ { - pdu_frag = (fragment_data *)g_hash_table_lookup(reasembled_frag_table, GUINT_TO_POINTER(pinfo->fd->num)); + pdu_frag = (fragment_head *)g_hash_table_lookup(reasembled_frag_table, GUINT_TO_POINTER(pinfo->fd->num)); if (pdu_frag) /* found a matching fragment; dissect it */ { guint16 type; diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index c5bedb040e..3abcaa7a00 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -722,7 +722,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto proto_tree *child_tree = NULL; tvbuff_t *payload_tvb; tvbuff_t *data_pdu_tvb; - fragment_data *payload_frag; + fragment_head *payload_frag; gboolean first_arq_fb_payload = TRUE; dissector_handle_t mac_payload_handle; |