diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-10-20 21:05:37 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-10-20 21:05:37 +0000 |
| commit | b552143a5cc71cebd2e1d256c2cd06e28d4814d2 (patch) | |
| tree | 7555596aa9bd99b3dfa4527335bfc9f15fb93669 /asn1 | |
| parent | 24ba431d800d133274175c5bcc6e858b18dde43f (diff) | |
| download | wireshark-b552143a5cc71cebd2e1d256c2cd06e28d4814d2.tar.gz | |
Put PDU dissection in protocol tree
svn path=/trunk/; revision=52724
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/ilp/ilp.cnf | 10 | ||||
| -rw-r--r-- | asn1/ulp/ulp.cnf | 24 |
2 files changed, 25 insertions, 9 deletions
diff --git a/asn1/ilp/ilp.cnf b/asn1/ilp/ilp.cnf index 9f2c1a9234..d76b27e882 100644 --- a/asn1/ilp/ilp.cnf +++ b/asn1/ilp/ilp.cnf @@ -25,12 +25,20 @@ SETId/min minsi #.END #.FN_HDR ILP-PDU - proto_tree_add_item(tree, proto_ilp, tvb, 0, -1, ENC_NA); + proto_item *it; + proto_tree *ilp_tree; + + it = proto_tree_add_item(tree, proto_ilp, tvb, 0, -1, ENC_NA); + ilp_tree = proto_item_add_subtree(it, ett_ilp); col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, PSNAME); col_clear(actx->pinfo->cinfo, COL_INFO); #.END +#.FN_BODY ILP-PDU TREE=ilp_tree +%(DEFAULT_BODY)s +#.END + #.FN_BODY IlpMessage VAL_PTR = &IlpMessage guint32 IlpMessage; diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf index b982b242db..f2d4802fe9 100644 --- a/asn1/ulp/ulp.cnf +++ b/asn1/ulp/ulp.cnf @@ -26,10 +26,18 @@ SETId/min minsi #.END #.FN_HDR ULP-PDU - proto_tree_add_item(tree, proto_ulp, tvb, 0, -1, ENC_NA); + proto_item *it; + proto_tree *ulp_tree; - col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, PSNAME); - col_clear(actx->pinfo->cinfo, COL_INFO); + it = proto_tree_add_item(tree, proto_ulp, tvb, 0, -1, ENC_NA); + ulp_tree = proto_item_add_subtree(it, ett_ulp); + + col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, PSNAME); + col_clear(actx->pinfo->cinfo, COL_INFO); +#.END + +#.FN_BODY ULP-PDU TREE=ulp_tree +%(DEFAULT_BODY)s #.END #.FN_BODY UlpMessage VAL_PTR = &UlpMessage @@ -48,7 +56,7 @@ guint32 UlpMessage; %(DEFAULT_BODY)s if (rrlp_tvb && rrlp_handle) { - call_dissector(rrlp_handle, rrlp_tvb, %(ACTX)s->pinfo, tree); + call_dissector(rrlp_handle, rrlp_tvb, %(ACTX)s->pinfo, tree); } #.FN_BODY Ver2-PosPayLoad-extension/lPPPayload/_item VAL_PTR = &lpp_tvb @@ -57,21 +65,21 @@ guint32 UlpMessage; %(DEFAULT_BODY)s if (lpp_tvb && lpp_handle) { - call_dissector(lpp_handle, lpp_tvb, %(ACTX)s->pinfo, tree); + call_dissector(lpp_handle, lpp_tvb, %(ACTX)s->pinfo, tree); } #.FN_BODY ThirdPartyID/sip-uri -# asn2wrs does not handle '%' in the resticted string ( Has to be there twice) +# asn2wrs does not handle '%' in the restricted string ( Has to be there twice) offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index, 1, 255, FALSE, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:./-_~%%#@?", 72, NULL); #.FN_BODY ThirdPartyID/ims-public-identity -# asn2wrs does not handle '%' in the resticted string ( Has to be there twice) +# asn2wrs does not handle '%' in the restricted string ( Has to be there twice) offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index, 1, 255, FALSE, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:./-_~%%#@?", 72, NULL); #.FN_BODY ThirdPartyID/uri -# asn2wrs does not handle '%' in the resticted string ( Has to be there twice) +# asn2wrs does not handle '%' in the restricted string ( Has to be there twice) offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index, 1, 255, FALSE, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./-_~%%#", 69, NULL); |