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

[M] Change in osmo-hlr[master]: hlr: use talloc for memory allocation in osmo_gsup_create_insert_subs...

by fixeria

Attention is currently required from: laforge, pespin, lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/32511 ) Change subject: hlr: use talloc for memory allocation in osmo_gsup_create_insert_subscriber_data_msg ...................................................................... Patch Set 3: Code-Review-1 (5 comments) File include/osmocom/hlr/gsup_server.h: https://gerrit.osmocom.org/c/osmo-hlr/+/32511/comment/1cd87028_0f269f13 PS3, Line 71: osmo_gsup_create_insert_subscriber_data_msg > this looks like a public API function of libosmo-gsup to me? In that case, we cannot simply break A […] Looks like it is, although only osmo-hlr seem to be using it. I did `./gits do grep osmo_gsup_create_insert_subscriber_data_msg` and could not find any other osmo-projects using it. But still, I would avoid breaking public API even if none of our projects are using it. File src/gsup_server.c: https://gerrit.osmocom.org/c/osmo-hlr/+/32511/comment/6c61462d_d1ca4b91 PS3, Line 455: void *talloc_ctx) > because it's not guaranteed that gsup is a talloc allocated buffed. Agreeing with @lynxis here. File src/hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/32511/comment/09aec568_aa6cc162 PS3, Line 133: sub_upd_ctx Let's better use `OTC_SELECT` and avoid `goto`s. If you don't like this idea, then maybe allocate this context outside of the loop and then free? Is there really a need to have a dedicated context for each iteration? File src/lu_fsm.c: https://gerrit.osmocom.org/c/osmo-hlr/+/32511/comment/7c3c16ba_cb978664 PS3, Line 249: lu_isr_ctx I suggest simply using `OTC_SELECT` here. https://gerrit.osmocom.org/c/osmo-hlr/+/32511/comment/facc7931_1ac18ee0 PS3, Line 251: return memleak! -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/32511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I00b5c2dfadcf6e0740e93b4c3292d2654d22e80c Gerrit-Change-Number: 32511 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sun, 30 Apr 2023 18:03:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-bts[master]: oml: reset BCCH carrier power reduction mode (if enabled)

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32560 ) Change subject: oml: reset BCCH carrier power reduction mode (if enabled) ...................................................................... oml: reset BCCH carrier power reduction mode (if enabled) We should not maintain BCCH carrier power reduction mode if we loose connection to the BSC. When entering NM_BTS_ST_OP_DISABLED_OFFLINE, reset the related state fields if it was enabled. Change-Id: I34468e3fccc490f48e30b159b63308a395b65fa9 Related: SYS#6435 --- M src/common/nm_bts_fsm.c 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/60/32560/1 diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index eeec8f8..e162cf0 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -104,8 +104,14 @@ static void st_op_disabled_offline_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; + bts->mo.setattr_success = false; bts->mo.opstart_success = false; + + /* Reset BCCH carrier power reduction mode (if enabled) */ + if (bts->c0_power_red_db > 0) + bts_set_c0_pwr_red(bts, 0); + oml_mo_state_chg(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I34468e3fccc490f48e30b159b63308a395b65fa9 Gerrit-Change-Number: 32560 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add TC_sccp_cr_limit: test CR data length cutoff

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362 ) Change subject: hnbgw: add TC_sccp_cr_limit: test CR data length cutoff ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362 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: Ia68dad973ef18513b52f5accb5264c557c7295ea Gerrit-Change-Number: 32362 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 30 Apr 2023 07:59:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[2023q1]: bts_is_online(): make the BTS pointer const, return bool

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32556 ) Change subject: bts_is_online(): make the BTS pointer const, return bool ...................................................................... bts_is_online(): make the BTS pointer const, return bool Change-Id: Idb4f9f8862041c5902df0e6e8d1ac2a60ada95df (cherry picked from commit 856c6dc2f51d7d189cce462dfce7e308f1ff3ab2) --- M src/osmo-bsc/bts.c 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/32556/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 9be2454..5718915 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -885,14 +885,14 @@ return (base->depends_on[idx] & (1U << bit)) > 0; } -static int bts_is_online(struct gsm_bts *bts) +static bool bts_is_online(const struct gsm_bts *bts) { /* TODO: support E1 BTS too */ if (!is_ipaccess_bts(bts)) - return 1; + return true; if (!bts->oml_link) - return 0; + return false; return bts->mo.nm_state.operational == NM_OPSTATE_ENABLED; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2023q1 Gerrit-Change-Id: Idb4f9f8862041c5902df0e6e8d1ac2a60ada95df Gerrit-Change-Number: 32556 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[M] Change in osmo-bsc[2023q1]: bts: st_op_enabled_on_enter(): resume C0 power reduction

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32558 ) Change subject: bts: st_op_enabled_on_enter(): resume C0 power reduction ...................................................................... bts: st_op_enabled_on_enter(): resume C0 power reduction If power saving is enabled for a BTS, it should remain enabled even if the BTS is restarted for whatever reason. This persistence can be achieved by re-sending the configured power reduction value whenever the BTS NM FSM enters the ENABLED state again (i.e. reconnects). Separate gsm_bts_send_c0_power_red() from gsm_bts_set_c0_power_red() and call the former from st_op_enabled_on_enter(). All we need to do is to send the value that was configured before, per-timeslot power reduction limits remain and need not to be updated. Take a chance to move logging from BTS specific to the generic code. Change-Id: Ic3f8a2ab0ffd049a8ed84361a3a588c1e1b23ac6 Related: SYS#6435 (cherry picked from commit 16922c5017faf8efa9bbb840aa564a979019a172) --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_osmobts.c M src/osmo-bsc/nm_bts_fsm.c 4 files changed, 46 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/32558/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 12becf4..b1aaa6f 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -814,6 +814,7 @@ int gsm_bts_set_system_infos(struct gsm_bts *bts); +int gsm_bts_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red); int gsm_bts_set_c0_power_red(struct gsm_bts *bts, const uint8_t red); void gsm_bts_stats_reset(struct gsm_bts *bts); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 58a4a0b..585eb99 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -975,21 +975,30 @@ return 0; } +/* Send the given C0 power reduction value to the BTS */ +int gsm_bts_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red) +{ + if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) + return -ENOTSUP; + if (bts->model->power_ctrl_send_c0_power_red == NULL) + return -ENOTSUP; + return bts->model->power_ctrl_send_c0_power_red(bts, red); +} + +/* Send the given C0 power reduction value to the BTS and update the internal state */ int gsm_bts_set_c0_power_red(struct gsm_bts *bts, const uint8_t red) { struct gsm_bts_trx *c0 = bts->c0; unsigned int tn; int rc; - if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) - return -ENOTSUP; - if (bts->model->power_ctrl_send_c0_power_red == NULL) - return -ENOTSUP; - - rc = bts->model->power_ctrl_send_c0_power_red(bts, red); + rc = gsm_bts_send_c0_power_red(bts, red); if (rc != 0) return rc; + LOG_BTS(bts, DRSL, LOGL_NOTICE, "%sabling BCCH carrier power reduction " + "operation mode (maximum %u dB)\n", red ? "En" : "Dis", red); + /* Timeslot 0 is always transmitting BCCH/CCCH */ c0->ts[0].c0_max_power_red_db = 0; diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c index 5f6f86f..ea0405b 100644 --- a/src/osmo-bsc/bts_osmobts.c +++ b/src/osmo-bsc/bts_osmobts.c @@ -168,10 +168,6 @@ if (msg == NULL) return -ENOMEM; - LOGP(DRSL, LOGL_NOTICE, "%sabling BCCH carrier power reduction " - "operation mode for BTS%u (maximum %u dB)\n", - red ? "En" : "Dis", bts->nr, red); - /* Abuse the standard BS POWER CONTROL message by specifying 'Common Channel' * in the Protocol Discriminator field and 'BCCH' in the Channel Number IE. */ dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index 92728dc..ea9fa5c 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -286,6 +286,13 @@ bts->mo.get_attr_rep_received = false; bts->mo.set_attr_sent = false; bts->mo.set_attr_ack_received = false; + + /* Resume power saving on the BCCH carrier, if was enabled */ + if (bts->c0_max_power_red_db > 0) { + LOG_BTS(bts, DRSL, LOGL_NOTICE, "Resuming BCCH carrier power reduction " + "operation mode (maximum %u dB)\n", bts->c0_max_power_red_db); + gsm_bts_send_c0_power_red(bts, bts->c0_max_power_red_db); + } } static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2023q1 Gerrit-Change-Id: Ic3f8a2ab0ffd049a8ed84361a3a588c1e1b23ac6 Gerrit-Change-Number: 32558 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[2023q1]: gsm_bts_send_c0_power_red(): check if BTS is online first

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32559 ) Change subject: gsm_bts_send_c0_power_red(): check if BTS is online first ...................................................................... gsm_bts_send_c0_power_red(): check if BTS is online first ... and print a proper error message instead of "not supported". We don't know for sure whether it's supported before the BTS is connected. Change-Id: I080aa7ef331b76918ae48d555eea6e4290c57120 Related: SYS#6435 (cherry picked from commit ea3e3c258d15e43667ada6fbee914f5b2da03ae0) --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_ctrl.c 3 files changed, 32 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/32559/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index cc9de74..f89ff54 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1419,18 +1419,22 @@ } rc = gsm_bts_set_c0_power_red(bts, red); - if (rc == -ENOTSUP) { + switch (rc) { + case 0: /* success */ + return CMD_SUCCESS; + case -ENOTCONN: + vty_out(vty, "%% BTS%u is offline%s", bts_nr, VTY_NEWLINE); + return CMD_WARNING; + case -ENOTSUP: vty_out(vty, "%% BCCH carrier power reduction operation mode " "is not supported for BTS%u%s", bts_nr, VTY_NEWLINE); return CMD_WARNING; - } else if (rc != 0) { + default: vty_out(vty, "%% Failed to %sable BCCH carrier power reduction " "operation mode for BTS%u%s", red ? "en" : "dis", bts_nr, VTY_NEWLINE); return CMD_WARNING; } - - return CMD_SUCCESS; } /* this command is now hidden, as it's a low-level debug hack, and people should diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 585eb99..35e8693 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -978,6 +978,8 @@ /* Send the given C0 power reduction value to the BTS */ int gsm_bts_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red) { + if (!bts_is_online(bts)) + return -ENOTCONN; if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) return -ENOTSUP; if (bts->model->power_ctrl_send_c0_power_red == NULL) diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 4b4b1fb..543ebdf 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -497,15 +497,19 @@ int rc; rc = gsm_bts_set_c0_power_red(bts, red); - if (rc == -ENOTSUP) { + switch (rc) { + case 0: /* success */ + return get_bts_c0_power_red(cmd, data); + case -ENOTCONN: + cmd->reply = "BTS is offline"; + return CTRL_CMD_ERROR; + case -ENOTSUP: cmd->reply = "BCCH carrier power reduction is not supported"; return CTRL_CMD_ERROR; - } else if (rc != 0) { + default: cmd->reply = "Failed to enable BCCH carrier power reduction"; return CTRL_CMD_ERROR; } - - return get_bts_c0_power_red(cmd, data); } CTRL_CMD_DEFINE(bts_c0_power_red, "c0-power-reduction"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2023q1 Gerrit-Change-Id: I080aa7ef331b76918ae48d555eea6e4290c57120 Gerrit-Change-Number: 32559 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[2023q1]: struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32557 ) Change subject: struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red ...................................................................... struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red Change-Id: I13d9e6ea2a2b7b11f92532d377e71f0e83974622 Related: SYS#6435 (cherry picked from commit 253f67f625f583b2d6ae6fd1208675e136f98416) --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_osmobts.c 3 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/32557/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 1a84a0e..12becf4 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -300,7 +300,7 @@ /* (Optional) function for sending default MS/BS Power Control paramaters */ int (*power_ctrl_send_def_params)(const struct gsm_bts_trx *trx); /* (Optional) function for toggling BCCH carrier power reduction operation */ - int (*power_ctrl_set_c0_power_red)(const struct gsm_bts *bts, const uint8_t red); + int (*power_ctrl_send_c0_power_red)(const struct gsm_bts *bts, const uint8_t red); void (*config_write_bts)(struct vty *vty, struct gsm_bts *bts); void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 5718915..58a4a0b 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -983,10 +983,10 @@ if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) return -ENOTSUP; - if (bts->model->power_ctrl_set_c0_power_red == NULL) + if (bts->model->power_ctrl_send_c0_power_red == NULL) return -ENOTSUP; - rc = bts->model->power_ctrl_set_c0_power_red(bts, red); + rc = bts->model->power_ctrl_send_c0_power_red(bts, red); if (rc != 0) return rc; diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c index 078cfe7..5f6f86f 100644 --- a/src/osmo-bsc/bts_osmobts.c +++ b/src/osmo-bsc/bts_osmobts.c @@ -159,8 +159,7 @@ *ie_len = msg->tail - (ie_len + 1); } -static int power_ctrl_set_c0_power_red(const struct gsm_bts *bts, - const uint8_t red) +static int power_ctrl_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg; @@ -198,7 +197,7 @@ model_osmobts.force_combined_si = false; /* Power control API */ - model_osmobts.power_ctrl_set_c0_power_red = &power_ctrl_set_c0_power_red; + model_osmobts.power_ctrl_send_c0_power_red = &power_ctrl_send_c0_power_red; model_osmobts.features.data = &model_osmobts._features_data[0]; model_osmobts.features.data_len = -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2023q1 Gerrit-Change-Id: I13d9e6ea2a2b7b11f92532d377e71f0e83974622 Gerrit-Change-Number: 32557 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RSL_Types: Add (most) VGCS/VBS related IEs + Messages

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404 ) Change subject: RSL_Types: Add (most) VGCS/VBS related IEs + Messages ...................................................................... RSL_Types: Add (most) VGCS/VBS related IEs + Messages This will help us to start tests for VGCS/VBS. Change-Id: I4c4a9ac1bbd5114cb2237ea282d7bace13a52abe --- M library/GSM_Types.ttcn M library/RSL_Types.ttcn 2 files changed, 143 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index b234bf4..54c2e98 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -29,6 +29,8 @@ type hexstring GsmMnc length(2 .. 3); type uint16_t GsmLac; type uint16_t GsmCellId; +type octetstring GroupCallRef length(1 .. 5); + /* ARFCN with explicit band discrimination */ type record GsmBandArfcn { diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 0f03c87..ceb6adb 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -4,7 +4,7 @@ * * RSL is a 3GPP standard protocol used between BTS and BSC in a GSM network. * - * (C) 2017 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2017-2023 by Harald Welte <laforge(a)gnumonks.org> * All rights reserved. * * Released under the terms of GNU General Public License, Version 2 or @@ -206,7 +206,7 @@ RSL_IE_CBCH_LOAD_INFO ('00101101'B), RSL_IE_SMSCB_CHAN_INDICATOR ('00101110'B), RSL_IE_GROUP_CALL_REF ('00101111'B), - RSL_IE_CHAN_DESC ('00110000'B), + RSL_IE_GROUP_CHAN_DESC ('00110000'B), RSL_IE_NCH_DRX_INFO ('00110001'B), RSL_IE_CMD_INDICATOR ('00110010'B), RSL_IE_EMLPP_PRIO ('00110011'B), @@ -850,6 +850,78 @@ slot_count := slot_count } + /* 9.3.45 Group Call Reference */ + type record RSL_IE_GroupCallReference { + uint8_t len, + GroupCallRef group_or_bcast_call_ref + } with { + variant (len) "LENGTHTO(group_or_bcast_call_ref)" + }; + template (value) RSL_IE_GroupCallReference ts_GroupCallRef(template (value) GroupCallRef gcr) := { + len := 0, // overwritten + group_or_bcast_call_ref := gcr + } + template (present) RSL_IE_GroupCallReference tr_GroupCallRef(template (present) GroupCallRef gcr := ?) := { + len := ?, + group_or_bcast_call_ref := gcr + } + + /* 9.3.46 Channel description */ + type record RSL_IE_GroupChannelDescription { + uint8_t len, + octetstring chan_desc + } with { + variant (len) "LENGTHTO(chan_desc)" + }; + template (value) RSL_IE_GroupChannelDescription ts_GroupChanDesc(template (value) octetstring cd) := { + len := 0, // overwritten + chan_desc := cd + } + template (present) RSL_IE_GroupChannelDescription tr_GroupChanDesc(template (present) octetstring cd) := { + len := ?, + chan_desc := cd + } + + /* 9.3.47 NCH DRX Information */ + type record RSL_IE_NchDrxInformation { + uint8_t len, + BIT2 spare, + BIT1 nln_status, + BIT3 emlpp_priority, + BIT2 nln + } with { + variant (len) "LENGTHTO(spare,nln_status,emlpp_priority,nln)" + }; + + /* 9.3.48 Command Indicator */ + type enumerated RSL_CommandIndicator { + CMD_IND_START (0), + CMD_IND_STOP (1) + } with { variant "FIELDLENGTH(8)" }; + type record RSL_IE_CommandIndicator { + uint8_t len, + RSL_CommandIndicator command_value + } with { + variant (len) "LENGTHTO(command_value)" + }; + template (value) RSL_IE_CommandIndicator ts_CommandInd(template (value) RSL_CommandIndicator ci) := { + len := 0, // overwritten + command_value := ci + } + template (present) RSL_IE_CommandIndicator tr_CommandInd(template (present) RSL_CommandIndicator ci) := { + len := ?, + command_value := ci + } + + /* 9.3.50 UIC */ + type record RSL_IE_Uic { + uint8_t len, + BIT2 spare, + uint6_t uic + } with { + variant (len) "LENGTHTO(spare,uic)" + }; + /* 9.3.52, 3GPP TS 44.018 10.5.2.21aa */ type record RSL_IE_MultirateCfg { uint8_t len, @@ -1086,6 +1158,12 @@ RSL_LV full_imm_ass_info, MobileIdentityLV ms_identity, + RSL_IE_GroupCallReference group_call_ref, + RSL_IE_GroupChannelDescription group_chan_desc, + RSL_IE_NchDrxInformation nch_drx_info, + RSL_IE_CommandIndicator cmd_indicator, + RSL_IE_Uic uic, + uint16_t ipa_conn_id, uint16_t ipa_local_port, uint16_t ipa_remote_port, @@ -1153,6 +1231,12 @@ ms_identity, iei = RSL_IE_MS_IDENTITY; other, iei = RSL_IE_FULL_BCCH_INFO; + group_call_ref, iei = RSL_IE_GROUP_CALL_REF; + group_chan_desc, iei = RSL_IE_GROUP_CHAN_DESC; + nch_drx_info, iei = RSL_IE_NCH_DRX_INFO; + cmd_indicator, iei = RSL_IE_CMD_INDICATOR; + uic, iei = RSL_IE_UIC; + ipa_conn_id, iei = RSL_IE_IPAC_CONN_ID; ipa_remote_ip, iei = RSL_IE_IPAC_REMOTE_IP; ipa_remote_port, iei = RSL_IE_IPAC_REMOTE_PORT; @@ -2659,6 +2743,50 @@ } } + template (value) RSL_Message ts_RSL_NOTIF_CMD_START(template (value) GroupCallRef group_call_ref, + template (value) octetstring chan_desc) := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_CCHAN, false), + msg_type := RSL_MT_NOT_CMD, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := ts_RslChanNr_PCH_AGCH(0)}), + t_RSL_IE(RSL_IE_CMD_INDICATOR, RSL_IE_Body:{cmd_indicator := ts_CommandInd(CMD_IND_START)}), + t_RSL_IE(RSL_IE_GROUP_CALL_REF, RSL_IE_Body:{group_call_ref := ts_GroupCallRef(group_call_ref)}), + t_RSL_IE(RSL_IE_GROUP_CHAN_DESC, RSL_IE_Body:{group_chan_desc := ts_GroupChanDesc(chan_desc)}) + } + } + template RSL_Message tr_RSL_NOTIF_CMD_START(template (present) GroupCallRef group_call_ref, + template (present) octetstring chan_desc := ?) := { + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false), + msg_type := RSL_MT_NOT_CMD, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := t_RslChanNr_PCH_AGCH(0)}), + tr_RSL_IE(RSL_IE_Body:{cmd_indicator := tr_CommandInd(CMD_IND_START)}), + tr_RSL_IE(RSL_IE_Body:{group_call_ref := tr_GroupCallRef(group_call_ref)}), + tr_RSL_IE(RSL_IE_Body:{group_chan_desc := tr_GroupChanDesc(chan_desc)}), + * + } + } + + template (value) RSL_Message ts_RSL_NOTIF_CMD_STOP(template (value) GroupCallRef group_call_ref) := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_CCHAN, false), + msg_type := RSL_MT_NOT_CMD, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := ts_RslChanNr_PCH_AGCH(0)}), + t_RSL_IE(RSL_IE_CMD_INDICATOR, RSL_IE_Body:{cmd_indicator := ts_CommandInd(CMD_IND_STOP)}), + t_RSL_IE(RSL_IE_GROUP_CALL_REF, RSL_IE_Body:{group_call_ref := ts_GroupCallRef(group_call_ref)}) + } + } + template RSL_Message tr_RSL_NOTIF_CMD_STOP(template (present) GroupCallRef group_call_ref) := { + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false), + msg_type := RSL_MT_NOT_CMD, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := t_RslChanNr_PCH_AGCH(0)}), + tr_RSL_IE(RSL_IE_Body:{cmd_indicator := tr_CommandInd(CMD_IND_STOP)}), + tr_RSL_IE(RSL_IE_Body:{group_call_ref := tr_GroupCallRef(group_call_ref)}), + * + } + } + function f_rsl_find_ie(RSL_Message msg, RSL_IE_Type iei, out RSL_IE_Body ret) return boolean { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404 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: I4c4a9ac1bbd5114cb2237ea282d7bace13a52abe Gerrit-Change-Number: 32404 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RSL_Types: Add (most) VGCS/VBS related IEs + Messages

by laforge

Attention is currently required from: jolly, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404 ) Change subject: RSL_Types: Add (most) VGCS/VBS related IEs + Messages ...................................................................... Patch Set 3: (2 comments) File library/RSL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404/comment/0a3048fe_edc5… PS2, Line 2757: value > `(present)`, also for `chan_desc` Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404/comment/357003a9_0d5c… PS2, Line 2779: value > `(present)` Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404 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: I4c4a9ac1bbd5114cb2237ea282d7bace13a52abe Gerrit-Change-Number: 32404 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 30 Apr 2023 07:54:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RSL_Types: Add (most) VGCS/VBS related IEs + Messages

by fixeria

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404 ) Change subject: RSL_Types: Add (most) VGCS/VBS related IEs + Messages ...................................................................... Patch Set 3: Code-Review+2 (2 comments) File library/RSL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404/comment/5be3fc10_810c… PS2, Line 2757: value > `(present)`, also for `chan_desc` Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404/comment/5bdd2e0d_25eb… PS2, Line 2779: value > `(present)` Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404 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: I4c4a9ac1bbd5114cb2237ea282d7bace13a52abe Gerrit-Change-Number: 32404 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 30 Apr 2023 07:54:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023