diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2011-04-13 15:48:24 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2011-04-13 15:48:24 +0000 |
| commit | fcfcfa347ca36415b0b2e65dbe9d221977d07747 (patch) | |
| tree | d539181cf734ac4a8a22ffb7780df4225a1b099d /epan/dissectors/packet-snmp.c | |
| parent | 25ab8f9594490decef1b687c478c22d269f2991b (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 'epan/dissectors/packet-snmp.c')
| -rw-r--r-- | epan/dissectors/packet-snmp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 89340c0fae..b54339a0d2 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -2997,6 +2997,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); @@ -3005,10 +3006,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); } @@ -3632,7 +3633,7 @@ void proto_register_snmp(void) { NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2147 "../../asn1/snmp/packet-snmp-template.c" +#line 2148 "../../asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3672,7 +3673,7 @@ void proto_register_snmp(void) { &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2163 "../../asn1/snmp/packet-snmp-template.c" +#line 2164 "../../asn1/snmp/packet-snmp-template.c" }; module_t *snmp_module; |