diff options
Diffstat (limited to 'epan/dissectors/packet-pdcp-lte.c')
| -rw-r--r-- | epan/dissectors/packet-pdcp-lte.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 85113f3c24..2726f82920 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -885,7 +885,7 @@ static int dissect_pdcp_irdyn_packet(proto_tree *tree, return offset; } - +#if 0 static int dissect_pdcp_ir_packet(proto_tree *tree, proto_item *root_item, tvbuff_t *tvb, @@ -1010,34 +1010,17 @@ static int dissect_pdcp_ir_packet(proto_tree *tree, /* Dynamic chain */ if (dynamic_chain_present) { -#if 0 offset = dissect_pdcp_dynamic_chain(tree, root_item, tvb, offset, p_pdcp_info, pinfo); -#endif - /* RoHC settings */ - p_rohc_info = ep_new(rohc_info); - - p_rohc_info->rohc_compression = p_pdcp_info->rohc_compression; - p_rohc_info->rohc_ip_version = p_pdcp_info->rohc_ip_version; - p_rohc_info->cid_inclusion_info = p_pdcp_info->cid_inclusion_info; - p_rohc_info->large_cid_present = p_pdcp_info->large_cid_present; - p_rohc_info->mode = p_pdcp_info->mode; - p_rohc_info->rnd = p_pdcp_info->rnd; - p_rohc_info->udp_checkum_present = p_pdcp_info->udp_checkum_present; - p_rohc_info->profile = p_pdcp_info->profile; - p_rohc_info->last_created_item = root_item; - - offset = dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info); - } return offset; } - +#endif static int dissect_pdcp_feedback_feedback1(proto_tree *tree, @@ -1946,6 +1929,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree guint8 base_header_byte; gboolean udp_checksum_needed = TRUE; gboolean ip_id_needed = TRUE; + rohc_info *p_rohc_info = NULL; /* Append this protocol name rather than replace. */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "PDCP-LTE"); @@ -2269,7 +2253,21 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* IR (1111110) */ if ((base_header_byte & 0xfe) == 0xfc) { - offset = dissect_pdcp_ir_packet(rohc_tree, rohc_ti, tvb, offset, p_pdcp_info, pinfo); + /* RoHC settings */ + p_rohc_info = ep_new(rohc_info); + + p_rohc_info->rohc_compression = p_pdcp_info->rohc_compression; + p_rohc_info->rohc_ip_version = p_pdcp_info->rohc_ip_version; + p_rohc_info->cid_inclusion_info = p_pdcp_info->cid_inclusion_info; + p_rohc_info->large_cid_present = p_pdcp_info->large_cid_present; + p_rohc_info->mode = p_pdcp_info->mode; + p_rohc_info->rnd = p_pdcp_info->rnd; + p_rohc_info->udp_checkum_present = p_pdcp_info->udp_checkum_present; + p_rohc_info->profile = p_pdcp_info->profile; + p_rohc_info->last_created_item = NULL; + + /*offset = dissect_pdcp_ir_packet(rohc_tree, rohc_ti, tvb, offset, p_pdcp_info, pinfo);*/ + offset = dissect_rohc_ir_packet(tvb, rohc_tree, pinfo, offset, 0, TRUE/* fool the ROCH dissector */, p_rohc_info); udp_checksum_needed = FALSE; ip_id_needed = FALSE; } |