diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-05-02 12:21:49 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-05-08 17:44:04 +0000 |
commit | 954548fdb951cbffbfa3c7cadb2c202919c0204c (patch) | |
tree | 99f94f8cb4db12aaf12047680133f3e2331e2f9b | |
parent | c88e60f9fb2269d8204e4a8e79d8723561fb38ca (diff) | |
download | wireshark-954548fdb951cbffbfa3c7cadb2c202919c0204c.tar.gz wireshark-954548fdb951cbffbfa3c7cadb2c202919c0204c.tar.bz2 wireshark-954548fdb951cbffbfa3c7cadb2c202919c0204c.zip |
qsig: fix conflicting entry in its value_string
Field 'Error' (qsig.error) has a conflicting entry in its value_string: 43 is at indices 12 (proceduralError) and 42 (notActivated))
Change-Id: I17fcebc677495033dedad57dd0c3d87631152290
Reviewed-on: https://code.wireshark.org/review/21456
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | epan/dissectors/asn1/qsig/QSIG-DND.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-qsig.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/asn1/qsig/QSIG-DND.asn b/epan/dissectors/asn1/qsig/QSIG-DND.asn index bb4302078a..a0a5711951 100644 --- a/epan/dissectors/asn1/qsig/QSIG-DND.asn +++ b/epan/dissectors/asn1/qsig/QSIG-DND.asn @@ -200,7 +200,7 @@ ServiceList ::= BIT STRING -- for other Supplementary Services temporarilyUnavailable ERROR ::= { CODE local: 1000} -notActivated ERROR ::= { CODE local: 43} +--notActivated ERROR ::= { CODE local: 43} unspecified ERROR ::= { PARAMETER Extension{{DNDExtSet}} diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 214dcba9b0..3a9604389d 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -569,7 +569,6 @@ static const value_string qsig_str_error[] = { /* --- Module Do-Not-Disturb-Operations-asn1-97 --- --- --- */ { 1000, "temporarilyUnavailable" }, - { 43, "notActivated" }, { 1008, "unspecified" }, /* --- Module Call-Intrusion-Operations-asn1-97 --- --- --- */ @@ -12235,7 +12234,6 @@ static const qsig_err_t qsig_err_tab[] = { /* --- Module Do-Not-Disturb-Operations-asn1-97 --- --- --- */ /* temporarilyUnavailable */ { 1000, NULL }, - /* notActivated */ { 43, NULL }, /* unspecified */ { 1008, dissect_qsig_dnd_Extension_PDU }, /* --- Module Call-Intrusion-Operations-asn1-97 --- --- --- */ |