diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-09 21:21:32 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-10 01:51:21 +0000 |
| commit | e6c87fe6b13f43d0c74ea8516d83a38ea4317688 (patch) | |
| tree | 27eb9cf5e28b7fdb4fd99477b64e1062b7102cf6 /plugins/opcua/opcua_transport_layer.c | |
| parent | 9b182b7097e339501977f595903c2e837055fb1d (diff) | |
convert to proto_tree_add_subtree[_format] for plugin dissectors
Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97
Reviewed-on: https://code.wireshark.org/review/2974
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/opcua/opcua_transport_layer.c')
| -rw-r--r-- | plugins/opcua/opcua_transport_layer.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/opcua/opcua_transport_layer.c index daecc02a07..8c8a080551 100644 --- a/plugins/opcua/opcua_transport_layer.c +++ b/plugins/opcua/opcua_transport_layer.c @@ -186,12 +186,10 @@ int parseService(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) * THIS WILL CHAHNGE IN THE FUTURE. */ /* add encodeable object subtree */ - ti = proto_tree_add_text(tree, tvb, *pOffset, -1, "OpcUa Service : Encodeable Object"); - encobj_tree = proto_item_add_subtree(ti, ett_opcua_extensionobject); + encobj_tree = proto_tree_add_subtree(tree, tvb, *pOffset, -1, ett_opcua_extensionobject, &ti, "OpcUa Service : Encodeable Object"); /* add nodeid subtree */ - ti_inner = proto_tree_add_text(encobj_tree, tvb, *pOffset, -1, "TypeId : ExpandedNodeId"); - nodeid_tree = proto_item_add_subtree(ti_inner, ett_opcua_nodeid); + nodeid_tree = proto_tree_add_subtree(encobj_tree, tvb, *pOffset, -1, ett_opcua_nodeid, &ti_inner, "TypeId : ExpandedNodeId"); ServiceId = parseServiceNodeId(nodeid_tree, tvb, pOffset); proto_item_set_end(ti_inner, tvb, *pOffset); @@ -220,12 +218,10 @@ int parseOpenSecureChannel(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) proto_tree_add_item(tree, hf_opcua_transport_rqid, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; /* add encodeable object subtree */ - ti = proto_tree_add_text(tree, tvb, *pOffset, -1, "Message : Encodeable Object"); - encobj_tree = proto_item_add_subtree(ti, ett_opcua_extensionobject); + encobj_tree = proto_tree_add_subtree(tree, tvb, *pOffset, -1, ett_opcua_extensionobject, &ti, "Message : Encodeable Object"); /* add nodeid subtree */ - ti_inner = proto_tree_add_text(encobj_tree, tvb, *pOffset, -1, "TypeId : ExpandedNodeId"); - nodeid_tree = proto_item_add_subtree(ti_inner, ett_opcua_nodeid); + nodeid_tree = proto_tree_add_subtree(encobj_tree, tvb, *pOffset, -1, ett_opcua_nodeid, &ti_inner, "TypeId : ExpandedNodeId"); ServiceId = parseServiceNodeId(nodeid_tree, tvb, pOffset); proto_item_set_end(ti_inner, tvb, *pOffset); @@ -251,12 +247,10 @@ int parseCloseSecureChannel(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) parseSecurityLayer(tree, tvb, pOffset); /* add encodeable object subtree */ - ti = proto_tree_add_text(tree, tvb, *pOffset, -1, "Message : Encodeable Object"); - encobj_tree = proto_item_add_subtree(ti, ett_opcua_extensionobject); + encobj_tree = proto_tree_add_subtree(tree, tvb, *pOffset, -1, ett_opcua_extensionobject, &ti, "Message : Encodeable Object"); /* add nodeid subtree */ - ti_inner = proto_tree_add_text(encobj_tree, tvb, *pOffset, -1, "TypeId : ExpandedNodeId"); - nodeid_tree = proto_item_add_subtree(ti_inner, ett_opcua_nodeid); + nodeid_tree = proto_tree_add_subtree(encobj_tree, tvb, *pOffset, -1, ett_opcua_nodeid, &ti_inner, "TypeId : ExpandedNodeId"); ServiceId = parseServiceNodeId(nodeid_tree, tvb, pOffset); proto_item_set_end(ti_inner, tvb, *pOffset); |