aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2022-03-04 00:05:43 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2022-03-07 14:38:11 +0100
commit9fe1320a7899121de6e4bf9861c114d35864c814 (patch)
treef0d1bfe0bc751e79bddcf15490f88faabce7848e
parenta23f3b1ecb7c7a99978be4f8a2fb477660e868b3 (diff)
bsc: add missing codec list in AoIP Handover Request
So far, osmo-bsc ignored the Codec List (MSC Preferred) in inter-BSC incoming HO Request messages. Starting with osmo-bsc I117cc29d6d11db77d160de654f43f5993db6ee21, a missing codec list on AoIP causes incoming inter-BSC HO to fail, as it should (3GPP TS 48.008 indicates that a codec list shall be included on AoIP). To avoid test fallout when merging above osmo-bsc patch, add a codec list to HO Request on AoIP. Related: OS#5839 Change-Id: If06de9c9b43d79f749447a4e2a340176eef75c79
-rw-r--r--bsc/BSC_Tests.ttcn7
-rw-r--r--library/BSSMAP_Templates.ttcn5
2 files changed, 9 insertions, 3 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index f203d952..0da29160 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1693,7 +1693,12 @@ function f_gen_handover_req(integer bssap_idx := 0, charstring aoip_tla := "1.2.
oldToNewBSSIEs := oldToNewBSSIEs,
encryptionInformation := encryptionInformation,
chosenEncryptionAlgorithm := chosenEncryptionAlgorithm,
- kC128 := kc128));
+ kC128 := kc128,
+ /* on AoIP, allow "all" codecs (until we add more concise
+ * tests) */
+ codecList := ts_BSSMAP_IE_CodecList(
+ {ts_CodecAMR_F, ts_CodecAMR_H,
+ ts_CodecEFR, ts_CodecFR, ts_CodecHR})));
} else {
var BSSMAP_IE_CircuitIdentityCode cic := valueof(ts_BSSMAP_IE_CIC(0,1));
ho_req := valueof(ts_BSSMAP_HandoverRequest(cic, omit,
diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index 0e34b356..57422cce 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -992,7 +992,8 @@ template PDU_BSSAP ts_BSSMAP_HandoverRequest(
template (omit) BSSMAP_oldToNewBSSIEs oldToNewBSSIEs := omit,
template BSSMAP_IE_EncryptionInformation encryptionInformation := ts_BSSMAP_IE_EncrInfo('0000000000000000'O,'01'O),
template (omit) BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm := omit,
- template (omit) BSSMAP_IE_KC128 kC128 := omit
+ template (omit) BSSMAP_IE_KC128 kC128 := omit,
+ template (omit) BSSMAP_IE_SpeechCodecList codecList := omit
)
modifies ts_BSSAP_BSSMAP := {
pdu := {
@@ -1035,7 +1036,7 @@ modifies ts_BSSAP_BSSMAP := {
sNAAccessInformation := omit,
talkerPriority := omit,
aoIPTransportLayer := aoip_tla,
- codecList := omit,
+ codecList := codecList,
callIdentifier := omit,
kC128 := kC128,
globalCallReference := omit,