fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27525 )
Change subject: bsc: fix some inadequate template restriction warnings
......................................................................
bsc: fix some inadequate template restriction warnings
Change-Id: Icfc69aff2c923f4e12dbd6cc42c792d5712a7b27
---
M bsc/BSC_Tests.ttcn
M bsc/MSC_ConnectionHandler.ttcn
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/25/27525/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 9a6980b..4683dc7 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1677,8 +1677,8 @@
var BSSMAP_IE_EncryptionInformation encryptionInformation :=
valueof(ts_BSSMAP_IE_EncrInfo('0000000000000000'O,'01'O));
- var template BSSMAP_IE_ChosenEncryptionAlgorithm
chosenEncryptionAlgorithm := omit;
- var template BSSMAP_IE_KC128 kc128 := omit;
+ var template (omit) BSSMAP_IE_ChosenEncryptionAlgorithm
chosenEncryptionAlgorithm := omit;
+ var template (omit) BSSMAP_IE_KC128 kc128 := omit;
if (ispresent(enc)) {
var TestHdlrEncrParams v_enc := valueof(enc);
encryptionInformation :=
valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg_permitted));
@@ -2470,15 +2470,15 @@
}
private function f_exp_sapi_n_reject(template (present) GsmSapi sapi := ?,
- template myBSSMAP_Cause cause := ?,
+ template (present) myBSSMAP_Cause cause :=
?,
template (present) BIT2 cc := ?,
float T_val := 2.0)
runs on test_CT {
var BSSAP_N_DATA_ind rx_di;
timer T;
- var template BSSMAP_IE_Cause tr_cause := tr_BSSMAP_IE_Cause(cause);
- var template PDU_BSSAP tr_pdu := tr_BSSMAP_SAPInReject(sapi);
+ var template (present) BSSMAP_IE_Cause tr_cause :=
tr_BSSMAP_IE_Cause(cause);
+ var template (present) PDU_BSSAP tr_pdu := tr_BSSMAP_SAPInReject(sapi);
T.start(T_val);
alt {
@@ -7988,7 +7988,7 @@
f_vty_transceive(BSCVTY, "bts 0 c0-power-reduction " &
int2str(red));
/* Expect Osmocom specific BS Power Control message on the RSL
*/
- var template RSL_Message tr_rsl_pdu := tr_RSL_BS_PWR_CTRL(
+ var template (present) RSL_Message tr_rsl_pdu :=
tr_RSL_BS_PWR_CTRL(
chan_nr := t_RslChanNr_BCCH(0),
bs_power := tr_RSL_IE_BS_Power(red / 2));
tr_rsl_pdu.msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false);
@@ -10495,7 +10495,7 @@
}
private function f_verify_imm_ass(RSL_Message imm_ass, template uint8_t ra :=
?, template GsmFrameNumber fn := ?,
- template RslChannelNr chan_nr := ?,
+ template (present) RslChannelNr chan_nr := ?,
template (present) uint12_t arfcn := ?,
template (present) uint3_t tsc := ?)
{
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index b0daf61..a50b6f4 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -622,7 +622,7 @@
/* In this case, alg_permitted should have only one permitted
algo */
alg_expect := valueof(alg_permitted);
}
- var template octetstring kc := omit;
+ var template (omit) octetstring kc := omit;
if (kc128) {
kc := f_rnd_octstring(16);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27525
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Icfc69aff2c923f4e12dbd6cc42c792d5712a7b27
Gerrit-Change-Number: 27525
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
Gerrit-MessageType: newchange
