diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-08 16:49:34 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-08 17:47:35 +0000 |
| commit | 6652620f272a1d408e291e2738576af1c3127333 (patch) | |
| tree | 98849cb6f5fe919287cff61682520d40180dfb54 /epan/dissectors/asn1/m2ap | |
| parent | 1e83b59af8698256c11bb66fe13f912f3ba75471 (diff) | |
M2AP: display IP address in a subtree
Change-Id: Ic1853e1d265797e482495b8d07aa324545a7442e
Reviewed-on: https://code.wireshark.org/review/17579
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Diffstat (limited to 'epan/dissectors/asn1/m2ap')
| -rw-r--r-- | epan/dissectors/asn1/m2ap/m2ap.cnf | 11 | ||||
| -rw-r--r-- | epan/dissectors/asn1/m2ap/packet-m2ap-template.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/epan/dissectors/asn1/m2ap/m2ap.cnf b/epan/dissectors/asn1/m2ap/m2ap.cnf index fd019a08d2..724a7f96f9 100644 --- a/epan/dissectors/asn1/m2ap/m2ap.cnf +++ b/epan/dissectors/asn1/m2ap/m2ap.cnf @@ -72,7 +72,7 @@ ProtocolIE-Field/value ie_field_value message_type = UNSUCCESSFUL_OUTCOME; #.FN_BODY PLMN-Identity VAL_PTR = ¶meter_tvb - tvbuff_t *parameter_tvb=NULL; + tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_m2ap_PLMN_Identity); @@ -81,20 +81,21 @@ ProtocolIE-Field/value ie_field_value #.END #.FN_BODY IPAddress VAL_PTR = ¶meter_tvb - tvbuff_t *parameter_tvb=NULL; + tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { gint tvb_len = tvb_reported_length(parameter_tvb); + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_m2ap_IPAddress); switch (tvb_len) { case 4: - proto_tree_add_item(tree, hf_m2ap_IPAddress_v4, parameter_tvb, 0, tvb_len, ENC_NA); + proto_tree_add_item(subtree, hf_m2ap_IPAddress_v4, parameter_tvb, 0, tvb_len, ENC_NA); break; case 6: - proto_tree_add_item(tree, hf_m2ap_IPAddress_v6, parameter_tvb, 0, tvb_len, ENC_NA); + proto_tree_add_item(subtree, hf_m2ap_IPAddress_v6, parameter_tvb, 0, tvb_len, ENC_NA); break; default: - proto_tree_add_expert(tree, actx->pinfo, &ei_m2ap_invalid_ip_address_len, parameter_tvb, 0, tvb_len); + proto_tree_add_expert(subtree, actx->pinfo, &ei_m2ap_invalid_ip_address_len, parameter_tvb, 0, tvb_len); break; } } diff --git a/epan/dissectors/asn1/m2ap/packet-m2ap-template.c b/epan/dissectors/asn1/m2ap/packet-m2ap-template.c index f705504e5e..315521fda0 100644 --- a/epan/dissectors/asn1/m2ap/packet-m2ap-template.c +++ b/epan/dissectors/asn1/m2ap/packet-m2ap-template.c @@ -55,6 +55,7 @@ static int hf_m2ap_IPAddress_v6 = -1; /* Initialize the subtree pointers */ static int ett_m2ap = -1; static int ett_m2ap_PLMN_Identity = -1; +static int ett_m2ap_IPAddress = -1; #include "packet-m2ap-ett.c" static expert_field ei_m2ap_invalid_ip_address_len = EI_INIT; @@ -155,6 +156,7 @@ proto_register_m2ap(void) { static gint *ett[] = { &ett_m2ap, &ett_m2ap_PLMN_Identity, + &ett_m2ap_IPAddress, #include "packet-m2ap-ettarr.c" }; |