diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-02-03 15:37:01 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-02-03 17:48:40 +0000 |
| commit | 1b1b93429af01b13550c985978fa3808296d7f5d (patch) | |
| tree | 20c4d4a79f968bdd5782111bb7523f62d7257465 /asn1/m3ap/m3ap.cnf | |
| parent | 0421e7898861ba94b2eb353f1936e49565718b90 (diff) | |
M3AP: fix dissection of IPAddress field
Bug: 12070
Change-Id: Ib516cc3ea7e00a6c4fe1661b9c78b0f6c6a25da6
Reviewed-on: https://code.wireshark.org/review/13689
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1/m3ap/m3ap.cnf')
| -rw-r--r-- | asn1/m3ap/m3ap.cnf | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/asn1/m3ap/m3ap.cnf b/asn1/m3ap/m3ap.cnf index 64410d3e1a..dc7d9e8f32 100644 --- a/asn1/m3ap/m3ap.cnf +++ b/asn1/m3ap/m3ap.cnf @@ -136,7 +136,17 @@ ProtocolIE-Field/value ie_field_value return offset; tvb_len = tvb_reported_length(parameter_tvb); - proto_tree_add_item(tree, hf_m3ap_IPAddress, parameter_tvb, 0, tvb_len, ENC_NA); + switch (tvb_len) { + case 4: + proto_tree_add_item(tree, hf_m3ap_IPAddress_v4, parameter_tvb, 0, tvb_len, ENC_NA); + break; + case 6: + proto_tree_add_item(tree, hf_m3ap_IPAddress_v6, parameter_tvb, 0, tvb_len, ENC_NA); + break; + default: + proto_tree_add_expert(tree, actx->pinfo, &ei_m3ap_invalid_ip_address_len, parameter_tvb, 0, tvb_len); + break; + } #.END #.FN_BODY Absolute-Time-ofMBMS-Data VAL_PTR = ¶meter_tvb |