diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-19 11:02:19 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-19 11:02:19 +0000 |
| commit | 0543f20a15aa5fa46f94227b1dfbca5f84dda5e9 (patch) | |
| tree | bc35df403bf5dbf3a106fedc44918241748a5032 /asn1 | |
| parent | a59117bd872d4bfeec3eb4ed3d8ca59643631f18 (diff) | |
From LI Hai via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7736 :
Fix dissection error of D-RELEASE and D-CONNECT in TETRA dissector
svn path=/trunk/; revision=45004
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/tetra/tetra.asn | 4 | ||||
| -rw-r--r-- | asn1/tetra/tetra.cnf | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/asn1/tetra/tetra.asn b/asn1/tetra/tetra.asn index ad0ba74a75..e64e0b7f4e 100644 --- a/asn1/tetra/tetra.asn +++ b/asn1/tetra/tetra.asn @@ -1,5 +1,5 @@ -- TETRA packet dissection --- Copyright (c) 2007 - 2011 Professional Mobile Communication Research Group, +-- Copyright (c) 2007 - 2012 Professional Mobile Communication Research Group, -- Beijing Institute of Technology, China -- @@ -2139,7 +2139,7 @@ D-CONNECT::= optional-elements CHOICE{ no-type2 NULL, type2-parameters SEQUENCE { - call-priority CHOICE{none NULL, call-priority INTEGER (0..31)}, + call-priority CHOICE{none NULL, call-priority INTEGER (0..15)}, basic-service-information CHOICE{none NULL, basic-service-information Basic-service-information}, temporary-address CHOICE { none NULL, temporary-address Calling-party-address-type}, notification-indicator CHOICE { none NULL, notification-indicator INTEGER (0..63)}, diff --git a/asn1/tetra/tetra.cnf b/asn1/tetra/tetra.cnf index 2d148fdef2..c40d9fb4c2 100644 --- a/asn1/tetra/tetra.cnf +++ b/asn1/tetra/tetra.cnf @@ -115,11 +115,6 @@ BNCH col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT"); #.END -#.FN_BODY D-RELEASE -%(DEFAULT_BODY)s - col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE"); -#.END - #.FN_BODY D-CONNECT-ACK %(DEFAULT_BODY)s col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT-ACK"); |