osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41020?usp=email )
Change subject: (cosmetic) asn: Remove trailing whitespace
......................................................................
(cosmetic) asn: Remove trailing whitespace
Change-Id: Ib0aaa0f37f813851e8cfe28aaa22b105b5dcac17
---
M asn/tcap.asn
1 file changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-asn1-tcap refs/changes/20/41020/1
diff --git a/asn/tcap.asn b/asn/tcap.asn
index 5b98942..9df2e5b 100644
--- a/asn/tcap.asn
+++ b/asn/tcap.asn
@@ -3,17 +3,17 @@
DEFINITIONS ::=
-BEGIN
+BEGIN
--EXPORTS OPERATION, ERROR, Component, InvokeId Type;
-- WS stuff
ExternalPDU ::= [UNIVERSAL 8] IMPLICIT SEQUENCE
{
oid OBJECT IDENTIFIER,
- dialog [0] IMPLICIT Dialog1
+ dialog [0] IMPLICIT Dialog1
}
-
-
+
+
Dialog1 ::= OCTET STRING
-- End WS
-- Transaction Portion fields
@@ -26,29 +26,29 @@
abort [APPLICATION 7] IMPLICIT Abort
}
-Unidirectional ::= SEQUENCE{
+Unidirectional ::= SEQUENCE{
dialoguePortion DialoguePortion OPTIONAL,
components ComponentPortion
}
-Begin ::= SEQUENCE{
+Begin ::= SEQUENCE{
otid OrigTransactionID,
dialoguePortion DialoguePortion OPTIONAL,
- components ComponentPortion OPTIONAL
+ components ComponentPortion OPTIONAL
}
-End ::= SEQUENCE{
+End ::= SEQUENCE{
dtid DestTransactionID,
dialoguePortion DialoguePortion OPTIONAL,
- components ComponentPortion OPTIONAL
+ components ComponentPortion OPTIONAL
}
-
-Continue ::= SEQUENCE {
+
+Continue ::= SEQUENCE {
otid OrigTransactionID,
dtid DestTransactionID,
dialoguePortion DialoguePortion OPTIONAL,
- components ComponentPortion OPTIONAL
+ components ComponentPortion OPTIONAL
}
Abort ::= SEQUENCE{
@@ -58,11 +58,11 @@
Reason ::= CHOICE{
p-abortCause P-AbortCause,
- u-abortCause DialoguePortion
+ u-abortCause DialoguePortion
}
-
--- NOTE - When the Abort Message is generated by the Transaction sublayer, a p-Abort Cause may be
--- present. The u-abortCause may be generated by the component sublayer in which case it is an ABRT
+
+-- NOTE - When the Abort Message is generated by the Transaction sublayer, a p-Abort Cause may be
+-- present. The u-abortCause may be generated by the component sublayer in which case it is an ABRT
-- APDU, or by the TC-User in which case it could be either an ABRT APDU or data in some user-defined
-- abstract syntax.
@@ -104,7 +104,7 @@
returnResultLast [2] IMPLICIT ReturnResult,
returnError [3] IMPLICIT ReturnError,
reject [4] IMPLICIT Reject,
- returnResultNotLast [7] IMPLICIT ReturnResult
+ returnResultNotLast [7] IMPLICIT ReturnResult
}
-- The Components are sequences of data elements.
@@ -116,7 +116,7 @@
parameter Parameter OPTIONAL }
Parameter ::= ANY
-
+
-- ANY is filled by the single ASN.1 data type following the keyword PARAMETER or the keyword ARGUMENT
-- in the type definition of a particular operation.
@@ -135,7 +135,7 @@
invokeID InvokeIdType,
errorCode ErrorCode,
parameter Parameter OPTIONAL }
-
+
-- ANY is filled by the single ASN.1 data type following the keyword PARAMETER in the type definition
-- of a particular error.
@@ -154,11 +154,11 @@
OPERATION ::= CHOICE {
localValue INTEGER,
- globalValue OBJECT IDENTIFIER }
+ globalValue OBJECT IDENTIFIER }
ERROR ::= CHOICE {
localValue INTEGER,
- globalValue OBJECT IDENTIFIER }
+ globalValue OBJECT IDENTIFIER }
-- OPERATIONS
@@ -185,7 +185,7 @@
-- shall reference an error value
--| type shall reference an error type
-- if no error value is specified
-
+
-- LinkedOperationNames ::= OperationList | empty
-- OperationList ::= Operation | OperationList "," Operation
-- Operation ::= value (OPERATION)
@@ -244,4 +244,4 @@
privateer [PRIVATE 20] IMPLICIT INTEGER
}
-END -- end of the TCAP Package Module
+END -- end of the TCAP Package Module
--
To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41020?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-asn1-tcap
Gerrit-Branch: master
Gerrit-Change-Id: Ib0aaa0f37f813851e8cfe28aaa22b105b5dcac17
Gerrit-Change-Number: 41020
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41021?usp=email )
Change subject: Fix decoding of TCAP messages
......................................................................
Fix decoding of TCAP messages
asn1c would fail while decoding the DialoguePortion of a TCAP message
probably because Tag APPLICATION 11 is sent as constructed tag and the
WS adaptation expects a primitive one.
Support for EXTERNAL needs newer asn1c.
Related: SYS#7486
Change-Id: I4a27a52b2be70b1fc50e0a3d5441ded4c151fe65
---
M asn/tcap.asn
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-asn1-tcap refs/changes/21/41021/1
diff --git a/asn/tcap.asn b/asn/tcap.asn
index 9df2e5b..2b967cd 100644
--- a/asn/tcap.asn
+++ b/asn/tcap.asn
@@ -66,11 +66,11 @@
-- APDU, or by the TC-User in which case it could be either an ABRT APDU or data in some user-defined
-- abstract syntax.
---DialoguePortion ::= [APPLICATION 11] EXPLICIT EXTERNAL
+DialoguePortion ::= [APPLICATION 11] EXPLICIT EXTERNAL
-- WS adaptation
-DialoguePortion ::= [APPLICATION 11] IMPLICIT DialogueOC
-DialogueOC ::= OCTET STRING
+--DialoguePortion ::= [APPLICATION 11] IMPLICIT DialogueOC
+--DialogueOC ::= OCTET STRING
-- The dialogue portion carries the dialogue control PDUs as value of the external data type.
-- The direct reference should be set to { ccitt recommendation q 773 as (1) dialogue-as (1) version (1) }
--
To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41021?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-asn1-tcap
Gerrit-Branch: master
Gerrit-Change-Id: I4a27a52b2be70b1fc50e0a3d5441ded4c151fe65
Gerrit-Change-Number: 41021
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41013?usp=email )
Change subject: dia/diameter_3gpp_ts29_229.dia: inherit only Line-Identifier
......................................................................
dia/diameter_3gpp_ts29_229.dia: inherit only Line-Identifier
That's the only type being used, and skip inheriting other types
avoids inherit problem below:
ETSI ES 283 035 has an AVP (vendor=ETSI) with same name "Event-Type" but
different content (enumerated) and vendor (ETSI) than the one in 3GPP TS
32.299 (grouped, vendor 3GPP).
When trying to inherit one from the other (through indirect TS 29.229),
diameter compiler fails with:
diameter_3gpp_ts32_299.dia failed: AVP Event-Type imported by @inherits diameter_etsi_es283_035 at line 0 defined at line 143
Change-Id: Iece0c768eb2dbb429726796a73274fd476cd1d0b
---
M dia/diameter_3gpp_ts29_229.dia
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/13/41013/1
diff --git a/dia/diameter_3gpp_ts29_229.dia b/dia/diameter_3gpp_ts29_229.dia
index ff1d8f7..62ac31f 100644
--- a/dia/diameter_3gpp_ts29_229.dia
+++ b/dia/diameter_3gpp_ts29_229.dia
@@ -24,7 +24,7 @@
@vendor 10415 3GPP
@inherits diameter_gen_base_rfc6733
-@inherits diameter_etsi_es283_035
+@inherits diameter_etsi_es283_035 Line-Identifier
@inherits diameter_rfc4005_nasreq
;; only attributes required by other applications are defined
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41013?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: Iece0c768eb2dbb429726796a73274fd476cd1d0b
Gerrit-Change-Number: 41013
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>