January 2023 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: pcu_sock: drop unused function prototype

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30848 ) Change subject: pcu_sock: drop unused function prototype ...................................................................... pcu_sock: drop unused function prototype The function trx_get_hlayer1() is defuned as a prototype but it is not used anywhere and there is also no implementation, lets drop it. Related: OS#5198 Change-Id: I91ead9379140e971ccabc83cbf2b62b8aa1fc8a2 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/48/30848/1 diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 81198bd..bfa07f9 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -45,7 +45,6 @@ #include <osmocom/bsc/bts_sm.h> static int pcu_sock_send(struct gsm_bts *bts, struct msgb *msg); -uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx); int pcu_direct = 1; static const char *sapi_string[] = { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I91ead9379140e971ccabc83cbf2b62b8aa1fc8a2 Gerrit-Change-Number: 30848 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: pcu_sock: drop unused variable pcu_direct

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30849 ) Change subject: pcu_sock: drop unused variable pcu_direct ...................................................................... pcu_sock: drop unused variable pcu_direct The variable pcu_direct is set to one permanently, lets remove it. Change-Id: I7917ee5abc3347776dc9793cfb4ec3e99df94683 Related: OS#5198 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/49/30849/1 diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index bfa07f9..1dcab56 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -45,7 +45,6 @@ #include <osmocom/bsc/bts_sm.h> static int pcu_sock_send(struct gsm_bts *bts, struct msgb *msg); -int pcu_direct = 1; static const char *sapi_string[] = { [PCU_IF_SAPI_RACH] = "RACH", @@ -135,9 +134,7 @@ info_ind = &pcu_prim->u.info_ind; info_ind->version = PCU_IF_VERSION; info_ind->flags |= PCU_IF_FLAG_ACTIVE; - - if (pcu_direct) - info_ind->flags |= PCU_IF_FLAG_SYSMO; + info_ind->flags |= PCU_IF_FLAG_SYSMO; /* RAI */ info_ind->mcc = bts->network->plmn.mcc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7917ee5abc3347776dc9793cfb4ec3e99df94683 Gerrit-Change-Number: 30849 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: pcu_sock: fill in TRX parameters properly

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30850 ) Change subject: pcu_sock: fill in TRX parameters properly ...................................................................... pcu_sock: fill in TRX parameters properly The pcu_sock interface has eveolved. There is a trx info indication that transfers trx (and hopping parameter) to the PCU. Fill in those parameters and send them to the PCU. Change-Id: Ie5c1abcf7b25fe00b6c228c49648e018f94190f0 Related: OS#5198 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 59 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/30850/1 diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 3e9a889..33b6588 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -100,6 +100,58 @@ return (ts->pchan_is == GSM_PCHAN_PDCH); } +/* Fill the frequency hopping parameter */ +static void info_ind_fill_fhp(struct gsm_pcu_if_info_trx_ts *ts_info, + const struct gsm_bts_trx_ts *ts) +{ + ts_info->maio = ts->hopping.maio; + ts_info->hsn = ts->hopping.hsn; + ts_info->hopping = 0x1; + + memcpy(&ts_info->ma, ts->hopping.ma_data, ts->hopping.ma_len); + ts_info->ma_bit_len = ts->hopping.ma_len * 8 - ts->hopping.ma.cur_bit; +} + +/* Fill the TRX parameter */ +static void info_ind_fill_trx(struct gsm_pcu_if_info_trx *trx_info, const struct gsm_bts_trx *trx) +{ + unsigned int tn; + + trx_info->pdch_mask = 0; + trx_info->arfcn = trx->arfcn; + trx_info->hlayer1 = 0x2342; + + if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED || trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) { + LOGPTRX(trx, DPCU, LOGL_INFO, "unavailable for PCU (op=%s adm=%s)\n", + abis_nm_opstate_name(trx->mo.nm_state.operational), + abis_nm_admin_name(trx->mo.nm_state.administrative)); + return; + } + + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { + const struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + + if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED) + continue; + if (!ts_is_pdch(ts)) + continue; + + trx_info->pdch_mask |= (1 << tn); + trx_info->ts[tn].tsc = ts->tsc; + + if (ts->hopping.enabled) + info_ind_fill_fhp(&trx_info->ts[tn], ts); + + LOGPTRX(trx, DPCU, LOGL_INFO, "PDCH on ts=%u is available " "(tsc=%u ", ts->nr, trx_info->ts[tn].tsc); + if (ts->hopping.enabled) { + LOGPC(DPCU, LOGL_INFO, "hopping=yes hsn=%u maio=%u ma_bit_len=%u)\n", + ts->hopping.hsn, ts->hopping.maio, trx_info->ts[tn].ma_bit_len); + } else { + LOGPC(DPCU, LOGL_INFO, "hopping=no arfcn=%u)\n", trx->arfcn); + } + } +} + /* Send BTS properties to the PCU */ static int pcu_tx_info_ind(struct gsm_bts *bts) { @@ -110,8 +162,7 @@ struct gsm_bts_sm *bts_sm; struct gsm_gprs_nsvc *nsvc; struct gsm_bts_trx *trx; - struct gsm_bts_trx_ts *ts; - int i, tn; + int i; OSMO_ASSERT(bts); OSMO_ASSERT(bts->network); @@ -226,30 +277,13 @@ trx = gsm_bts_trx_num(bts, i); if (!trx) continue; - info_ind->trx[i].hlayer1 = 0x2342; - info_ind->trx[i].pdch_mask = 0; - info_ind->trx[i].arfcn = trx->arfcn; - for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { - ts = &trx->ts[tn]; - if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED || - ts->pchan_is != GSM_PCHAN_PDCH) - continue; - - info_ind->trx[i].pdch_mask |= (1 << tn); - info_ind->trx[i].ts[tn].tsc = - (ts->tsc >= 0) ? ts->tsc : bts->bsic & 7; - - if (ts->hopping.enabled) - info_ind_fill_fhp(&info_ind->trx[i].ts[tn], ts); - - LOGP(DPCU, LOGL_INFO, "trx=%d ts=%d: PDCH is available " - "(tsc=%u ", trx->nr, ts->nr, info_ind->trx[i].ts[tn].tsc); - if (ts->hopping.enabled) - LOGPC(DPCU, LOGL_INFO, "hopping=yes hsn=%u maio=%u ma_bit_len=%u)\n", - ts->hopping.hsn, ts->hopping.maio, trx->ts[tn].hopping.ma.data_len - trx->ts[tn].hopping.ma.cur_bit); - else - LOGPC(DPCU, LOGL_INFO, "hopping=no arfcn=%u)\n", trx->arfcn); + if (trx->nr >= ARRAY_SIZE(info_ind->trx)) { + LOGPTRX(trx, DPCU, LOGL_NOTICE, "PCU interface (version %u) " + "cannot handle more than %zu transceivers => skipped\n", + PCU_IF_VERSION, ARRAY_SIZE(info_ind->trx)); + continue; } + info_ind_fill_trx(&info_ind->trx[trx->nr], trx); } return pcu_sock_send(bts, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie5c1abcf7b25fe00b6c228c49648e018f94190f0 Gerrit-Change-Number: 30850 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: TC_paging_resp_unsol: Avoid encoding l3 twice

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30838 ) Change subject: bsc: TC_paging_resp_unsol: Avoid encoding l3 twice ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30838 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: I4c5ea6272325671e47a91124a7efe0321c9f3a02 Gerrit-Change-Number: 30838 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jan 2023 17:00:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Submit valid l3 payload

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30827 ) Change subject: bsc: Submit valid l3 payload ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30827 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: I6e99ac39f32c9a981420b73f8d7d1568d2fa1c54 Gerrit-Change-Number: 30827 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jan 2023 16:59:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: TC_assignment_emerg_setup_allow(_imei): Test full voice establis...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30847 ) Change subject: bsc: TC_assignment_emerg_setup_allow(_imei): Test full voice establishment ...................................................................... bsc: TC_assignment_emerg_setup_allow(_imei): Test full voice establishment Extend tests to also test the data plane setup. Related: OS#5849 Change-Id: I9f39f861398669a8eb1da242595de584725e5b83 --- M bsc/BSC_Tests.ttcn 1 file changed, 56 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/30847/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 45c319d..c0a64a9 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -9180,12 +9180,63 @@ } } +private function f_assignment_emerg_setup_voice() +runs on MSC_ConnHdlr { + /* Go on with voice call assignment */ + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + + /* Below speechOrDataIndicator and codecList are copied from an emergency call captured during tests. + * They seem a bit weird (AMR-WB, and the order differ between speechId_DataIndicator and the codecList), but + * seems a good idea to see how osmo-bsc reacts to this. */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType := { + elementIdentifier := '0B'O, /* overwritten */ + lengthIndicator := 0, /* overwritten */ + speechOrDataIndicator := '0001'B, /* speech */ + spare1_4 := '0000'B, + channelRateAndType := ChRate_TCHForH_Fpref, + speechId_DataIndicator := 'c2918105'O + }; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ + ts_CodecHR, ts_CodecAMR_WB, ts_CodecEFR, ts_CodecFR})); + + f_rslem_dchan_queue_enable(); + + var ExpectCriteria mgcpcrit := { + connid := omit, + endpoint := omit, + transid := omit + }; + f_create_mgcp_expect(mgcpcrit); + + BSSAP.send(ass_cmd); + + var AssignmentState st := valueof(ts_AssignmentStateInit); + st.voice_call := true; + st.is_assignment := false; + alt { + [] as_modify(st); + [] as_Media(); + [st.modify_done] BSSAP.receive(exp_compl) { + setverdict(pass); + } + } + + /* Voice call carries on ... */ + f_sleep(2.0); +} + /* Test if the EMERGENCY SETUP gets passed on to the MSC via A when EMERGENCY * CALLS are permitted by the BSC config. */ private function f_TC_assignment_emerg_setup_allow(charstring id) runs on MSC_ConnHdlr { + /* Make sure the CHAN RQD indicates an emergency call (0b101xxxxx). The difference is that osmo-bsc directly + * assigns a TCH lchan and establishing voice for the emergency call will use Mode Modify, not reassignment to + * another lchan. */ + g_pars.ra := f_rnd_ra_emerg(); f_assignment_emerg_setup(); f_assignment_emerg_setup_exp_bssap(); + f_assignment_emerg_setup_voice(); setverdict(pass); f_perform_clear(); @@ -9197,6 +9248,10 @@ var PDU_BSSAP emerg_setup_data_ind_bssap; timer T := 3.0; + /* Make sure the CHAN RQD indicates an emergency call (0b101xxxxx). The difference is that osmo-bsc directly + * assigns a TCH lchan and establishing voice for the emergency call will use Mode Modify, not reassignment to + * another lchan. */ + g_pars.ra := f_rnd_ra_emerg(); f_assignment_emerg_setup(); T.start; @@ -10488,48 +10543,7 @@ BSSAP_LE.receive(BSSAP_LE_Conn_Prim:CONN_PRIM_DISC_IND); BSSAP.receive(tr_BSSMAP_Perform_Location_Response(tr_BSSMAP_IE_LocationEstimate(gad_ell_point_unc_circle))); - /* Go on with voice call assignment */ - var template PDU_BSSAP exp_compl := f_gen_exp_compl(); - var PDU_BSSAP ass_cmd := f_gen_ass_req(); - - /* Below speechOrDataIndicator and codecList are copied from an emergency call captured during tests. - * They seem a bit weird (AMR-WB, and the order differ between speechId_DataIndicator and the codecList), but - * seems a good idea to see how osmo-bsc reacts to this. */ - ass_cmd.pdu.bssmap.assignmentRequest.channelType := { - elementIdentifier := '0B'O, /* overwritten */ - lengthIndicator := 0, /* overwritten */ - speechOrDataIndicator := '0001'B, /* speech */ - spare1_4 := '0000'B, - channelRateAndType := ChRate_TCHForH_Fpref, - speechId_DataIndicator := 'c2918105'O - }; - ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ - ts_CodecHR, ts_CodecAMR_WB, ts_CodecEFR, ts_CodecFR})); - - f_rslem_dchan_queue_enable(); - - var ExpectCriteria mgcpcrit := { - connid := omit, - endpoint := omit, - transid := omit - }; - f_create_mgcp_expect(mgcpcrit); - - BSSAP.send(ass_cmd); - - var AssignmentState st := valueof(ts_AssignmentStateInit); - st.voice_call := true; - st.is_assignment := false; - alt { - [] as_modify(st); - [] as_Media(); - [st.modify_done] BSSAP.receive(exp_compl) { - setverdict(pass); - } - } - - /* Voice call carries on ... */ - f_sleep(2.0); + f_assignment_emerg_setup_voice(); setverdict(pass); f_perform_clear(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30847 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: I9f39f861398669a8eb1da242595de584725e5b83 Gerrit-Change-Number: 30847 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: bsc_subscriber: Allow creating subscribers identified by IMEI

by fixeria

Attention is currently required from: neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30843 ) Change subject: bsc_subscriber: Allow creating subscribers identified by IMEI ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I586b1ee30cbb26ddf58788168d56c962e03ccd5c Gerrit-Change-Number: 30843 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jan 2023 16:58:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-bts[master]: vty: Fix typo in write-config: osmux / local-port

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30842 ) Change subject: vty: Fix typo in write-config: osmux / local-port ...................................................................... vty: Fix typo in write-config: osmux / local-port The VTY command is "local-port", but write-config would write "port" instead, which would fail when re-reading the config file. Realted: SYS#6237 Change-Id: Id08530b626b0e69c3b3bb9d8bb9e16080a73e74d --- M src/common/vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/common/vty.c b/src/common/vty.c index a33d719..7e36504 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -388,9 +388,9 @@ break; } vty_out(vty, "%s local-ip %s%s", prefix, bts->osmux.local_addr, VTY_NEWLINE); + vty_out(vty, "%s local-port %u%s", prefix, bts->osmux.local_port, VTY_NEWLINE); vty_out(vty, "%s batch-factor %d%s", prefix, bts->osmux.batch_factor, VTY_NEWLINE); vty_out(vty, "%s batch-size %u%s", prefix, bts->osmux.batch_size, VTY_NEWLINE); - vty_out(vty, "%s port %u%s", prefix, bts->osmux.local_port, VTY_NEWLINE); vty_out(vty, "%s dummy-padding %s%s", prefix, bts->osmux.dummy_padding ? "on" : "off", VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id08530b626b0e69c3b3bb9d8bb9e16080a73e74d Gerrit-Change-Number: 30842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-bts[master]: vty: Fix typo in write-config: osmux / local-port

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30842 ) Change subject: vty: Fix typo in write-config: osmux / local-port ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id08530b626b0e69c3b3bb9d8bb9e16080a73e74d Gerrit-Change-Number: 30842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jan 2023 16:11:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Move BSSAP handling of emergency call to helper function

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30846 ) Change subject: bsc: Move BSSAP handling of emergency call to helper function ...................................................................... bsc: Move BSSAP handling of emergency call to helper function Change-Id: I3a88efeae6710ba005496067ecb0c8f4035404ab --- M bsc/BSC_Tests.ttcn 1 file changed, 14 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/30846/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 469d7b6..45c319d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -9156,15 +9156,13 @@ RSL.send(emerg_setup_data_ind); } -/* Test if the EMERGENCY SETUP gets passed on to the MSC via A when EMERGENCY - * CALLS are permitted by the BSC config. */ -private function f_TC_assignment_emerg_setup_allow(charstring id) runs on MSC_ConnHdlr { +/* expect EmergencySetup on BSSAP after calling f_assignment_emerg_setup() */ +private function f_assignment_emerg_setup_exp_bssap() +runs on MSC_ConnHdlr { var PDU_BSSAP emerg_setup_data_ind_bssap; var PDU_ML3_MS_NW emerg_setup; timer T := 3.0; - f_assignment_emerg_setup() - T.start; alt { [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { @@ -9180,6 +9178,14 @@ setverdict(fail, "timout waiting for EMERGENCY SETUP!"); } } +} + +/* Test if the EMERGENCY SETUP gets passed on to the MSC via A when EMERGENCY + * CALLS are permitted by the BSC config. */ +private function f_TC_assignment_emerg_setup_allow(charstring id) runs on MSC_ConnHdlr { + + f_assignment_emerg_setup(); + f_assignment_emerg_setup_exp_bssap(); setverdict(pass); f_perform_clear(); @@ -9191,7 +9197,7 @@ var PDU_BSSAP emerg_setup_data_ind_bssap; timer T := 3.0; - f_assignment_emerg_setup() + f_assignment_emerg_setup(); T.start; alt { @@ -10468,25 +10474,7 @@ * another lchan. */ g_pars.ra := f_rnd_ra_emerg(); f_assignment_emerg_setup(); - - var PDU_BSSAP emerg_setup_data_ind_bssap; - timer T := 3.0; - T.start; - alt { - [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { - var PDU_ML3_MS_NW verify_emerg_setup; - verify_emerg_setup := dec_PDU_ML3_MS_NW(emerg_setup_data_ind_bssap.pdu.dtap); - if (not isbound(verify_emerg_setup.msgs.cc.emergencySetup)) { - setverdict(fail, "no emergency setup"); - } - } - [] BSSAP.receive { - setverdict(fail, "unexpected BSSAP message!"); - } - [] T.timeout { - setverdict(fail, "timeout waiting for EMERGENCY SETUP!"); - } - } + f_assignment_emerg_setup_exp_bssap(); /* Here would usually be a CC Call Proceeding from the MSC, but what does the BSC care about DTAP. */ @@ -10576,25 +10564,7 @@ { g_pars.ra := f_rnd_ra_emerg(); f_assignment_emerg_setup(); - - var PDU_BSSAP emerg_setup_data_ind_bssap; - timer T := 3.0; - T.start; - alt { - [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { - var PDU_ML3_MS_NW verify_emerg_setup; - verify_emerg_setup := dec_PDU_ML3_MS_NW(emerg_setup_data_ind_bssap.pdu.dtap); - if (not ischosen(verify_emerg_setup.msgs.cc.emergencySetup)) { - setverdict(fail, "no emergency setup"); - } - } - [] BSSAP.receive { - setverdict(fail, "unexpected BSSAP message!"); - } - [] T.timeout { - setverdict(fail, "timeout waiting for EMERGENCY SETUP!"); - } - } + f_assignment_emerg_setup_exp_bssap(); /* Start a Location Request to locate the emergency */ f_bssap_le_register_imsi(g_pars.imsi, omit); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30846 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: I3a88efeae6710ba005496067ecb0c8f4035404ab Gerrit-Change-Number: 30846 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023