osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41020?usp=email )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)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(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
osmith: Verified
fixeria: Looks good to me, approved
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: merged
Gerrit-Project: libosmo-asn1-tcap
Gerrit-Branch: master
Gerrit-Change-Id: Ib0aaa0f37f813851e8cfe28aaa22b105b5dcac17
Gerrit-Change-Number: 41020
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41019?usp=email )
Change subject: rebuild-from-asn.sh: Update to work with present-day osmocom asn1c
......................................................................
Abandoned
this script will be removed in https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41022
--
To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41019?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: abandon
Gerrit-Project: libosmo-asn1-tcap
Gerrit-Branch: master
Gerrit-Change-Id: I1e9b64112805a39bd4bc9d94b64d3d99516bd6c6
Gerrit-Change-Number: 41019
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria, neels, pespin.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41044?usp=email )
Change subject: msc: CC SETUP MT speech: verify bearer capabilities
......................................................................
Patch Set 5:
(2 comments)
File msc/BSC_ConnectionHandler.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41044/comment/0857e669_a1d5… :
PS4, Line 1137: BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_SETUP(cpars.transaction_id, *, cpars.called_party)));
> you may want to add explicit "*" param here to easily spot the differences.
Done
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41044/comment/118b384a_7976… :
PS4, Line 1142: valueof
> No need to use `valueof()` here because `bcap` is a template parameter: […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41044?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I8fd33cf2f7fb8a1c34851ecf54fccddd2efd0536
Gerrit-Change-Number: 41044
Gerrit-PatchSet: 5
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 Sep 2025 08:43:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-msc/+/41043?usp=email )
Change subject: gsm48_cc_tx_setup: fix speech bearer capabilities
......................................................................
Patch Set 3:
(4 comments)
File src/libmsc/gsm_04_08_cc.c:
https://gerrit.osmocom.org/c/osmo-msc/+/41043/comment/2afb317b_1b134fdf?usp… :
PS2, Line 994: * - We shall send spares for radio (which happens to be the same as
> what's "spares"? "spare bits"?
Done
> What do you mean with "radio" here?
'.radio' from the struct (radio channel requirement), clarified it
https://gerrit.osmocom.org/c/osmo-msc/+/41043/comment/60e393ef_f00fa793?usp… :
PS2, Line 997: * - We could send a speech version list in theory that MS are then
> "We could in theory send a speech version list that"
Done
https://gerrit.osmocom.org/c/osmo-msc/+/41043/comment/3c3bb533_715b9a10?usp… :
PS2, Line 1003: .radio = GSM48_BCAP_RRQ_FR_ONLY, /* spare */
> If it's a spare, imho it'd be better to add a hardcoded value, or add an explicit enum field (eg. […]
Done, this patch now depends on https://gerrit.osmocom.org/c/libosmocore/+/41056https://gerrit.osmocom.org/c/osmo-msc/+/41043/comment/5b76c735_3d3dd04c?usp… :
PS2, Line 1000: if (bearer_cap.transfer == GSM48_BCAP_ITCAP_SPEECH)
: bearer_cap = (struct gsm_mncc_bearer_cap){
: .transfer = GSM48_BCAP_ITCAP_SPEECH,
: .radio = GSM48_BCAP_RRQ_FR_ONLY, /* spare */
: .speech_ver = { -1 },
: };
:
> I suggest to avoid copying the given `struct gsm_mncc_bearer_cap`: […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41043?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I7046e9244fd9d4301ee2c4df1147a619f753739c
Gerrit-Change-Number: 41043
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 Sep 2025 08:43:02 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-msc/+/41040?usp=email )
Change subject: gsm48_cc_tx_setup_set_bearer_cap: split out
......................................................................
Patch Set 2:
(4 comments)
File src/libmsc/gsm_04_08_cc.c:
https://gerrit.osmocom.org/c/osmo-msc/+/41040/comment/7453c33a_e46c78f2?usp… :
PS1, Line 918: static int gsm48_cc_tx_setup_set_bearer_cap(struct gsm_trans *trans, const struct gsm_mncc *setup,
> Ack. […]
Done
https://gerrit.osmocom.org/c/osmo-msc/+/41040/comment/d0a6fc2f_03297e36?usp… :
PS1, Line 945: rc
> `rc` is set but not used here
Done
https://gerrit.osmocom.org/c/osmo-msc/+/41040/comment/eea0410a_7670ff2a?usp… :
PS1, Line 971: rc
> `rc` is set but not used here
Done
https://gerrit.osmocom.org/c/osmo-msc/+/41040/comment/2f84f9fb_a1fba147?usp… :
PS1, Line 1008: rc = gsm48_cc_tx_setup_set_bearer_cap(trans, setup, &bearer_cap);
> (trans, &bearer_cap, setup)
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41040?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I3fe6bb2af90d729bb32cae8f5a1a38dcf8f87eb9
Gerrit-Change-Number: 41040
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 Sep 2025 08:41:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-msc/+/41039?usp=email )
Change subject: gsm48_cc_tx_setup_select_codecs: split out
......................................................................
Patch Set 2:
(1 comment)
File src/libmsc/gsm_04_08_cc.c:
https://gerrit.osmocom.org/c/osmo-msc/+/41039/comment/a1f80fdd_287e3bf0?usp… :
PS1, Line 928: if (setup->fields & MNCC_F_BEARER_CAP)
> I believe because this chunk is not directly related to codec selection?
Yes, this is about changing bearer_cap.transfer from the default of GSM48_BCAP_ITCAP_SPEECH to e.g. GSM48_BCAP_ITCAP_UNR_DIG_INF (CSD), not about codec selection. So IMHO it makes more sense to leave it there.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41039?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ic502f9ed77ea57de4cf6d362c0e7070d9147d6f3
Gerrit-Change-Number: 41039
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 Sep 2025 08:40:59 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-msc/+/41038?usp=email )
Change subject: gsm48_cc_tx_setup_set_transaction_id: split out
......................................................................
Patch Set 2:
(2 comments)
File src/libmsc/gsm_04_08_cc.c:
https://gerrit.osmocom.org/c/osmo-msc/+/41038/comment/d531a250_0f7cd311?usp… :
PS1, Line 845: TX Setup with assigned transaction. This is not allowed
> I find this message a bit confusing, maybe say "transaction ID is already assigned"? […]
done in a separate patch
https://gerrit.osmocom.org/c/osmo-msc/+/41038/comment/3cfe702f_04097fa2?usp… :
PS1, Line 847: mncc_release_ind(trans->net, trans, trans->callref,
: GSM48_CAUSE_LOC_PRN_S_LU,
: GSM48_CC_CAUSE_RESOURCE_UNAVAIL);
:
> Maybe keep this in `gsm48_cc_tx_setup()`? […]
I've considered it, but `gsm48_cc_tx_setup_set_bearer_cap` which gets split out later also sends `mncc_release_ind` in some (not all!) error code paths. There we can't also keep `mncc_release_ind` in `gsm48_cc_tx_setup`, so for consistency I'll keep it in the split-out functions for now. This is probably something that can be improved in future patches.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41038?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I715f12d09570211a98b667c56960309bd326e8d8
Gerrit-Change-Number: 41038
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 Sep 2025 08:40:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>