- gerrit-log - lists.osmocom.org

Change in osmo-ci[master]: jobs, scripts: add 2022q2
by osmith 21 Jun '22

21 Jun '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28402 ) Change subject: jobs, scripts: add 2022q2 ...................................................................... jobs, scripts: add 2022q2 Related: SYS#6007 Change-Id: I59198f38ba817f56f6b24eae163297393587ec0b --- M jobs/ttcn3-testsuites.yml M scripts/common-obs.sh M scripts/osmocom-nightly-packages.sh 3 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/02/28402/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 5de6310..3190355 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -423,6 +423,29 @@ blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 30 16 * * * + # centos8 2022q2 (SYS#6007) + - TTCN3-centos-pcu-test-2022q2: + blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" + timer: 00 17 * * * + - TTCN3-centos-pcu-test-sns-2022q2: + blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" + timer: 15 17 * * * + - TTCN3-centos-bsc-test-2022q2: + blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" + timer: 30 17 * * * + - TTCN3-centos-mgw-test-2022q2: + blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" + timer: 45 17 * * * + - TTCN3-centos-bts-test-2022q2: + blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" + timer: 00 18 * * * + - TTCN3-centos-smlc-test-2022q2: + blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" + timer: 15 18 * * * + - TTCN3-centos-gbproxy-test-2022q2: + blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" + timer: 30 18 * * * + - job-template: name: '{job-name}' project-type: freestyle diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh index 2d3bea7..91d54c9 100644 --- a/scripts/common-obs.sh +++ b/scripts/common-obs.sh @@ -6,6 +6,7 @@ 2021q1 2021q4 2022q1 + 2022q2 latest next nightly diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 3f9fc4c..426495e 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -18,6 +18,7 @@ 2021q1 2021q4 2022q1 + 2022q2 next nightly " -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I59198f38ba817f56f6b24eae163297393587ec0b Gerrit-Change-Number: 28402 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-hnodeb[master]: llsk: Fix previous audio sapi version passed instead of current
by pespin 21 Jun '22

21 Jun '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28401 ) Change subject: llsk: Fix previous audio sapi version passed instead of current ...................................................................... llsk: Fix previous audio sapi version passed instead of current This bug showed up when running the whole TTCN3 hnodeb-test testsuite. llsk_audio_sapi_version_confirmed() was setting the expected struct size fo the version previously set. Related: SYS#5516 Change-Id: Ic94881f46b20ba2817b56d88ada9da5d13b1e294 --- M src/osmo-hnodeb/llsk.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-hnodeb/llsk.c b/src/osmo-hnodeb/llsk.c index f2d778f..ddb13c4 100644 --- a/src/osmo-hnodeb/llsk.c +++ b/src/osmo-hnodeb/llsk.c @@ -167,7 +167,7 @@ return -1; if (rem_version > LLSK_SAPI_AUDIO_VERSION_MAX) return LLSK_SAPI_AUDIO_VERSION_MAX; - if (llsk_audio_sapi_version_confirmed(hnb->llsk.sapi_version_audio) < 0) + if (llsk_audio_sapi_version_confirmed(rem_version) < 0) return -1; hnb->llsk.sapi_version_audio = rem_version; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ic94881f46b20ba2817b56d88ada9da5d13b1e294 Gerrit-Change-Number: 28401 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-hnodeb[master]: llsk: Fix previous audio sapi version passed instead of current
by pespin 21 Jun '22

21 Jun '22

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28401 ) Change subject: llsk: Fix previous audio sapi version passed instead of current ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ic94881f46b20ba2817b56d88ada9da5d13b1e294 Gerrit-Change-Number: 28401 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Jun 2022 10:47:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-hnodeb[master]: llsk: Fix previous audio sapi version passed instead of current
by pespin 21 Jun '22

21 Jun '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28401 ) Change subject: llsk: Fix previous audio sapi version passed instead of current ...................................................................... llsk: Fix previous audio sapi version passed instead of current This bug showed up when running the whole TTCN3 hnodeb-test testsuite. llsk_audio_sapi_version_confirmed() was setting the expected struct size fo the version previously set. Related: SYS#5516 Change-Id: Ic94881f46b20ba2817b56d88ada9da5d13b1e294 --- M src/osmo-hnodeb/llsk.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/01/28401/1 diff --git a/src/osmo-hnodeb/llsk.c b/src/osmo-hnodeb/llsk.c index f2d778f..ddb13c4 100644 --- a/src/osmo-hnodeb/llsk.c +++ b/src/osmo-hnodeb/llsk.c @@ -167,7 +167,7 @@ return -1; if (rem_version > LLSK_SAPI_AUDIO_VERSION_MAX) return LLSK_SAPI_AUDIO_VERSION_MAX; - if (llsk_audio_sapi_version_confirmed(hnb->llsk.sapi_version_audio) < 0) + if (llsk_audio_sapi_version_confirmed(rem_version) < 0) return -1; hnb->llsk.sapi_version_audio = rem_version; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ic94881f46b20ba2817b56d88ada9da5d13b1e294 Gerrit-Change-Number: 28401 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ci[master]: jobs/master-builds: disable master-osmo-opencm3-projects
by osmith 21 Jun '22

21 Jun '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28400 ) Change subject: jobs/master-builds: disable master-osmo-opencm3-projects ...................................................................... jobs/master-builds: disable master-osmo-opencm3-projects As discussed in the team meeting, disable it for now. Change-Id: I4a79a146042d5cf586f5273960a9a2b92b45b1be --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 0e60d2e..a03a14e 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -370,6 +370,7 @@ - osmo-opencm3-projects: cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de + disabled: true - osmo-e1d - osmo-cbc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4a79a146042d5cf586f5273960a9a2b92b45b1be Gerrit-Change-Number: 28400 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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

1 0

Change in osmo-cbc[master]: cbsp_server: Reorder logged message
by pespin 21 Jun '22

21 Jun '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28302 ) Change subject: cbsp_server: Reorder logged message ...................................................................... cbsp_server: Reorder logged message log macro needs to be changed since it uses cbsp_cbc_client_name() which accesses client->conn which is NULL in there. Change-Id: Ic444c749476bb1626df5494c00021c5e1a9f24b9 --- M src/cbsp_server.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/cbsp_server.c b/src/cbsp_server.c index c3d7471..b265b53 100644 --- a/src/cbsp_server.c +++ b/src/cbsp_server.c @@ -126,6 +126,8 @@ osmo_sock_get_ip_and_port(fd, remote_ip, sizeof(remote_ip), portbuf, sizeof(portbuf), false); remote_port = atoi(portbuf); + LOGP(DCBSP, LOGL_NOTICE, "New CBSP client connection from %s:%u\n", remote_ip, remote_port); + client->conn = osmo_stream_srv_create(link, link, fd, cbsp_cbc_read_cb, cbsp_cbc_closed_cb, client); if (!client->conn) { LOGP(DCBSP, LOGL_ERROR, "Unable to create stream server for %s:%d\n", @@ -167,9 +169,7 @@ client->peer->client.cbsp = client; } - LOGPCC(client, LOGL_NOTICE, "New CBSP client connection from %s:%u\n", remote_ip, remote_port); osmo_fsm_inst_dispatch(client->fi, CBSP_SRV_E_CMD_RESET, NULL); - return 0; } 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ic444c749476bb1626df5494c00021c5e1a9f24b9 Gerrit-Change-Number: 28302 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-cbc[master]: Rework cbsp_cbc_create() params
by pespin 21 Jun '22

21 Jun '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28299 ) Change subject: Rework cbsp_cbc_create() params ...................................................................... Rework cbsp_cbc_create() params There's no need to pass the specific params. Let's simply get whatever need from the global config in the function. This makes it easier to extend it to more params if needed. Also, when we add SBc-AP support, the params that have to be passed to the counter part function are different, so let's simplify param passing here. While at it, rename also the callback function to contain "cbsp" on it, since it is cbsp specific. Change-Id: Ia2362757275e7cbce82b64c7c2a0798276d964c3 --- M src/cbc_main.c M src/cbsp_server.c M src/cbsp_server.h M src/cbsp_server_fsm.c 4 files changed, 8 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/cbc_main.c b/src/cbc_main.c index bf29a1a..140d047 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -244,8 +244,7 @@ exit(1); } - if (cbsp_cbc_create(tall_cbc_ctx, g_cbc->config.cbsp.local_host, g_cbc->config.cbsp.local_port, - &cbc_client_rx_cb) == NULL) { + if (cbsp_cbc_create(tall_cbc_ctx) == NULL) { perror("Error binidng CBSP port\n"); exit(1); } diff --git a/src/cbsp_server.c b/src/cbsp_server.c index 3aa6332..c3d7471 100644 --- a/src/cbsp_server.c +++ b/src/cbsp_server.c @@ -206,18 +206,18 @@ } /* initialize the CBC-side CBSP server */ -struct osmo_cbsp_cbc *cbsp_cbc_create(void *ctx, const char *bind_ip, int bind_port, - int (*rx_cb)(struct osmo_cbsp_cbc_client *client, - struct osmo_cbsp_decoded *dec)) +struct osmo_cbsp_cbc *cbsp_cbc_create(void *ctx) { struct osmo_cbsp_cbc *cbc = talloc_zero(ctx, struct osmo_cbsp_cbc); int rc; + char *bind_ip = g_cbc->config.cbsp.local_host; + int bind_port = g_cbc->config.cbsp.local_port; if (bind_port == -1) bind_port = CBSP_TCP_PORT; OSMO_ASSERT(cbc); - cbc->rx_cb = rx_cb; + cbc->rx_cb = cbsp_cbc_client_rx_cb; INIT_LLIST_HEAD(&cbc->clients); cbc->link = osmo_stream_srv_link_create(cbc); osmo_stream_srv_link_set_data(cbc->link, cbc); diff --git a/src/cbsp_server.h b/src/cbsp_server.h index 8e91a53..21367c4 100644 --- a/src/cbsp_server.h +++ b/src/cbsp_server.h @@ -23,9 +23,7 @@ int (*rx_cb)(struct osmo_cbsp_cbc_client *client, struct osmo_cbsp_decoded *dec); }; -struct osmo_cbsp_cbc *cbsp_cbc_create(void *ctx, const char *bind_ip, int bind_port, - int (*rx_cb)(struct osmo_cbsp_cbc_client *client, - struct osmo_cbsp_decoded *dec)); +struct osmo_cbsp_cbc *cbsp_cbc_create(void *ctx); /* a single (remote) client connected to the (local) CBC server */ struct osmo_cbsp_cbc_client { @@ -44,3 +42,4 @@ const char *cbsp_cbc_client_name(const struct osmo_cbsp_cbc_client *client); void cbsp_cbc_client_tx(struct osmo_cbsp_cbc_client *client, struct osmo_cbsp_decoded *cbsp); void cbsp_cbc_client_close(struct osmo_cbsp_cbc_client *client); +int cbsp_cbc_client_rx_cb(struct osmo_cbsp_cbc_client *client, struct osmo_cbsp_decoded *dec); diff --git a/src/cbsp_server_fsm.c b/src/cbsp_server_fsm.c index 8fc16a8..b99a80a 100644 --- a/src/cbsp_server_fsm.c +++ b/src/cbsp_server_fsm.c @@ -269,7 +269,7 @@ } /* message was received from remote CBSP peer (BSC) */ -int cbc_client_rx_cb(struct osmo_cbsp_cbc_client *client, struct osmo_cbsp_decoded *dec) +int cbsp_cbc_client_rx_cb(struct osmo_cbsp_cbc_client *client, struct osmo_cbsp_decoded *dec) { struct cbc_message *smscb; struct cbc_message_peer *mp; 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia2362757275e7cbce82b64c7c2a0798276d964c3 Gerrit-Change-Number: 28299 Gerrit-PatchSet: 4 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

1 0

Change in osmo-ci[master]: jobs/master-builds: disable master-osmo-opencm3-projects
by laforge 21 Jun '22

21 Jun '22

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28400 ) Change subject: jobs/master-builds: disable master-osmo-opencm3-projects ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4a79a146042d5cf586f5273960a9a2b92b45b1be Gerrit-Change-Number: 28400 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, 21 Jun 2022 10:09:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-cbc[master]: Rework cbsp_cbc_create() params
by laforge 21 Jun '22

21 Jun '22

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28299 ) Change subject: Rework cbsp_cbc_create() params ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia2362757275e7cbce82b64c7c2a0798276d964c3 Gerrit-Change-Number: 28299 Gerrit-PatchSet: 3 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: Tue, 21 Jun 2022 10:09:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: cards: populate ADM1 key reference member
by laforge 21 Jun '22

21 Jun '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28278 ) Change subject: cards: populate ADM1 key reference member ...................................................................... cards: populate ADM1 key reference member In class SimCard, we specify the key reference for ADM1 as 0x04. in the UsimCard class, which inherits from SimCard nothing is specified, even though ETSI TS 102 221 specifies 0x0A as key reference. Lets set the member in UsimCard accordingly to be closer to the spec. Note: For the moment this is a cosmetic fix, it does not change the behaviour since all card classes derived from UsimCard set the key reference properly. Change-Id: I96af395b1832f4462a6043cca3bb3812fddac612 --- M pySim/cards.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index b186044..18e4ef3 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -348,6 +348,9 @@ def __init__(self, ssc): super(UsimCard, self).__init__(ssc) + # See also: ETSI TS 102 221, Table 9.3 + self._adm_chv_num = 0xA0 + def read_ehplmn(self): (res, sw) = self._scc.read_binary(EF_USIM_ADF_map['EHPLMN']) if sw == '9000': -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I96af395b1832f4462a6043cca3bb3812fddac612 Gerrit-Change-Number: 28278 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

2025

2024

2023

2022

gerrit-log