diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-10-01 13:48:36 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-10-01 13:48:36 +0000 |
commit | 23669a5ac72553f082abdeeab73a771c6d9d1bd8 (patch) | |
tree | 1497fae16e14e9a24713d680e384d2971dabdffd | |
parent | 05809c5f842c99408939092477d4dbe753b6333f (diff) |
Update to 3GPP TS 36.413 V8.7.0 (2009-09)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30231 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | asn1/s1ap/S1AP-CommonDataTypes.asn | 5 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-Constants.asn | 5 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-Containers.asn | 5 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-IEs.asn | 10 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-PDU-Contents.asn | 6 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-PDU-Descriptions.asn | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-s1ap.c | 5 |
7 files changed, 24 insertions, 16 deletions
diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn index 3ddbf35a2f..7af5c60833 100644 --- a/asn1/s1ap/S1AP-CommonDataTypes.asn +++ b/asn1/s1ap/S1AP-CommonDataTypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V8.6.1 (2009-06) +-- 3GPP TS 36.413 V8.7.0 (2009-09) -- 9.3.5 Common Definitions -- ************************************************************** -- @@ -9,7 +9,7 @@ S1AP-CommonDataTypes { itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) -eps-Access (20) modules (3) s1ap (1) version1 (1) s1ap-CommonDataTypes (3) } +eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-CommonDataTypes (3) } DEFINITIONS AUTOMATIC TAGS ::= @@ -33,3 +33,4 @@ ProtocolIE-ID ::= INTEGER (0..65535) TriggeringMessage ::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome } END + diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn index ff4e8779cd..4c76324b98 100644 --- a/asn1/s1ap/S1AP-Constants.asn +++ b/asn1/s1ap/S1AP-Constants.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V8.6.1 (2009-06) +-- 3GPP TS 36.413 V8.7.0 (2009-09) -- 9.3.6 Constant Definitions -- ************************************************************** -- @@ -9,7 +9,7 @@ S1AP-Constants { itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) -eps-Access (20) modules (3) s1ap (1) version1 (1) s1ap-Constants (4) } +eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-Constants (4) } DEFINITIONS AUTOMATIC TAGS ::= @@ -249,3 +249,4 @@ id-DefaultPagingDRX ProtocolIE-ID ::= 137 id-Source-ToTarget-TransparentContainer-Secondary ProtocolIE-ID ::= 138 id-Target-ToSource-TransparentContainer-Secondary ProtocolIE-ID ::= 139 END + diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn index 63883f424c..af1aeb8698 100644 --- a/asn1/s1ap/S1AP-Containers.asn +++ b/asn1/s1ap/S1AP-Containers.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V8.6.1 (2009-06) +-- 3GPP TS 36.413 V8.7.0 (2009-09) -- 9.3.7 Container Definitions -- ************************************************************** -- @@ -10,7 +10,7 @@ S1AP-Containers { itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) -eps-Access (20) modules (3) s1ap (1) version1 (1) s1ap-Containers (5) } +eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-Containers (5) } DEFINITIONS AUTOMATIC TAGS ::= @@ -199,3 +199,4 @@ PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE { } END + diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn index 719bf1359b..69a5bd8bb4 100644 --- a/asn1/s1ap/S1AP-IEs.asn +++ b/asn1/s1ap/S1AP-IEs.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V8.6.1 (2009-06) +-- 3GPP TS 36.413 V8.7.0 (2009-09) -- 9.3.4 Information Element Definitions -- ************************************************************** -- @@ -9,7 +9,7 @@ S1AP-IEs { itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) -eps-Access (20) modules (3) s1ap (1) version1 (1) s1ap-IEs (2) } +eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-IEs (2) } DEFINITIONS AUTOMATIC TAGS ::= @@ -178,7 +178,8 @@ CauseRadioNetwork ::= ENUMERATED { s1-inter-system-handover-triggered, x2-handover-triggered, ..., - redirection-towards-1xRTT + redirection-towards-1xRTT, + not-supported-QCI-value } @@ -785,7 +786,7 @@ ReportArea ::= ENUMERATED { ... } -RepetitionPeriod ::= INTEGER (0..4096) +RepetitionPeriod ::= INTEGER (0..4095) RNC-ID ::= INTEGER (0..4095) @@ -1176,3 +1177,4 @@ X2TNLConfigurationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { -- Z END + diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn index e9762a2b62..9e0a8ab6be 100644 --- a/asn1/s1ap/S1AP-PDU-Contents.asn +++ b/asn1/s1ap/S1AP-PDU-Contents.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V8.6.1 (2009-06) +-- 3GPP TS 36.413 V8.7.0 (2009-09) -- 9.3.3 PDU Definitions -- ************************************************************** -- @@ -9,7 +9,7 @@ S1AP-PDU-Contents { itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) -eps-Access (20) modules (3) s1ap (1) version1 (1) s1ap-PDU-Contents (1) } +eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-PDU-Contents (1) } DEFINITIONS AUTOMATIC TAGS ::= @@ -1655,6 +1655,7 @@ UplinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= { ... } + -- ************************************************************** -- -- UE CAPABILITY INFO INDICATION ELEMENTARY PROCEDURE @@ -2081,3 +2082,4 @@ PrivateMessageIEs S1AP-PRIVATE-IES ::= { } END + diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn index 46667cac2d..a96d4892db 100644 --- a/asn1/s1ap/S1AP-PDU-Descriptions.asn +++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 V8.6.1 (2009-06) +-- 3GPP TS 36.413 V8.7.0 (2009-09) -- 9.3.2 Elementary Procedure Definitions -- ************************************************************** -- @@ -9,7 +9,7 @@ S1AP-PDU-Descriptions { itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) -eps-Access (20) modules (3) s1ap (1) version1 (1) s1ap-PDU-Descriptions (0)} +eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-PDU-Descriptions (0)} DEFINITIONS AUTOMATIC TAGS ::= diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index a05ea56f53..56eaf62fe2 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -1773,6 +1773,7 @@ static const value_string s1ap_CauseRadioNetwork_vals[] = { { 34, "s1-inter-system-handover-triggered" }, { 35, "x2-handover-triggered" }, { 36, "redirection-towards-1xRTT" }, + { 37, "not-supported-QCI-value" }, { 0, NULL } }; @@ -1780,7 +1781,7 @@ static const value_string s1ap_CauseRadioNetwork_vals[] = { static int dissect_s1ap_CauseRadioNetwork(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 36, NULL, TRUE, 1, NULL); + 36, NULL, TRUE, 2, NULL); return offset; } @@ -3201,7 +3202,7 @@ dissect_s1ap_RIMTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_s1ap_RepetitionPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 4096U, NULL, FALSE); + 0U, 4095U, NULL, FALSE); return offset; } |