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

[S] Change in osmo-ci[master]: jobs/master-builds: xgoldmon: remove osmo-ci dir

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34249 ) Change subject: jobs/master-builds: xgoldmon: remove osmo-ci dir ...................................................................... jobs/master-builds: xgoldmon: remove osmo-ci dir Fix running the job multiple times in a row. As the master jobs don't wipe the git repositories, we need to remove the osmo-ci dir first before attempting another shallow clone. Fixes: 451cbe7d ("jobs/master-builds: add xgoldmon") Change-Id: I877944dbca9d1c3ca57b05e947ba9b3506971bdc --- M jobs/master-builds.yml 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index f57bc96..b102563 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -529,6 +529,7 @@ - xgoldmon: git_base_url: https://github.com/2b-as cmd: | + rm -rf osmo-ci git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b master {docker_run_ccache} {docker_img} {timeout_cmd} /build/osmo-ci/scripts/xgoldmon-jenkins.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I877944dbca9d1c3ca57b05e947ba9b3506971bdc Gerrit-Change-Number: 34249 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: xgoldmon: remove osmo-ci dir

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34249 ) Change subject: jobs/master-builds: xgoldmon: remove osmo-ci dir ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I877944dbca9d1c3ca57b05e947ba9b3506971bdc Gerrit-Change-Number: 34249 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 13:25:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-trx[master]: ms: fix a few coverity complaints related to initialization

by fixeria

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34251 ) Change subject: ms: fix a few coverity complaints related to initialization ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I203f4da7a4418fc5053d26901bec649d04fad096 Gerrit-Change-Number: 34251 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 13:24:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: fix thread prio startup issue

by fixeria

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34250 ) Change subject: ms: fix thread prio startup issue ...................................................................... Patch Set 3: (2 comments) File Transceiver52M/ms/ms.h: https://gerrit.osmocom.org/c/osmo-trx/+/34250/comment/f1fd7c29_5edd2639 PS3, Line 388: if( if is not a function (the linter should have complained?) File osmocom-bb: https://gerrit.osmocom.org/c/osmo-trx/+/34250/comment/65021001_f18d0d16 PS3, Line 1: fb384998fbddcc545eec76da41db1aa41b583aa9 This change looks unrelated. Bumping submodule version should be done in a separate patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b Gerrit-Change-Number: 34250 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 13:23:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-cbc[master]: Catch and forbid configuring peers before configuring main protocol node

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/34246 ) Change subject: Catch and forbid configuring peers before configuring main protocol node ...................................................................... Catch and forbid configuring peers before configuring main protocol node When the user enters each "peer" node, the related object is created if not yet existing, and its updated config is applied (connect()) upon exiting the node (cbc_peer_apply_cfg_chg()). When connect happens, it needs to obtain the local IP address from the main protocol node (cbsp|sbcap)", which means it must be configured beforehand, otherwise the peers connect using the default values. Hence, it makes no sense to configure peers if the main protocol information has not yet been configured. The usual example configs as well as the write-config VTY commands provide correct order of things. Catch and forbid the user providing a config file where the peers are configured before the main protocol nodes. Related: OS#6154 Change-Id: I678f9e6715c85b1eb9116cc892f1a8299577c0c2 --- M include/osmocom/cbc/cbc_data.h M src/cbc_main.c M src/cbc_vty.c 3 files changed, 49 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index 6d64f04..d5e5cde 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -57,11 +57,13 @@ struct { char *local_host; int local_port; + bool configured; } cbsp; struct { char *local_host[CBC_MAX_LOC_ADDRS]; unsigned int num_local_host; int local_port; + bool configured; } sbcap; struct { char *local_host; diff --git a/src/cbc_main.c b/src/cbc_main.c index e75b328..c777ef6 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -108,12 +108,16 @@ static int cbc_vty_go_parent(struct vty *vty) { switch (vty->node) { + case CBSP_NODE: + g_cbc->config.cbsp.configured = true; + break; case SBcAP_NODE: /* If no local addr set, add a default one: */ if (g_cbc->config.sbcap.num_local_host == 0) { g_cbc->config.sbcap.local_host[0] = talloc_strdup(g_cbc, "127.0.0.1"); g_cbc->config.sbcap.num_local_host = 1; } + g_cbc->config.sbcap.configured = true; vty->node = CONFIG_NODE; vty->index = NULL; break; diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 631ef96..12b7d7b 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -576,6 +576,26 @@ enum cbc_peer_protocol proto; proto = get_string_value(cbc_peer_proto_name_vty, argv[0]); + switch (proto) { + case CBC_PEER_PROTO_CBSP: + if (!g_cbc->config.cbsp.configured) { + vty_out(vty, "%% Node '%s' must be configured before configuring node 'peer'!%s", + argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + break; + case CBC_PEER_PROTO_SBcAP: + if (!g_cbc->config.sbcap.configured) { + vty_out(vty, "%% Node '%s' must be configured before configuring node 'peer'!%s", + argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + break; + case CBC_PEER_PROTO_SABP: + default: + return CMD_WARNING; + } + peer = cbc_peer_by_name(argv[1]); if (!peer) peer = cbc_peer_create(argv[1], proto); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/34246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I678f9e6715c85b1eb9116cc892f1a8299577c0c2 Gerrit-Change-Number: 34246 Gerrit-PatchSet: 1 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-cbc[master]: Catch and forbid configuring peers before configuring main protocol node

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/34246 ) Change subject: Catch and forbid configuring peers before configuring main protocol node ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/34246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I678f9e6715c85b1eb9116cc892f1a8299577c0c2 Gerrit-Change-Number: 34246 Gerrit-PatchSet: 1 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 13:18:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: > +1 now, and we decided we shall move the pagingCmd forwarding to follow the usual PCH queue in pagin […] As discussed we will fix this in a follow up patch. I have a created a ticket for this. https://osmocom.org/issues/6159 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 12:39:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: fix thread prio startup issue

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34250 ) Change subject: ms: fix thread prio startup issue ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b Gerrit-Change-Number: 34250 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 12:10:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: fix thread prio startup issue

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/34250 to look at the new patch set (#3). Change subject: ms: fix thread prio startup issue ...................................................................... ms: fix thread prio startup issue This fixes the 20 second startup delay caused by tx/control threads getting temporarily stuck while trying to set their own priority. Apparently the only sane way for core affinity+priority is to set both as attributes during thread creation using pthreads. This switches the cmd queue to the timeout version, too, to ensure the thread doesn't get stuck waiting for messages, and allows cleaner exits. Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b --- M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_trxcon_if.h M Transceiver52M/ms/ms_upper.cpp M Transceiver52M/ms/ms_upper.h M osmocom-bb 5 files changed, 111 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/50/34250/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b Gerrit-Change-Number: 34250 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34244 ) Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... meas_feed: Increase wqueue max_len to 100 and make it vty-configurable The previous amount of 10 messages may be small if the BSC is processing lots of measurements from lots of BTS connected to it. Increase it to 100 by default, and allow changing the write_queue length through the VTY. Related: SYS#6550 Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 --- M include/osmocom/bsc/meas_feed.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/meas_feed.c 3 files changed, 48 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/bsc/meas_feed.h b/include/osmocom/bsc/meas_feed.h index 353278e..f2bd4ba 100644 --- a/include/osmocom/bsc/meas_feed.h +++ b/include/osmocom/bsc/meas_feed.h @@ -35,9 +35,12 @@ }; #define MEAS_FEED_VERSION 1 +#define MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT 100 int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port); void meas_feed_scenario_set(const char *name); +void meas_feed_wqueue_max_length_set(unsigned int max_length); void meas_feed_cfg_get(char **host, uint16_t *port); const char *meas_feed_scenario_get(void); +unsigned int meas_feed_wqueue_max_length_get(void); diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 7918d81..02f708e 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -385,6 +385,7 @@ uint16_t meas_port; char *meas_host; const char *meas_scenario; + unsigned int max_len = meas_feed_wqueue_max_length_get(); meas_feed_cfg_get(&meas_host, &meas_port); meas_scenario = meas_feed_scenario_get(); @@ -395,6 +396,9 @@ if (strlen(meas_scenario) > 0) vty_out(vty, " meas-feed scenario %s%s", meas_scenario, VTY_NEWLINE); + if (max_len != MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT) + vty_out(vty, " meas-feed write-queue-max-length %u%s", + max_len, VTY_NEWLINE); } if (gsmnet->allow_unusable_timeslots) @@ -2416,6 +2420,16 @@ return CMD_SUCCESS; } +DEFUN_ATTR(cfg_net_meas_feed_wqueue_max_len, cfg_net_meas_feed_wqueue_max_len_cmd, + "meas-feed write-queue-max-length <1-65535>", + MEAS_FEED_STR "Set the maximum length of the message write queue towards the UDP socket\n" + "Maximum number of messages to be queued waiting for transmission\n", + CMD_ATTR_IMMEDIATE) +{ + meas_feed_wqueue_max_length_set(atoi(argv[0])); + return CMD_SUCCESS; +} + static void legacy_timers(struct vty *vty, const char **T_arg) { if (!strcmp((*T_arg), "T993111") || !strcmp((*T_arg), "t993111")) { @@ -3580,6 +3594,7 @@ install_element(GSMNET_NODE, &cfg_net_dyn_ts_allow_tch_f_cmd); install_element(GSMNET_NODE, &cfg_net_meas_feed_dest_cmd); install_element(GSMNET_NODE, &cfg_net_meas_feed_scenario_cmd); + install_element(GSMNET_NODE, &cfg_net_meas_feed_wqueue_max_len_cmd); install_element(GSMNET_NODE, &cfg_net_timer_cmd); install_element(GSMNET_NODE, &cfg_net_allow_unusable_timeslots_cmd); install_element(GSMNET_NODE, &cfg_net_pcu_sock_cmd); diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index fbfd553..23b7d04 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -24,6 +24,7 @@ struct meas_feed_state { struct osmo_wqueue wqueue; + unsigned int wqueue_max_len; char scenario[31+1]; char *dst_host; uint16_t dst_port; @@ -31,6 +32,7 @@ static struct meas_feed_state g_mfs = { .wqueue.bfd.fd = -1, + .wqueue_max_len = MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT, }; static int process_meas_rep(struct gsm_meas_rep *mr) @@ -152,7 +154,7 @@ meas_feed_close(); } - osmo_wqueue_init(&g_mfs.wqueue, 10); + osmo_wqueue_init(&g_mfs.wqueue, g_mfs.wqueue_max_len); g_mfs.wqueue.write_cb = feed_write_cb; g_mfs.wqueue.read_cb = feed_read_cb; @@ -179,6 +181,18 @@ *host = g_mfs.dst_host; } +void meas_feed_wqueue_max_length_set(unsigned int max_length) +{ + g_mfs.wqueue_max_len = max_length; + if (g_mfs.wqueue.bfd.fd) + g_mfs.wqueue.max_length = max_length; +} + +unsigned int meas_feed_wqueue_max_length_get(void) +{ + return g_mfs.wqueue_max_len; +} + void meas_feed_scenario_set(const char *name) { osmo_strlcpy(g_mfs.scenario, name, sizeof(g_mfs.scenario)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: fix thread prio startup issue

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34250 ) Change subject: ms: fix thread prio startup issue ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b Gerrit-Change-Number: 34250 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 11:08:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-trx[master]: ms: fix a few coverity complaints related to initialization

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34251 ) Change subject: ms: fix a few coverity complaints related to initialization ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I203f4da7a4418fc5053d26901bec649d04fad096 Gerrit-Change-Number: 34251 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 11:07:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: xgoldmon: remove osmo-ci dir

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34249 ) Change subject: jobs/master-builds: xgoldmon: remove osmo-ci dir ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I877944dbca9d1c3ca57b05e947ba9b3506971bdc Gerrit-Change-Number: 34249 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 11:06:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by fixeria

Attention is currently required from: laforge, pespin, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34244 ) Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... Patch Set 4: Code-Review+2 (1 comment) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34244/comment/d4a98d93_7982dfd7 PS2, Line 2424: 0-65535 > Ack Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 11:04:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: fix thread prio startup issue

by Hoernchen

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/34250 to look at the new patch set (#2). Change subject: ms: fix thread prio startup issue ...................................................................... ms: fix thread prio startup issue This fixes the 20 second startup delay caused by tx/control threads getting temporarily stuck while trying to set their own priority. Apparently the only sane way for core affinity+priority is to set both as attributes during thread creation using pthreads. This switches the cmd queue to the timeout version, too, to ensure the thread doesn't get stuck waiting for messages, and allows cleaner exits. Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b --- M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_trxcon_if.h M Transceiver52M/ms/ms_upper.cpp M Transceiver52M/ms/ms_upper.h M osmocom-bb 5 files changed, 111 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/50/34250/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b Gerrit-Change-Number: 34250 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-trx[master]: ms: fix a few coverity complaints related to initialization

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/34251 ) Change subject: ms: fix a few coverity complaints related to initialization ...................................................................... ms: fix a few coverity complaints related to initialization Change-Id: I203f4da7a4418fc5053d26901bec649d04fad096 --- M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_upper.h M Transceiver52M/ms/threadpool.h 3 files changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/51/34251/1 diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h index 62ef96e..b106fd3 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -50,7 +50,7 @@ template <typename T> void clamp_array(T *start2, unsigned int len, T max) { - for (int i = 0; i < len; i++) { + for (unsigned int i = 0; i < len; i++) { const T t1 = start2[i] < -max ? -max : start2[i]; const T t2 = t1 > max ? max : t1; start2[i] = t2; @@ -263,7 +263,6 @@ std::thread lower_rx_task; std::thread lower_tx_task; - std::thread *calcrval_task; // provides bursts to upper rx thread rx_queue_t rxqueue; @@ -300,10 +299,12 @@ void maybe_update_gain(one_burst &brst); ms_trx() - : timing_advance(0), do_auto_gain(false), rxqueue(), first_sch_buf(new blade_sample_type[SCH_LEN_SPS]), - burst_copy_buffer(new blade_sample_type[ONE_TS_BURST_LEN]), rcv_done{ false }, - sch_thread_done{ false }, hw_cpus(std::thread::hardware_concurrency()), - hw_target(hw_cpus > 4 ? sched_params::target::ODROID : sched_params::target::PI4) + : mTSC(0), mBSIC(0), timing_advance(0), do_auto_gain(false), rxqueue(), + first_sch_buf(new blade_sample_type[SCH_LEN_SPS]), + burst_copy_buffer(new blade_sample_type[ONE_TS_BURST_LEN]), first_sch_buf_rcv_ts(0), + rcv_done{ false }, sch_thread_done{ false }, hw_cpus(std::thread::hardware_concurrency()), + hw_target(hw_cpus > 4 ? sched_params::target::ODROID : sched_params::target::PI4), + upper_is_ready(false) { std::cerr << "scheduling for: " << (hw_cpus > 4 ? "odroid" : "pi4") << std::endl; set_name_aff_sched(worker_thread.get_handle(), sched_params::thread_names::SCH_SEARCH); diff --git a/Transceiver52M/ms/ms_upper.h b/Transceiver52M/ms/ms_upper.h index 0c430de..06f7c54 100644 --- a/Transceiver52M/ms/ms_upper.h +++ b/Transceiver52M/ms/ms_upper.h @@ -44,5 +44,5 @@ void driveReceiveFIFO(); void driveTx(); - upper_trx(){}; + upper_trx() : mOn(false){}; }; diff --git a/Transceiver52M/ms/threadpool.h b/Transceiver52M/ms/threadpool.h index a5dec97..2180c68 100644 --- a/Transceiver52M/ms/threadpool.h +++ b/Transceiver52M/ms/threadpool.h @@ -45,7 +45,7 @@ return; } - single_thread_pool() : worker_thread(std::thread([this] { thread_loop(); })) + single_thread_pool() : stop_flag(false), is_ready(false), worker_thread(std::thread([this] { thread_loop(); })) { } ~single_thread_pool() -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I203f4da7a4418fc5053d26901bec649d04fad096 Gerrit-Change-Number: 34251 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: fix thread prio startup issue

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/34250 ) Change subject: ms: fix thread prio startup issue ...................................................................... ms: fix thread prio startup issue This fixes the 20 second startup delay caused by tx/control threads getting temporarily stuck while trying to set their own priority. Apparently the only sane way for core affinity+priority is to set both as attributes during thread creation using pthreads. This switches the cmd queue to the timeout version, too, to ensure the thread doesn't get stuck waiting for messages, and allows cleaner exits. Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b --- M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_trxcon_if.h M Transceiver52M/ms/ms_upper.cpp M Transceiver52M/ms/ms_upper.h 4 files changed, 109 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/50/34250/1 diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h index 1c210b0..62ef96e 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -336,6 +336,15 @@ set_name_aff_sched(h, tgt.name, tgt.core, tgt.schedtype, tgt.prio); } + using pt_sig = void *(*)(void *); + + pthread_t spawn_worker_thread(sched_params::thread_names name, pt_sig fun, void *arg) + { + auto tgt = schdp[hw_target][name]; + std::cerr << "scheduling for: " << tgt.name << ":" << tgt.core << " prio:" << tgt.prio << std::endl; + return do_spawn_thr(tgt.name, tgt.core, tgt.schedtype, tgt.prio, fun, arg); + } + private: void set_name_aff_sched(std::thread::native_handle_type h, const char *name, int cpunum, int schedtype, int prio) @@ -359,4 +368,27 @@ return exit(0); } } + + pthread_t do_spawn_thr(const char *name, int cpunum, int schedtype, int prio, pt_sig fun, void *arg) + { + pthread_t thread; + + pthread_attr_t attr; + pthread_attr_init(&attr); + + sched_param sch_params; + sch_params.sched_priority = prio; + cpu_set_t cpuset; + CPU_ZERO(&cpuset); + CPU_SET(cpunum, &cpuset); + auto a = pthread_attr_setaffinity_np(&attr, sizeof(cpu_set_t), &cpuset); + a |= pthread_attr_setschedpolicy(&attr, schedtype); + a |= pthread_attr_setschedparam(&attr, &sch_params); + a |= pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); + std::cerr << "arg rc:" << a << std::endl; + pthread_create(&thread, &attr, fun, arg); + pthread_setname_np(thread, name); + pthread_attr_destroy(&attr); + return thread; + } }; diff --git a/Transceiver52M/ms/ms_trxcon_if.h b/Transceiver52M/ms/ms_trxcon_if.h index 9879d1a..0928d40 100644 --- a/Transceiver52M/ms/ms_trxcon_if.h +++ b/Transceiver52M/ms/ms_trxcon_if.h @@ -38,5 +38,5 @@ } }; using tx_queue_t = spsc_cond<8 * 1, internal_q_tx_buf, true, false>; -using cmd_queue_t = spsc_cond<8 * 1, trxcon_phyif_cmd, true, false>; +using cmd_queue_t = spsc_cond_timeout<8 * 1, trxcon_phyif_cmd, true, false>; using cmdr_queue_t = spsc_cond<8 * 1, trxcon_phyif_rsp, false, false>; diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp index 3c34efe..b161f4a 100644 --- a/Transceiver52M/ms/ms_upper.cpp +++ b/Transceiver52M/ms/ms_upper.cpp @@ -27,6 +27,8 @@ #include <radioInterface.h> #include <grgsm_vitac/grgsm_vitac.h> +// #define TXDEBUG + extern "C" { #include "sch.h" @@ -66,29 +68,54 @@ { g_exit_flag = true; - if (thr_control.joinable()) - thr_control.join(); - if (thr_rx.joinable()) - thr_rx.join(); - if (thr_tx.joinable()) - thr_tx.join(); + pthread_join(thr_control, NULL); + pthread_join(thr_tx, NULL); } + void upper_trx::start_threads() { - thr_control = std::thread([this] { - set_name_aff_sched(sched_params::thread_names::U_CTL); - while (!g_exit_flag) { - driveControl(); - } - std::cerr << "exit U control!" << std::endl; - }); - thr_tx = std::thread([this] { - set_name_aff_sched(sched_params::thread_names::U_TX); - while (!g_exit_flag) { - driveTx(); - } - std::cerr << "exit U tx!" << std::endl; - }); + DBGLG(...) << "spawning threads.." << std::endl; + + thr_control = spawn_worker_thread( + sched_params::thread_names::U_CTL, + [](void *args) -> void * { + upper_trx *t = reinterpret_cast<upper_trx *>(args); +#ifdef TXDEBUG + struct sched_param param; + int policy; + pthread_getschedparam(pthread_self(), &policy, &param); + printf("ID: %lu, CPU: %d policy = %d priority = %d\n", pthread_self(), sched_getcpu(), policy, + param.sched_priority); +#endif + std::cerr << "started U control!" << std::endl; + while (!g_exit_flag) { + t->driveControl(); + } + std::cerr << "exit U control!" << std::endl; + + return 0; + }, + this); + thr_tx = spawn_worker_thread( + sched_params::thread_names::U_TX, + [](void *args) -> void * { + upper_trx *t = reinterpret_cast<upper_trx *>(args); +#ifdef TXDEBUG + struct sched_param param; + int policy; + pthread_getschedparam(pthread_self(), &policy, &param); + printf("ID: %lu, CPU: %d policy = %d priority = %d\n", pthread_self(), sched_getcpu(), policy, + param.sched_priority); +#endif + std::cerr << "started U tx!" << std::endl; + while (!g_exit_flag) { + t->driveTx(); + } + std::cerr << "exit U tx!" << std::endl; + + return 0; + }, + this); #ifdef LSANDEBUG std::thread([this] { @@ -251,7 +278,7 @@ internal_q_tx_buf *burst = &e; -#ifdef TXDEBUG +#ifdef TXDEBUG2 DBGLG() << "got burst!" << burst->r.fn << ":" << burst->ts << " current: " << timekeeper.gsmtime().FN() << " dff: " << (int64_t)((int64_t)timekeeper.gsmtime().FN() - (int64_t)burst->r.fn) << std::endl; #endif @@ -270,7 +297,7 @@ // float -> int16 blade_sample_type burst_buf[txburst->size()]; convert_and_scale(burst_buf, txburst->begin(), txburst->size() * 2, 1); -#ifdef TXDEBUG +#ifdef TXDEBUG2 auto check = signalVector(txburst->size(), 40); convert_and_scale(check.begin(), burst_buf, txburst->size() * 2, 1); estim_burst_params ebp; @@ -313,7 +340,7 @@ static void print_cmd(trxcon_phyif_cmd_type c) { - DBGLG() << cmd2str(c) << std::endl; + DBGLG() << "handling " << cmd2str(c) << std::endl; } #endif @@ -323,6 +350,8 @@ trxcon_phyif_cmd cmd; while (!cmdq_to_phy.spsc_pop(&cmd)) { cmdq_to_phy.spsc_prep_pop(); + if (g_exit_flag) + return false; } if (g_exit_flag) diff --git a/Transceiver52M/ms/ms_upper.h b/Transceiver52M/ms/ms_upper.h index 2362365..0c430de 100644 --- a/Transceiver52M/ms/ms_upper.h +++ b/Transceiver52M/ms/ms_upper.h @@ -27,22 +27,22 @@ #include "ms.h" class upper_trx : public ms_trx { - bool mOn; + volatile bool mOn; char demodded_softbits[444]; // void driveControl(); - bool driveControl(); - void driveReceiveFIFO(); - void driveTx(); - bool pullRadioVector(GSM::Time &wTime, int &RSSI, int &timingOffset); - std::thread thr_control, thr_rx, thr_tx; + pthread_t thr_control, thr_tx; public: void start_threads(); void main_loop(); void stop_upper_threads(); + bool driveControl(); + void driveReceiveFIFO(); + void driveTx(); + upper_trx(){}; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b Gerrit-Change-Number: 34250 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: xgoldmon: remove osmo-ci dir

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34249 ) Change subject: jobs/master-builds: xgoldmon: remove osmo-ci dir ...................................................................... jobs/master-builds: xgoldmon: remove osmo-ci dir Fix running the job multiple times in a row. As the master jobs don't wipe the git repositories, we need to remove the osmo-ci dir first before attempting another shallow clone. Fixes: 451cbe7d ("jobs/master-builds: add xgoldmon") Change-Id: I877944dbca9d1c3ca57b05e947ba9b3506971bdc --- M jobs/master-builds.yml 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/49/34249/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index f57bc96..b102563 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -529,6 +529,7 @@ - xgoldmon: git_base_url: https://github.com/2b-as cmd: | + rm -rf osmo-ci git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b master {docker_run_ccache} {docker_img} {timeout_cmd} /build/osmo-ci/scripts/xgoldmon-jenkins.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I877944dbca9d1c3ca57b05e947ba9b3506971bdc Gerrit-Change-Number: 34249 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-trx[master]: ms/va: make ancient gcc < 8 happy

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34248 ) Change subject: ms/va: make ancient gcc < 8 happy ...................................................................... ms/va: make ancient gcc < 8 happy Change-Id: Ib94b9b073a0d2af84ce5791b5f40c63cd7ef9329 --- M Transceiver52M/grgsm_vitac/grgsm_vitac.h 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Transceiver52M/grgsm_vitac/grgsm_vitac.h b/Transceiver52M/grgsm_vitac/grgsm_vitac.h index d00c3ad..c1e470c 100644 --- a/Transceiver52M/grgsm_vitac/grgsm_vitac.h +++ b/Transceiver52M/grgsm_vitac/grgsm_vitac.h @@ -42,6 +42,10 @@ #define MULTI_VER_TARGET_ATTR_CLANGONLY #endif +/* ancient gcc < 8 has no attribute, clang always pretends to be gcc 4 */ +#if !defined(__clang__) && __GNUC__ < 8 +#define NO_UBSAN __attribute__((no_sanitize_undefined)) +#else #if defined(__has_attribute) #if __has_attribute(no_sanitize) #define NO_UBSAN __attribute__((no_sanitize("undefined"))) @@ -49,6 +53,7 @@ #else #define NO_UBSAN #endif +#endif #define SYNC_SEARCH_RANGE 30 const int d_OSR(4); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib94b9b073a0d2af84ce5791b5f40c63cd7ef9329 Gerrit-Change-Number: 34248 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-trx[master]: ms/va: make ancient gcc < 8 happy

by osmith

Attention is currently required from: Hoernchen. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34248 ) Change subject: ms/va: make ancient gcc < 8 happy ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib94b9b073a0d2af84ce5791b5f40c63cd7ef9329 Gerrit-Change-Number: 34248 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 10:04:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-trx[master]: ms/va: make ancient gcc < 8 happy

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34248 ) Change subject: ms/va: make ancient gcc < 8 happy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib94b9b073a0d2af84ce5791b5f40c63cd7ef9329 Gerrit-Change-Number: 34248 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 09:56:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-trx[master]: ms/va: make ancient gcc < 8 happy

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/34248 ) Change subject: ms/va: make ancient gcc < 8 happy ...................................................................... ms/va: make ancient gcc < 8 happy Change-Id: Ib94b9b073a0d2af84ce5791b5f40c63cd7ef9329 --- M Transceiver52M/grgsm_vitac/grgsm_vitac.h 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/48/34248/1 diff --git a/Transceiver52M/grgsm_vitac/grgsm_vitac.h b/Transceiver52M/grgsm_vitac/grgsm_vitac.h index d00c3ad..c1e470c 100644 --- a/Transceiver52M/grgsm_vitac/grgsm_vitac.h +++ b/Transceiver52M/grgsm_vitac/grgsm_vitac.h @@ -42,6 +42,10 @@ #define MULTI_VER_TARGET_ATTR_CLANGONLY #endif +/* ancient gcc < 8 has no attribute, clang always pretends to be gcc 4 */ +#if !defined(__clang__) && __GNUC__ < 8 +#define NO_UBSAN __attribute__((no_sanitize_undefined)) +#else #if defined(__has_attribute) #if __has_attribute(no_sanitize) #define NO_UBSAN __attribute__((no_sanitize("undefined"))) @@ -49,6 +53,7 @@ #else #define NO_UBSAN #endif +#endif #define SYNC_SEARCH_RANGE 30 const int d_OSR(4); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib94b9b073a0d2af84ce5791b5f40c63cd7ef9329 Gerrit-Change-Number: 34248 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by daniel

Attention is currently required from: laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34244 ) Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: 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: Wed, 30 Aug 2023 09:43:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 5: Code-Review+1 (1 comment) Patchset: PS5: +1 now, and we decided we shall move the pagingCmd forwarding to follow the usual PCH queue in paging.c instead of sending immedately (probably with a restranmit_count=1). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 09:35:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by pespin

Attention is currently required from: laforge, pespin, daniel. Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 to look at the new patch set (#4). Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... meas_feed: Increase wqueue max_len to 100 and make it vty-configurable The previous amount of 10 messages may be small if the BSC is processing lots of measurements from lots of BTS connected to it. Increase it to 100 by default, and allow changing the write_queue length through the VTY. Related: SYS#6550 Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 --- M include/osmocom/bsc/meas_feed.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/meas_feed.c 3 files changed, 48 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/34244/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: 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-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: TEST: DONT MERGE

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34231 ) Change subject: TEST: DONT MERGE ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5e220f6fd3a30ca921a2dea915275fcd4ae30ac4 Gerrit-Change-Number: 34231 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

8 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: TEST: DONT MERGE

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34231 ) Change subject: TEST: DONT MERGE ...................................................................... Patch Set 1: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5e220f6fd3a30ca921a2dea915275fcd4ae30ac4 Gerrit-Change-Number: 34231 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 09:21:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: osmobts_sock: cosmetic, put a dot between "v" and version number

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34239 ) Change subject: osmobts_sock: cosmetic, put a dot between "v" and version number ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I also don't get this change. Where have we ever used a v-dot notation when talking about MNCC or PCUIF versions? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7c70c4d4440fa9885e1efb80e6f2e4e821ac916f Gerrit-Change-Number: 34239 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 09:20:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 ) Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 09:19:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF: fix coding of 'lqual_cb' field in PCUIF_data

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34247 ) Change subject: PCUIF: fix coding of 'lqual_cb' field in PCUIF_data ...................................................................... PCUIF: fix coding of 'lqual_cb' field in PCUIF_data This patch fixes BTS_Tests.TC_pcu_data_ind_lqual_cb, which is currently failing due to incorrect decoding of the 'lqual_cb' field: "Link quality -32512 does not match expected value -256" The COMP attribute is documented in TITAN's reference guide, see 4-ttcn3_language_extensions.adoc#attributes for more info. Change-Id: I79b8cd41010f212898fbf39c4c600ace69603e79 Related: OS#5954 --- M library/PCUIF_Types.ttcn 1 file changed, 22 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index b8bd6e9..b6a1bfa 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -103,7 +103,10 @@ uint16_t ber10k, int16_t ta_offs_qbits, int16_t lqual_cb -} with { variant (data) "FIELDLENGTH(162), ALIGN(left)" }; +} with { + variant (data) "FIELDLENGTH(162), ALIGN(left)" + variant (lqual_cb) "COMP(2scompl)" +}; type record PCUIF_data_cnf { PCUIF_Sapi sapi, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34247 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: I79b8cd41010f212898fbf39c4c600ace69603e79 Gerrit-Change-Number: 34247 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF: fix coding of 'lqual_cb' field in PCUIF_data

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34247 ) Change subject: PCUIF: fix coding of 'lqual_cb' field in PCUIF_data ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34247 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: I79b8cd41010f212898fbf39c4c600ace69603e79 Gerrit-Change-Number: 34247 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 09:19:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... ASCI: Add tests for voice group/broadcast calls at MSC Related: OS#4854 Change-Id: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn A msc/MSC_Tests_ASCI.ttcn 4 files changed, 718 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 396c3f7..e25d496 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1517,7 +1517,7 @@ } } -private altstep as_optional_mgcp_mdcx(HostName mgw_rtp_ip, PortNumber mgw_rtp_port) runs on BSC_ConnHdlr { +altstep as_optional_mgcp_mdcx(HostName mgw_rtp_ip, PortNumber mgw_rtp_port) runs on BSC_ConnHdlr { var MgcpCommand mgcp_cmd; [] MGCP.receive(tr_MDCX) -> value mgcp_cmd { log("as_optional_mgcp_mdcx: rx MDCX"); @@ -1540,7 +1540,7 @@ } } -private altstep as_optional_mgcp_dlcx(CallParameters cpars) runs on BSC_ConnHdlr { +altstep as_optional_mgcp_dlcx(CallParameters cpars) runs on BSC_ConnHdlr { var MgcpCommand mgcp_cmd; var boolean respond_to_dlcx := not (isbound(cpars.mgw_drop_dlcx) and valueof(cpars.mgw_drop_dlcx)); [] MGCP.receive(tr_DLCX(?)) -> value mgcp_cmd { diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg index 7894099..ee36336 100644 --- a/msc/MSC_Tests.cfg +++ b/msc/MSC_Tests.cfg @@ -17,6 +17,7 @@ [EXECUTE] MSC_Tests.control MSC_Tests_Iu.control +MSC_Tests_ASCI.control #MSC_Tests.TC_cr_before_reset #MSC_Tests.TC_lu_imsi_noauth_tmsi #MSC_Tests.TC_lu_imsi_noauth_notmsi diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 0bd1b02..6f23e5f 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -13,6 +13,7 @@ */ friend module MSC_Tests_Iu; +friend module MSC_Tests_ASCI; import from General_Types all; import from Osmocom_Types all; diff --git a/msc/MSC_Tests_ASCI.ttcn b/msc/MSC_Tests_ASCI.ttcn new file mode 100644 index 0000000..76d8d3c --- /dev/null +++ b/msc/MSC_Tests_ASCI.ttcn @@ -0,0 +1,704 @@ +module MSC_Tests_ASCI { + +/* Osmocom MSC test suite for ASCI support in TTCN-3 + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Andreas Eversberg + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; + +import from BSC_ConnectionHandler all; +import from MSC_Tests all; + +import from Osmocom_VTY_Functions all; + +import from GSUP_Emulation all; +import from RAN_Emulation all; +import from MGCP_Emulation all; + +import from RANAP_Templates all; + +import from BSSAP_Types all; +import from BSSMAP_Templates all; + +import from L3_Templates all; + +import from MobileL3_CommonIE_Types all; + + +/* Call control for VGCS and VBS + * + * There are 3 connection: + * - "call" = voice group/broadcast call initiated by the calling subscriber + * - "control" = VGCS/VBS call control connection + * - "channel" = VGCS/VBS channel resource connection + * + * All 3 connections have their own handlers. They send their test results via + * COORD messages to the main test function. There the result is collected and + * the outcome of the test is checked. + */ + +/* Test functions */ +const charstring COORD_TEST_NO_CALLREF := "TEST_NO_CALLREF"; +const charstring COORD_TEST_SETUP_REFUSE := "TEST_SETUP_REFUSE"; +const charstring COORD_TEST_ASSIGN_FAIL := "TEST_ASSIGN_FAIL"; +const charstring COORD_TEST_COMPLETE_VGCS := "TEST_COMPLETE_VGCS"; +const charstring COORD_TEST_COMPLETE_VBS := "TEST_COMPLETE_VBS"; + +/* COORD pipes for each connection */ +type component asci_CT extends MTC_CT { + port BSC_ConnHdlr_Coord_PT COORD_call; + port BSC_ConnHdlr_Coord_PT COORD_control; + port BSC_ConnHdlr_Coord_PT COORD_channel; +} + +/* COORD messages for test events */ +const charstring COORD_SETUP := "SETUP"; +const charstring COORD_VGCS_SETUP := "VGCS_SETUP"; +const charstring COORD_VGCS_ASSIGN := "VGCS_ASSIGN"; +const charstring COORD_UPLINK_SEIZED := "UPLINK_SEIZED"; +const charstring COORD_GCC_CONNECT := "GCC_CONNECT"; +const charstring COORD_BCC_CONNECT := "BCC_CONNECT"; +const charstring COORD_GCC_SET_PARAM := "GCC_SET_PARAM"; +const charstring COORD_BCC_SET_PARAM := "BCC_SET_PARAM"; +const charstring COORD_UPLINK_REQ_ACK := "UPLINK_REQ_ACK"; +const charstring COORD_GCC_TERMINATION := "GCC_TERMINATION"; +const charstring COORD_BCC_TERMINATION := "BCC_TERMINATION"; +const charstring COORD_GCC_TERMINATION_FAIL := "GCC_TERMINATION_FAIL"; +const charstring COORD_BCC_TERMINATION_FAIL := "BCC_TERMINATION_FAIL"; +const charstring COORD_ASSIGNMENT := "ASSIGNMENT"; +const charstring COORD_CLEAR := "CLEAR"; + +template (value) DescriptiveGroupOrBroadcastCallReference_V + ts_BSSMAP_IE_GroupCallRef(integer cr, + BIT1 sf, + BIT1 af, + BIT3 prio, + BIT4 ci) := { + binaryCodingOfGroupOrBroadcastCallReference := int2bit(cr, 27), + sF := sf, + aF := af, + callPriority := prio, + cipheringInformation := ci, + spare := '0000'B +} + +function f_gen_asci_ass_res(integer bssap_idx := 0, + template (value) BSSMAP_IE_ChannelType ch_type := ts_BSSMAP_IE_ChannelType, + template (value) BSSMAP_IE_CellIdentifier cell_id := ts_CellId_CI(0), + template (omit) BSSMAP_IE_AoIP_TransportLayerAddress aoip_tla := omit, + template (omit) BSSMAP_IE_SpeechCodec codec := omit, + template (omit) OCT4 call_id := omit) +runs on BSC_ConnHdlr return template (value) PDU_BSSAP { + if (mp_bssap_cfg[bssap_idx].transport == BSSAP_TRANSPORT_AoIP) { + return ts_BSSMAP_VGCS_VBS_AssignmentRes(ch_type, cell_id, omit, omit, aoip_tla, codec, call_id); + } else { + var template (value) BSSMAP_IE_CircuitIdentityCode cic := ts_BSSMAP_IE_CIC(0,1); + return ts_BSSMAP_VGCS_VBS_AssignmentRes(ch_type, cell_id, omit, cic, omit, omit, omit); + } +} + +/* "call" connection handling */ +private function f_tc_vgcs_call(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr +{ + /* Receive test case from main function. */ + var charstring test; + COORD.receive(charstring:?) -> value test; + + /* Initialize variables and templates. */ + var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); + var template (value) DescriptiveGroupOrBroadcastCallReference_V callref := + ts_BSSMAP_IE_GroupCallRef(oct2int('190000'O), '1'B, '0'B, '000'B, '0000'B); + if (test == COORD_TEST_COMPLETE_VBS) { + callref := ts_BSSMAP_IE_GroupCallRef(oct2int('1a0000'O), '0'B, '0'B, '000'B, '0000'B); + } + var template BSSMAP_IE_ChannelType tr_ch_type := tr_BSSMAP_IE_ChannelType('0001'B, ChRate_TCHF, Spdi_TCHF_FR); + var template PDU_BSSAP tr_assignment_req := tr_BSSMAP_AssignmentReq(); + tr_assignment_req.pdu.bssmap.assignmentRequest.channelType := tr_ch_type; + tr_assignment_req.pdu.bssmap.assignmentRequest.groupCallReference := + tr_BSSMAP_IE_GroupCallRef(bit2oct(encvalue(callref))); + /* Due to a bug in dec_PDU_BSSAP(), we do not get the callref IE, so we need to match it with omit. */ + tr_assignment_req.pdu.bssmap.assignmentRequest.groupCallReference := omit; + var template (value) PDU_BSSAP ts_assignment_cpl := ts_BSSMAP_AssignmentComplete(omit, omit, omit, omit); + var octetstring xcc_termination_21 := '340121'O; + var octetstring xcc_termination_11 := '340111'O; + var PDU_BSSAP rx_bssap; + + f_init_handler(pars); + + /* Location Update to make subscriber known. */ + f_perform_lu(); + + /* MGW */ + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + var default crcx := activate(as_optional_mgcp_crcx(cpars)); + var default mdcx := activate(as_optional_mgcp_mdcx(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_port)); + var default dlcx := activate(as_optional_mgcp_dlcx(cpars)); + + /* Establish connection using the service type, defined by the test. */ + if (test == COORD_TEST_COMPLETE_VBS) { + f_establish_fully(EST_TYPE_VBS); + } else { + f_establish_fully(EST_TYPE_VGCS); + } + + /* Send incorrect call reference, if selected by test. */ + log("Sending SETUP."); + select (test) { + case (COORD_TEST_NO_CALLREF) { + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_GCC(cpars.transaction_id, '3200002900'O))); + } + case (COORD_TEST_COMPLETE_VBS) { + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_BCC(cpars.transaction_id, '3200001a00'O))); + } + case else { + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_GCC(cpars.transaction_id, '3200001900'O))); + } + } + COORD.send(COORD_SETUP); + + timer T := 10.0; + T.start; + alt { + [] BSSAP.receive(tr_assignment_req) -> value rx_bssap { + /* The MSC sends and Assignment Request to assign the calling subscriber to the VGCS/VBS channel. */ + log("Got Assignment Request: ", rx_bssap); + COORD.send(COORD_ASSIGNMENT); + log("Sending Assignment Complete: ", ts_assignment_cpl); + BSSAP.send(ts_assignment_cpl); + repeat; + } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_GCC(cpars.transaction_id, xcc_termination_21))) { + /* The MSC terminates the group call with cause 21 = requested service not subscribed. */ + log("Got GCC Termination with failure."); + COORD.send(COORD_GCC_TERMINATION_FAIL); + repeat; + } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_BCC(cpars.transaction_id, xcc_termination_21))) { + /* The MSC terminates the broadcast call with cause 21 = requested service not subscribed. */ + log("Got BCC Termination with failure."); + COORD.send(COORD_BCC_TERMINATION_FAIL); + repeat; + } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_GCC(cpars.transaction_id, xcc_termination_11))) { + /* The MSC terminates the group call with cause 11 = network failure. */ + log("Got GCC Termination with failure."); + COORD.send(COORD_GCC_TERMINATION_FAIL); + repeat; + } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_BCC(cpars.transaction_id, xcc_termination_11))) { + /* The MSC terminates the broadcast call with cause 11 = network failure. */ + log("Got BCC Termination with failure."); + COORD.send(COORD_BCC_TERMINATION_FAIL); + repeat; + } + [] BSSAP.receive(tr_BSSMAP_ClearCommand) { + /* The SCCP connection is released. */ + log("Got Clear Command on initial connection."); + COORD.send(COORD_CLEAR); + repeat; + } + [] BSSAP.receive { + setverdict(fail, "Got unexpected message on initial connection."); + } + [] COORD.receive(COORD_CLEAR) { } + [] T.timeout { + setverdict(fail, "Timeout waiting for Message"); + } + } + + deactivate(crcx); + deactivate(mdcx); + deactivate(dlcx); +} + +/* "control" connection handling */ +private function f_tc_vgcs_control(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr +{ + /* Receive test case from main function. */ + var charstring test; + COORD.receive(charstring:?) -> value test; + + /* Initialize variables and templates. */ + var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); + var template (value) DescriptiveGroupOrBroadcastCallReference_V callref := + ts_BSSMAP_IE_GroupCallRef(oct2int('190000'O), '1'B, '0'B, '000'B, '0000'B); + if (test == COORD_TEST_COMPLETE_VBS) { + callref := ts_BSSMAP_IE_GroupCallRef(oct2int('1a0000'O), '0'B, '0'B, '000'B, '0000'B); + } + var template PDU_BSSAP tr_vgcs_vbs_setup := tr_BSSMAP_VGCS_VBS_Setup(bit2oct(encvalue(callref))); + var template (value) PDU_BSSAP ts_vgcs_vbs_setup_ack := ts_BSSMAP_VGCS_VBS_SetupAck(omit); + var myBSSMAP_Cause cause_fail := GSM0808_CAUSE_EQUIPMENT_FAILURE; + var template (value) PDU_BSSAP ts_vgcs_vbs_setup_refuse := ts_BSSMAP_VGCS_VBS_SetupRefuse(enum2int(cause_fail)); + var octetstring gcc_connect := '330000190001'O; + var octetstring bcc_connect := '3300001a0001'O; + var octetstring xcc_set_param := '3A07'O; + var octetstring gcc_term_req := '3500001900'O; + var octetstring bcc_term_req := '3500001a00'O; + var octetstring xcc_termination := '340110'O; + var myBSSMAP_Cause cause_success := GSM0808_CAUSE_CALL_CONTROL; + var template (value) PDU_BSSAP ts_uplink_rel_ind := ts_BSSMAP_UplinkRelInd(enum2int(cause_success), omit); + var template (value) PDU_BSSAP ts_uplink_req := ts_BSSMAP_UplinkReq; + var PDU_BSSAP rx_bssap; + + f_init_handler(pars); + + f_create_bssmap_exp_n_connect(193); + + timer T := 7.0; + T.start; + alt { + [] BSSAP.receive(tr_vgcs_vbs_setup) -> value rx_bssap { + /* The MSC sets up call control on the BSC. The test case will send an ack or a refuse. */ + log("Got VGCS/VBS Setup: ", rx_bssap); + COORD.send(COORD_VGCS_SETUP); + if (test == COORD_TEST_SETUP_REFUSE) { + log("Sending VGCS/VBS Setup Refuse: ", ts_vgcs_vbs_setup_refuse); + BSSAP.send(ts_vgcs_vbs_setup_refuse); + } else { + log("Sending VGCS/VBS Setup Ack: ", ts_vgcs_vbs_setup_ack); + BSSAP.send(ts_vgcs_vbs_setup_ack); + } + repeat; + } + [] BSSAP.receive(tr_BSSMAP_UplinkSeizedCmd(GSM0808_CAUSE_CALL_CONTROL)) -> value rx_bssap { + /* After setting up the call, the MSC marks the call as busy. */ + log("Got Uplink Seized Cmd: ", rx_bssap); + COORD.send(COORD_UPLINK_SEIZED); + repeat; + } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_GCC(cpars.transaction_id, gcc_connect))) { + /* The GCC CONNECT message is sent to the calling MS. */ + log("Got GCC Connect."); + COORD.send(COORD_GCC_CONNECT); + repeat; + } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_BCC(cpars.transaction_id, bcc_connect))) { + /* The BCC CONNECT message is sent to the calling MS. */ + log("Got BCC Connect."); + COORD.send(COORD_BCC_CONNECT); + repeat; + } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_GCC(cpars.transaction_id, xcc_set_param))) { + /* The GCC SET PARAMETER message is sent to the calling MS. */ + log("Got GCC Set Parameter."); + COORD.send(COORD_GCC_SET_PARAM); + f_sleep(0.2); + /* The MS releases the uplink. */ + log("Sending Uplink Release Ind: ", ts_uplink_rel_ind); + BSSAP.send(ts_uplink_rel_ind); + f_sleep(0.2); + /* The MS requests the uplink again. */ + log("Sending Uplink Req: ", ts_uplink_req); + BSSAP.send(ts_uplink_req); + repeat; + } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_BCC(cpars.transaction_id, xcc_set_param))) { + /* The BCC SET PARAMETER message is sent to the calling MS. */ + log("Got BCC Set Parameter"); + COORD.send(COORD_BCC_SET_PARAM); + f_sleep(0.2); + /* The MS requests termination of the call. */ + log("Sending BCC Termination Request: ", bcc_term_req); + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_BCC(cpars.transaction_id, bcc_term_req))); + repeat; + } + [] BSSAP.receive(tr_BSSMAP_UplinkReqAck(*)) -> value rx_bssap { + /* The uplink was granted by the MSC. */ + log("Got Uplink Request Acknowledge: ", rx_bssap); + COORD.send(COORD_UPLINK_REQ_ACK); + f_sleep(0.2); + /* The MS requests termination of the call. */ + log("Sending GCC Termination Request: ", gcc_term_req); + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_GCC(cpars.transaction_id, gcc_term_req))); + repeat; + } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_GCC(cpars.transaction_id, xcc_termination))) { + /* The MSC terminates the call towards the MS. */ + log("Got GCC Termination."); + COORD.send(COORD_GCC_TERMINATION); + repeat; + } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_BCC(cpars.transaction_id, xcc_termination))) { + /* The MSC terminates the call towards the MS. */ + log("Got BCC Termination."); + COORD.send(COORD_BCC_TERMINATION); + repeat; + } + [] BSSAP.receive(tr_BSSMAP_ClearCommand) { + /* The SCCP connection is released. */ + log("Got Clear Command on control connection."); + COORD.send(COORD_CLEAR); + repeat; + } + [] BSSAP.receive(PDU_BSSAP:?) -> value rx_bssap { + setverdict(fail, "Got unexpected BSSAP message on control connection: ", rx_bssap); + } + [] BSSAP.receive { + setverdict(fail, "Got unexpected message on control connection."); + } + [] COORD.receive(COORD_CLEAR) { } + [] T.timeout { + setverdict(fail, "Timeout on control connection."); + } + } +} + +/* "channel" connection handling */ +private function f_tc_vgcs_channel(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr +{ + /* Receive test case from main function. */ + var charstring test; + COORD.receive(charstring:?) -> value test; + + /* Initialize variables and templates. */ + var template (value) DescriptiveGroupOrBroadcastCallReference_V callref := + ts_BSSMAP_IE_GroupCallRef(oct2int('190000'O), '1'B, '0'B, '000'B, '0000'B); + if (test == COORD_TEST_COMPLETE_VBS) { + callref := ts_BSSMAP_IE_GroupCallRef(oct2int('1a0000'O), '0'B, '0'B, '000'B, '0000'B); + } + var template (present) BSSMAP_IE_ChannelType tr_ch_type := + tr_BSSMAP_IE_ChannelType('0001'B, ChRate_TCHF, Spdi_TCHF_FR); + var template (value) BSSMAP_IE_ChannelType ts_ch_type := valueof(ts_BSSMAP_IE_ChannelTypeCTM); + var template (present) BSSMAP_IE_CellIdentifier tr_cell_id := tr_CellId_CI(42); + var template (value) BSSMAP_IE_CellIdentifier ts_cell_id := ts_CellId_CI(42); + var template (value) BSSMAP_IE_AoIP_TransportLayerAddress ts_tla := f_ts_BSSMAP_IE_AoIP_TLA("1.2.3.4", 2342); + var template (value) BSSMAP_IE_SpeechCodec ts_codec := ts_BSSMAP_IE_SpeechCodec({ts_CodecFR}); + var template PDU_BSSAP tr_vgcs_vbs_ass_req := + tr_BSSMAP_VGCS_VBS_AssignmentReq(tr_ch_type, '01'O, tr_cell_id, bit2oct(encvalue(callref)), *, *, *); + var template (value) PDU_BSSAP ts_vgcs_vbs_ass_res := + f_gen_asci_ass_res(0, ts_ch_type, ts_cell_id, ts_tla, ts_codec, '01000000'O); + var myBSSMAP_Cause cause_fail := GSM0808_CAUSE_EQUIPMENT_FAILURE; + var template (value) PDU_BSSAP ts_vgcs_vbs_ass_fail := ts_BSSMAP_VGCS_VBS_AssignmentFail(enum2int(cause_fail)); + var PDU_BSSAP rx_bssap; + + f_init_handler(pars); + + /* Wait some time before registering, because this has to be the second connection to be registered. */ + f_sleep(0.5); + f_create_bssmap_exp_n_connect(193); + + timer T := 7.0; + T.start; + alt { + [] BSSAP.receive(tr_vgcs_vbs_ass_req) -> value rx_bssap { + /* The MSC allocates channel on the given BTS. The test case will send a result or a failure. */ + log("Got VGCS/VBS Assignment Request: ", rx_bssap); + COORD.send(COORD_VGCS_ASSIGN); + if (test == COORD_TEST_ASSIGN_FAIL) { + log("Sending VGCS/VBS Assignment Failure: ", ts_vgcs_vbs_ass_fail); + BSSAP.send(ts_vgcs_vbs_ass_fail); + } else { + log("Sending VGCS/VBS Assignment Result: ", ts_vgcs_vbs_ass_res); + BSSAP.send(ts_vgcs_vbs_ass_res); + } + repeat; + } + [] BSSAP.receive(tr_BSSMAP_ClearCommand) { + /* The SCCP connection is released. */ + log("Got Clear Command on channel connection."); + COORD.send(COORD_CLEAR); + repeat; + } + [] BSSAP.receive(PDU_BSSAP:?) -> value rx_bssap { + setverdict(fail, "Got unexpected BSSAP message on channel connection: ", rx_bssap); + } + [] BSSAP.receive { + setverdict(fail, "Got unexpected message on channel connection."); + } + [] COORD.receive(COORD_CLEAR) { } + [] T.timeout { + setverdict(fail, "Timeout on channel connection."); + } + } +} + +/* Main function for call test */ +private function f_TC_asci_call(charstring test) runs on asci_CT +{ + var BSC_ConnHdlr vc_conn_call, vc_conn_control, vc_conn_channel; + var boolean got_vgcs_setup := false; + var boolean got_vgcs_assign := false; + var boolean got_uplink_seized := false; + var boolean got_gcc_connect := false; + var boolean got_bcc_connect := false; + var boolean got_gcc_set_param := false; + var boolean got_bcc_set_param := false; + var boolean got_uplink_req_ack := false; + var boolean got_gcc_termination := false; + var boolean got_bcc_termination := false; + var boolean got_gcc_termination_fail := false; + var boolean got_bcc_termination_fail := false; + var boolean got_assignment := false; + var boolean connection_call := false; + var boolean connection_control := false; + var boolean connection_channel := false; + var charstring event; + + f_init(); + + /* Enable ASCI in VTY and setup a VGC and a VBS. */ + f_vty_config(MSCVTY, "asci", "enable"); + f_vty_config2(MSCVTY, { "asci", "gcr", "vgc 200"}, "cell 0.24.1 42"); + f_vty_config2(MSCVTY, { "asci", "gcr", "vbc 208"}, "cell 0.24.1 42"); + + vc_conn_call := f_start_handler(refers(f_tc_vgcs_call), 33); + vc_conn_control := f_start_handler(refers(f_tc_vgcs_control), 34); + vc_conn_channel := f_start_handler(refers(f_tc_vgcs_channel), 35); + + connect(self:COORD_call, vc_conn_call:COORD); + connect(self:COORD_control, vc_conn_control:COORD); + connect(self:COORD_channel, vc_conn_channel:COORD); + + COORD_call.send(test); + COORD_control.send(test); + COORD_channel.send(test); + + /* Receive the test events until all three connections are released or not established. */ + timer T := 7.0, Texit := 0.5; + T.start; + alt { + [] COORD_call.receive(COORD_SETUP) -> value event { + log("Got test event: ", event); + connection_call := true; + repeat; + } + [] COORD_control.receive(COORD_VGCS_SETUP) -> value event { + log("Got test event: ", event); + got_vgcs_setup := true; + connection_control := true; + repeat; + } + [] COORD_channel.receive(COORD_VGCS_ASSIGN) -> value event { + log("Got test event: ", event); + got_vgcs_assign := true; + connection_channel := true; + repeat; + } + [] COORD_control.receive(COORD_UPLINK_REQ_ACK) -> value event { + log("Got test event: ", event); + got_uplink_req_ack := true; + repeat; + } + [] COORD_control.receive(COORD_GCC_CONNECT) -> value event { + log("Got test event: ", event); + got_gcc_connect := true; + repeat; + } + [] COORD_control.receive(COORD_BCC_CONNECT) -> value event { + log("Got test event: ", event); + got_bcc_connect := true; + repeat; + } + [] COORD_control.receive(COORD_GCC_SET_PARAM) -> value event { + log("Got test event: ", event); + got_gcc_set_param := true; + repeat; + } + [] COORD_control.receive(COORD_BCC_SET_PARAM) -> value event { + log("Got test event: ", event); + got_bcc_set_param := true; + repeat; + } + [] COORD_control.receive(COORD_UPLINK_SEIZED) -> value event { + log("Got test event: ", event); + got_uplink_seized := true; + repeat; + } + [] COORD_call.receive(COORD_GCC_TERMINATION_FAIL) -> value event { + log("Got test event: ", event); + got_gcc_termination_fail := true; + repeat; + } + [] COORD_call.receive(COORD_BCC_TERMINATION_FAIL) -> value event { + log("Got test event: ", event); + got_bcc_termination_fail := true; + repeat; + } + [] COORD_control.receive(COORD_GCC_TERMINATION) -> value event { + log("Got test event: ", event); + got_gcc_termination := true; + repeat; + } + [] COORD_control.receive(COORD_BCC_TERMINATION) -> value event { + log("Got test event: ", event); + got_bcc_termination := true; + repeat; + } + [] COORD_call.receive(COORD_ASSIGNMENT) -> value event { + log("Got test event: ", event); + got_assignment := true; + repeat; + } + [not connection_call] COORD_call.receive(COORD_CLEAR) -> value event { + setverdict(fail, "Received CLEAR COMMAND of initial call twice."); + } + [] COORD_call.receive(COORD_CLEAR) -> value event { + log("Got test event: ", event); + connection_call := false; + if (connection_call or connection_control or connection_channel) { + repeat; + } + Texit.start; + repeat; + } + [not connection_control] COORD_control.receive(COORD_CLEAR) -> value event { + setverdict(fail, "Received CLEAR COMMAND control connection twice."); + } + [] COORD_control.receive(COORD_CLEAR) -> value event { + log("Got test event: ", event); + connection_control := false; + if (connection_call or connection_control or connection_channel) { + repeat; + } + Texit.start; + repeat; + } + [not connection_channel] COORD_channel.receive(COORD_CLEAR) -> value event { + setverdict(fail, "Received CLEAR COMMAND of channel connection twice."); + } + [] COORD_channel.receive(COORD_CLEAR) -> value event { + log("Got test event: ", event); + connection_channel := false; + if (connection_call or connection_control or connection_channel) { + repeat; + } + Texit.start; + repeat; + } + [] COORD_call.receive { + setverdict(fail, "Unhandled COORD_call, please fix!"); + } + [] COORD_control.receive { + setverdict(fail, "Unhandled COORD_control, please fix!"); + } + [] COORD_channel.receive { + setverdict(fail, "Unhandled COORD_channel, please fix!"); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for Test result"); + } + [] Texit.timeout { + log("All connection are cleared now."); + } + } + + /* Tell the connection handlers to exit. */ + COORD_call.send(COORD_CLEAR); + COORD_control.send(COORD_CLEAR); + COORD_channel.send(COORD_CLEAR); + + vc_conn_call.done; + vc_conn_control.done; + vc_conn_channel.done; + + if (getverdict == fail) { + return; + } + + /* Check if the outcome of each test is as expected. */ + select (test) { + case (COORD_TEST_NO_CALLREF) { + if (not got_vgcs_setup and + not got_vgcs_assign and + got_gcc_termination_fail) { + setverdict(pass); + } + } + case (COORD_TEST_SETUP_REFUSE) { + if (got_vgcs_setup and + not got_vgcs_assign and + got_gcc_termination_fail) { + setverdict(pass); + } + } + case (COORD_TEST_ASSIGN_FAIL) { + if (got_vgcs_setup and + got_vgcs_assign and + got_gcc_termination_fail) { + setverdict(pass); + } + } + case (COORD_TEST_COMPLETE_VGCS) { + if (got_vgcs_setup and + got_vgcs_assign and + got_uplink_req_ack and + got_gcc_connect and + got_gcc_set_param and + got_uplink_seized and + got_gcc_termination and + got_assignment) { + setverdict(pass); + } + } + case (COORD_TEST_COMPLETE_VBS) { + if (got_vgcs_setup and + got_vgcs_assign and + not got_uplink_req_ack and + got_bcc_connect and + got_bcc_set_param and + got_uplink_seized and + got_bcc_termination and + got_assignment) { + setverdict(pass); + } + } + case else { + setverdict(fail, "Test case has no check for the outcome, please fix! Test was: ", test); + } + } + + if (getverdict == pass) { + log("All expected events have been received. The test passed."); + } else { + setverdict(fail, "Not all expected event received."); + } +} + +/* A call is tried, but the given call reference does not exit. */ +testcase TC_no_callref() runs on asci_CT +{ + f_TC_asci_call(COORD_TEST_NO_CALLREF); +} + +/* The VGCS/VBS is refused by the BSC. */ +testcase TC_setup_refuse() runs on asci_CT +{ + f_TC_asci_call(COORD_TEST_SETUP_REFUSE); +} + +/* The VGCS/VBS channel is refused by the BSC. */ +testcase TC_assign_fail() runs on asci_CT +{ + f_TC_asci_call(COORD_TEST_ASSIGN_FAIL); +} + +/* The VGCS call is completed and the MS releases and requests the uplink again. Then it terminates the call. */ +testcase TC_complete_vgcs() runs on asci_CT +{ + f_TC_asci_call(COORD_TEST_COMPLETE_VGCS); +} + +/* The VBS call is completed and the MS terminates the call. */ +testcase TC_complete_vbs() runs on asci_CT +{ + f_TC_asci_call(COORD_TEST_COMPLETE_VBS); +} + +control { + execute( TC_no_callref() ); + execute( TC_setup_refuse() ); + execute( TC_assign_fail() ); + execute( TC_complete_vgcs() ); + execute( TC_complete_vbs() ); +} + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by laforge

Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 09:18:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34245 ) Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... ns2: Add VTY option to change the max write queue size for UDP Ensure that existing binds are updated as well. In some cases the default max length of the osmo_io txqueue could be too small. Set it to 128 by default and add a VTY option to change it for an NSI (program-wide). Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Related: SYS#6550 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c 4 files changed, 58 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 02d2266..4e496c1 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -1451,6 +1451,8 @@ nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES] = 3; nsi->timeout[NS_TOUT_TSNS_PROCEDURES_RETRIES] = 3; + nsi->txqueue_max_length = NS_DEFAULT_TXQUEUE_MAX_LENGTH; + return nsi; } diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 37b142e..7ac77e5 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -80,6 +80,8 @@ #define NS_ALLOC_SIZE 3072 #define NS_ALLOC_HEADROOM 20 +#define NS_DEFAULT_TXQUEUE_MAX_LENGTH 128 + enum ns2_timeout { NS_TOUT_TNS_BLOCK, NS_TOUT_TNS_BLOCK_RETRIES, @@ -164,6 +166,8 @@ /*! workaround for rate counter until rate counter accepts char str as index */ uint32_t nsvc_rate_ctr_idx; uint32_t bind_rate_ctr_idx; + + uint32_t txqueue_max_length; }; @@ -450,6 +454,7 @@ struct gprs_ns2_vc_bind *ns2_ip_get_bind_by_index(struct gprs_ns2_inst *nsi, struct osmo_sockaddr *remote, int index); +void ns2_ip_set_txqueue_max_length(struct gprs_ns2_vc_bind *bind, unsigned int max_length); /* sns */ int ns2_sns_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp); diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index f24eae6..1dcc303 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -336,6 +336,7 @@ priv->iofd = osmo_iofd_setup(bind, rc, "NS bind", OSMO_IO_FD_MODE_RECVFROM_SENDTO, &ioops, bind); osmo_iofd_register(priv->iofd, rc); osmo_iofd_set_alloc_info(priv->iofd, 4096, 128); + osmo_iofd_set_txqueue_max_length(priv->iofd, nsi->txqueue_max_length); /* IPv4: max fragmented payload can be (13 bit) * 8 byte => 65535. * IPv6: max payload can be 65535 (RFC 2460). @@ -574,6 +575,14 @@ return NULL; } +void ns2_ip_set_txqueue_max_length(struct gprs_ns2_vc_bind *bind, unsigned int max_length) +{ + struct priv_bind *priv = bind->priv; + OSMO_ASSERT(gprs_ns2_is_ip_bind(bind)); + + osmo_iofd_set_txqueue_max_length(priv->iofd, max_length); +} + /*! set the signalling and data weight for this bind * \param[in] bind * \param[in] signalling the signalling weight diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 3046fff..3132e34 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -36,6 +36,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/msgb.h> +#include <osmocom/core/osmo_io.h> #include <osmocom/core/rate_ctr.h> #include <osmocom/core/select.h> #include <osmocom/core/talloc.h> @@ -595,6 +596,9 @@ get_value_string(gprs_ns_timer_strs, i), vty_nsi->timeout[i], VTY_NEWLINE); + if (vty_nsi->txqueue_max_length != NS_DEFAULT_TXQUEUE_MAX_LENGTH) + vty_out(vty, " txqueue-max-length %u%s", vty_nsi->txqueue_max_length, VTY_NEWLINE); + ret = config_write_ns_bind(vty); if (ret) return ret; @@ -1707,6 +1711,27 @@ return CMD_WARNING; } +DEFUN(cfg_ns_txqueue_max_length, cfg_ns_txqueue_max_length_cmd, + "txqueue-max-length <1-4096>", + "Set the maximum length of the txqueue (for UDP)\n" + "Maximum length of the txqueue\n") +{ + struct gprs_ns2_vc_bind *bind; + uint32_t max_length = atoi(argv[0]); + vty_nsi->txqueue_max_length = max_length; + + + llist_for_each_entry(bind, &vty_nsi->binding, list) { + if (!gprs_ns2_is_ip_bind(bind)) + continue; + + ns2_ip_set_txqueue_max_length(bind, max_length); + } + + + return CMD_SUCCESS; +} + DEFUN(cfg_ns_nse_ip_sns_bind, cfg_ns_nse_ip_sns_bind_cmd, "ip-sns-bind BINDID", "IP SNS binds\n" @@ -2292,6 +2317,8 @@ install_lib_element(L_NS_NODE, &cfg_ns_ip_sns_default_bind_cmd); install_lib_element(L_NS_NODE, &cfg_no_ns_ip_sns_default_bind_cmd); + install_lib_element(L_NS_NODE, &cfg_ns_txqueue_max_length_cmd); + install_node(&ns_bind_node, NULL); install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_listen_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_listen_cmd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 5 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[M] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by laforge

Attention is currently required from: pespin, daniel, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34245 ) Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 30 Aug 2023 09:18:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by fixeria

Attention is currently required from: pespin, daniel, lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34245 ) Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 30 Aug 2023 08:58:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by jolly

Attention is currently required from: laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 4: (1 comment) File msc/MSC_Tests_ASCI.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/0878fc21_b6b3… PS3, Line 667: testcase TC_no_callref() runs on asci_CT { f_TC_asci_call(COORD_TEST_NO_CALLREF); } > ok, jolly please do that final change and then we can get it submitted. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 08:52:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by jolly

Attention is currently required from: jolly, pespin. Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 to look at the new patch set (#4). Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... ASCI: Add tests for voice group/broadcast calls at MSC Related: OS#4854 Change-Id: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn A msc/MSC_Tests_ASCI.ttcn 4 files changed, 718 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/33979/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[M] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by daniel

Attention is currently required from: fixeria, pespin, lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34245 ) Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... Patch Set 4: (1 comment) File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/34245/comment/3600f3b8_c115f5c2 PS3, Line 54: "osmocom/core/osmo_io.h" > cosmetic: use `<`/`>` and move above to other includes from `core` Thanks -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 30 Aug 2023 08:40:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by daniel

Attention is currently required from: fixeria, pespin, lynxis lazus. Hello Jenkins Builder, fixeria, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34245 to look at the new patch set (#4). Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... ns2: Add VTY option to change the max write queue size for UDP Ensure that existing binds are updated as well. In some cases the default max length of the osmo_io txqueue could be too small. Set it to 128 by default and add a VTY option to change it for an NSI (program-wide). Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Related: SYS#6550 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c 4 files changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/34245/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF: fix coding of 'lqual_cb' field in PCUIF_data

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34247 ) Change subject: PCUIF: fix coding of 'lqual_cb' field in PCUIF_data ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34247 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: I79b8cd41010f212898fbf39c4c600ace69603e79 Gerrit-Change-Number: 34247 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 08:23:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add osmo-ir77

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34238 ) Change subject: jobs/master-builds: add osmo-ir77 ...................................................................... jobs/master-builds: add osmo-ir77 Replace the legacy osmo-ir77 job (not done with jenkins-job-builder) with a new master-osmo-ir77 job that works just like the other master jobs: - build in docker - have build commands in contrib/jenkins.sh Depends: https://gitea.osmocom.org/satellite/osmo-ir77/pulls/1 Change-Id: I45034e4ed9ed8ad5683ac2de24521649f138b41c --- M jobs/master-builds.yml 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 2e54b63..f57bc96 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -343,6 +343,10 @@ master-osmo-hnodeb, master-osmo-hnbgw + - osmo-ir77: + git_base_url: https://gitea.osmocom.org/satellite + email: jenkins-notifications(a)lists.osmocom.org 246tnt(a)gmail.com + - osmo-mgw: trigger: master-osmo-msc, master-osmo-bsc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I45034e4ed9ed8ad5683ac2de24521649f138b41c Gerrit-Change-Number: 34238 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add osmo-ir77

by fixeria

Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34238 ) Change subject: jobs/master-builds: add osmo-ir77 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I45034e4ed9ed8ad5683ac2de24521649f138b41c Gerrit-Change-Number: 34238 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 30 Aug 2023 08:20:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by osmith

Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 ) Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 08:17:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by fixeria

Attention is currently required from: laforge, pespin, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34244 ) Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... Patch Set 3: (1 comment) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34244/comment/a2a74229_7963b107 PS2, Line 2424: 0-65535 > I also think 0 is dangerous and should be disallowed Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: 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-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 07:54:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by fixeria

Attention is currently required from: pespin, daniel, lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34245 ) Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/34245/comment/1df6b48a_5c300f15 PS3, Line 54: "osmocom/core/osmo_io.h" cosmetic: use `<`/`>` and move above to other includes from `core` -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 30 Aug 2023 07:33:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF: fix coding of 'lqual_cb' field in PCUIF_data

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34247 ) Change subject: PCUIF: fix coding of 'lqual_cb' field in PCUIF_data ...................................................................... PCUIF: fix coding of 'lqual_cb' field in PCUIF_data This patch fixes BTS_Tests.TC_pcu_data_ind_lqual_cb, which is currently failing due to incorrect decoding of the 'lqual_cb' field: "Link quality -32512 does not match expected value -256" The COMP attribute is documented in TITAN's reference guide, see 4-ttcn3_language_extensions.adoc#attributes for more info. Change-Id: I79b8cd41010f212898fbf39c4c600ace69603e79 Related: OS#5954 --- M library/PCUIF_Types.ttcn 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/34247/1 diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index b8bd6e9..b6a1bfa 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -103,7 +103,10 @@ uint16_t ber10k, int16_t ta_offs_qbits, int16_t lqual_cb -} with { variant (data) "FIELDLENGTH(162), ALIGN(left)" }; +} with { + variant (data) "FIELDLENGTH(162), ALIGN(left)" + variant (lqual_cb) "COMP(2scompl)" +}; type record PCUIF_data_cnf { PCUIF_Sapi sapi, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34247 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: I79b8cd41010f212898fbf39c4c600ace69603e79 Gerrit-Change-Number: 34247 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: contrib/libosmocore.spec: centos7: disable uring

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34241 ) Change subject: contrib/libosmocore.spec: centos7: disable uring ...................................................................... contrib/libosmocore.spec: centos7: disable uring liburing is not available in CentOS 7, so disable it there. I've verified that this works as expected in our OBS with CentOS 7, 8 and openSUSE Tumbleweed. Related: OS#5751 Change-Id: Ie2399754952d460499c9355706be37f792988bac --- M contrib/libosmocore.spec.in 1 file changed, 27 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index 3fde143..ebd1938 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -32,7 +32,9 @@ BuildRequires: pkgconfig(talloc) >= 2.1.0 BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libsystemd) +%if 0%{?centos_ver} != 7 BuildRequires: pkgconfig(liburing) +%endif %description libosmocore is a package with various utility functions that were @@ -339,8 +341,18 @@ %build echo "%version" >.tarball-version autoreconf -fiv -%configure --enable-shared --disable-static --enable-systemd-logging \ + +CONFIGURE_FLAGS=" + --enable-shared \ + --disable-static \ + --enable-systemd-logging \ --includedir="%_includedir/%name" +" +%if 0%{?centos_ver} == 7 + CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-uring" +%endif + +%configure $CONFIGURE_FLAGS make %{?_smp_mflags} V=1 %install -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2399754952d460499c9355706be37f792988bac Gerrit-Change-Number: 34241 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: contrib/libosmocore.spec: centos7: disable uring

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34241 ) Change subject: contrib/libosmocore.spec: centos7: disable uring ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2399754952d460499c9355706be37f792988bac Gerrit-Change-Number: 34241 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 18:35:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: write_queue: Introduce API osmo_wqueue_set_max_length()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34242 ) Change subject: write_queue: Introduce API osmo_wqueue_set_max_length() ...................................................................... Patch Set 1: (1 comment) File include/osmocom/core/write_queue.h: https://gerrit.osmocom.org/c/libosmocore/+/34242/comment/bf2120ab_f44b7b4f PS1, Line 51: void osmo_wqueue_set_max_length(struct osmo_wqueue *queue, unsigned int max_length); I'm not sure how useful this is, given that the 'struct osmo_wqueue' is public a few lines above. Yes, in general more encapsulation would be nice - but for backwards compatibility we can never move those public structs into private headers, and hence they will always remain public. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia1b138ed622f5efaa761bd9fa062b25b598f356f Gerrit-Change-Number: 34242 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 17:12:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log August 2023