aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/megaco
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2006-09-04 20:36:52 +0000
committerAnders Broman <anders.broman@ericsson.com>2006-09-04 20:36:52 +0000
commit33d4a980da328dd9ddadecb97bdae178cf082463 (patch)
tree9900ea03c485024d4bcb262def784e70c371cb07 /plugins/megaco
parent2a7bfe21f45b299b94caead4ea30ab3f800a9b24 (diff)
downloadwireshark-33d4a980da328dd9ddadecb97bdae178cf082463.tar.gz
wireshark-33d4a980da328dd9ddadecb97bdae178cf082463.tar.bz2
wireshark-33d4a980da328dd9ddadecb97bdae178cf082463.zip
Always dissect SDP info to set up RTP conversation.
svn path=/trunk/; revision=19138
Diffstat (limited to 'plugins/megaco')
-rw-r--r--plugins/megaco/packet-megaco.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c
index 8366d30e90..2fc1146119 100644
--- a/plugins/megaco/packet-megaco.c
+++ b/plugins/megaco/packet-megaco.c
@@ -348,12 +348,10 @@ dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_add_str(pinfo->cinfo, COL_PROTOCOL, "MEGACO");
/* Build the info tree if we've been given a root */
- if (tree){
- /* Create megaco subtree */
- ti = proto_tree_add_item(tree,proto_megaco,tvb, 0, -1, FALSE);
- megaco_tree = proto_item_add_subtree(ti, ett_megaco);
+ /* Create megaco subtree */
+ ti = proto_tree_add_item(tree,proto_megaco,tvb, 0, -1, FALSE);
+ megaco_tree = proto_item_add_subtree(ti, ett_megaco);
- }
if(global_megaco_dissect_tree)
my_proto_tree_add_string = proto_tree_add_string;
else
@@ -598,7 +596,6 @@ dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* TransToken = ("Transaction" / "T")
*/
-if(tree) { /* Only do the rest if tree built */
/* Find Context */
nextcontext:
tvb_previous_offset = tvb_find_guint8(tvb, tvb_current_offset,
@@ -1015,7 +1012,6 @@ nextcontext:
}
} while ( tvb_command_end_offset < tvb_len );
- }
if(global_megaco_raw_text){
tvb_raw_text_add(tvb, megaco_tree);
}