Use correct offset.
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 9 Dec 2011 06:16:07 +0000 (06:16 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 9 Dec 2011 06:16:07 +0000 (06:16 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40125 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/packet-pdcp-lte.c
epan/dissectors/packet-rohc.c

index 90b578b6ca513c517561d143dd0dbfd4c876d549..85113f3c247c20549397eab41f3a318f1607187e 100644 (file)
@@ -881,7 +881,7 @@ static int dissect_pdcp_irdyn_packet(proto_tree *tree,
        p_rohc_info->profile             = p_pdcp_info->profile;
        p_rohc_info->last_created_item   = root_item;
 
        p_rohc_info->profile             = p_pdcp_info->profile;
        p_rohc_info->last_created_item   = root_item;
 
-       dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info);
+       offset = dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info);
     return offset;
 }
 
     return offset;
 }
 
@@ -1031,7 +1031,7 @@ static int dissect_pdcp_ir_packet(proto_tree *tree,
                p_rohc_info->profile             = p_pdcp_info->profile;
                p_rohc_info->last_created_item   = root_item;
 
                p_rohc_info->profile             = p_pdcp_info->profile;
                p_rohc_info->last_created_item   = root_item;
 
-               dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info);
+               offset = dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info);
 
     }
 
 
     }
 
index 0a18d33fb1fde1037f64c371adeac32ed1415c08..df81651752bda00191380f7aba775eeb11e02606 100644 (file)
@@ -460,8 +460,7 @@ dissect_rohc_ir_rtp_profile_dynamic(tvbuff_t *tvb, proto_tree *tree, int offset,
        }
 
        proto_item_set_len(item, offset - start_offset);
        }
 
        proto_item_set_len(item, offset - start_offset);
-       proto_tree_add_text(tree, tvb, offset, -1, "RTP data");
-
+       
        return offset;
 
 }
        return offset;
 
 }
@@ -524,7 +523,7 @@ dissect_rohc_ir_rtp_udp_profile_static(tvbuff_t *tvb, proto_tree *tree, packet_i
                offset+=2;
                if(p_rohc_info->profile == ROHC_PROFILE_UDP){
                        if(d==TRUE){
                offset+=2;
                if(p_rohc_info->profile == ROHC_PROFILE_UDP){
                        if(d==TRUE){
-                               dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info);
+                               offset = dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info);
                        }
                        proto_item_set_len(item, offset - start_offset);
                        proto_tree_add_text(tree, tvb, offset, -1, "UDP data");
                        }
                        proto_item_set_len(item, offset - start_offset);
                        proto_tree_add_text(tree, tvb, offset, -1, "UDP data");
@@ -539,10 +538,9 @@ dissect_rohc_ir_rtp_udp_profile_static(tvbuff_t *tvb, proto_tree *tree, packet_i
 
                /* D:   D = 1 indicates that the dynamic chain is present. */
                if(d==TRUE){
 
                /* D:   D = 1 indicates that the dynamic chain is present. */
                if(d==TRUE){
-                       dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info);
-               }else{
-                       proto_tree_add_text(tree, tvb, offset, -1, "RTP data");
+                       offset = dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info);
                }
                }
+               proto_tree_add_text(tree, tvb, offset, -1, "RTP data");
        }
 }
 
        }
 }