aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/snmp
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2011-04-13 15:48:24 +0000
committerStephen Fisher <steve@stephen-fisher.com>2011-04-13 15:48:24 +0000
commitfcfcfa347ca36415b0b2e65dbe9d221977d07747 (patch)
treed539181cf734ac4a8a22ffb7780df4225a1b099d /asn1/snmp
parent25ab8f9594490decef1b687c478c22d269f2991b (diff)
Rollback r36614 and change dissect_SMUX_PDUs_PDU() to use previously
unused smux_tree instead of tree. Per suggestion from Stig on -dev. svn path=/trunk/; revision=36624
Diffstat (limited to 'asn1/snmp')
-rw-r--r--asn1/snmp/packet-snmp-template.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 216a6c01eb..f92a614ba1 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -1773,6 +1773,7 @@ dissect_snmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static void
dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
+ proto_tree *smux_tree = NULL;
proto_item *item = NULL;
next_tvb_init(&var_list);
@@ -1781,10 +1782,10 @@ dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, FALSE);
- proto_item_add_subtree(item, ett_smux);
+ smux_tree = proto_item_add_subtree(item, ett_smux);
}
- dissect_SMUX_PDUs_PDU(tvb, pinfo, tree);
+ dissect_SMUX_PDUs_PDU(tvb, pinfo, smux_tree);
}