June 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: smscb: Base cell operational life cycle on CBCH being operative

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/28274 to look at the new patch set (#2). Change subject: smscb: Base cell operational life cycle on CBCH being operative ...................................................................... smscb: Base cell operational life cycle on CBCH being operative This allows running CBCH/ETWS related procedures only when the CBCH towards MS under that cell is operative. This also allows providing awarness of per-cell status to the CBSP peer as required per specs. Related: SYS#5910 Change-Id: Ia93919be94132fc010acb5bbfef0a6fd51c42981 --- M include/osmocom/bsc/smscb.h M src/osmo-bsc/bts.c M src/osmo-bsc/cbch_scheduler.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/smscb.c 5 files changed, 80 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/74/28274/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia93919be94132fc010acb5bbfef0a6fd51c42981 Gerrit-Change-Number: 28274 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Fix trailing whitespace

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28303 ) Change subject: cbc: Fix trailing whitespace ...................................................................... cbc: Fix trailing whitespace Change-Id: Ie54a6f6b9aea84ae1ec67ca34a34dd171f2e0177 --- M cbc/CBC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/28303/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index e76e61e..44ce2bb 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -109,7 +109,7 @@ } }; for (var integer i := 0; i < lengthof(inp.content); i := i+1) { - ret.smscb_message.payload.payload_encoded.pages := + ret.smscb_message.payload.payload_encoded.pages := ret.smscb_message.payload.payload_encoded.pages & { f_cbs2ecbe_page(inp.content[i]) }; } return ret; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28303 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: Ie54a6f6b9aea84ae1ec67ca34a34dd171f2e0177 Gerrit-Change-Number: 28303 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Improve CBSP port configuration

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28304 ) Change subject: cbc: Improve CBSP port configuration ...................................................................... cbc: Improve CBSP port configuration Previous -1 was taken by TTCN3 as default port (9999). Let's keep it excplictly as 9999 by default to avoid changing docker-playground.git. Change-Id: Ia7c599faa2101180089085c6cf5d483d2325ecac --- M cbc/CBC_Tests.ttcn 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/28304/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 44ce2bb..c408781 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -16,8 +16,9 @@ modulepar { charstring mp_cbc_host := "127.0.0.1"; - integer mp_cbc_port := 48049; - integer mp_ecbe_port := 12345; + integer mp_cbc_cbsp_port := 48049; + integer mp_cbc_ecbe_port := 12345; + integer mp_local_cbsp_port := 9999; }; type component test_CT extends CBSP_Adapter_CT, http_CT { @@ -132,8 +133,8 @@ } private function f_init(boolean raw := false) runs on test_CT { - f_http_init(mp_cbc_host, mp_ecbe_port); - CBSP_Adapter.f_connect(mp_cbc_host, mp_cbc_port, "", -1); + f_http_init(mp_cbc_host, mp_cbc_ecbe_port); + CBSP_Adapter.f_connect(mp_cbc_host, mp_cbc_cbsp_port, "", mp_local_cbsp_port); if (not raw) { var BSSMAP_FIELD_CellIdentificationList cell_list := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28304 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: Ia7c599faa2101180089085c6cf5d483d2325ecac Gerrit-Change-Number: 28304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-cbc[master]: cbsp_server: Reorder logged message

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28302 to look at the new patch set (#2). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/02/28302/2 -- 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in osmo-cbc[master]: cbsp_server: Reorder logged message

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28302 ) Change subject: cbsp_server: Reorder logged message ...................................................................... cbsp_server: Reorder logged message Change-Id: Ic444c749476bb1626df5494c00021c5e1a9f24b9 --- M src/cbsp_server.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/02/28302/1 diff --git a/src/cbsp_server.c b/src/cbsp_server.c index c3d7471..ed6ad8f 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); + LOGPCC(client, 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; } -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: vty: command.c: Add assert

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28301 ) Change subject: vty: command.c: Add assert ...................................................................... vty: command.c: Add assert a program being developed right now crashed at this point, without providing any meaningful information on where did it crash. Change-Id: Ia14f43142e7409f72eb9efd5c9131bea5eed6e82 --- M src/vty/command.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/28301/1 diff --git a/src/vty/command.c b/src/vty/command.c index 2a8942d..d7b8026 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -1092,6 +1092,7 @@ static vector cmd_node_vector(vector v, enum node_type ntype) { struct cmd_node *cnode = vector_slot(v, ntype); + OSMO_ASSERT(cnode != NULL); return cnode->cmd_vector; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia14f43142e7409f72eb9efd5c9131bea5eed6e82 Gerrit-Change-Number: 28301 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: make: Allow passing OSMO_CBC_BRANCH to docker

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28300 ) Change subject: make: Allow passing OSMO_CBC_BRANCH to docker ...................................................................... make: Allow passing OSMO_CBC_BRANCH to docker Change-Id: I0ff3e8f298bd0d743b91d41620623d14911fef63 --- M make/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/00/28300/1 diff --git a/make/Makefile b/make/Makefile index 6418ca6..89310dd 100644 --- a/make/Makefile +++ b/make/Makefile @@ -22,6 +22,7 @@ OSMO_BB_BRANCH?=master OSMO_BSC_BRANCH?=master OSMO_BTS_BRANCH?=master +OSMO_CBC_BRANCH?=master OSMO_GBPROXY_BRANCH?=master OSMO_GGSN_BRANCH?=master OSMO_GSM_TESTER_BRANCH?=master @@ -101,6 +102,7 @@ --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \ --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \ --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \ + --build-arg OSMO_CBC_BRANCH=$(OSMO_CBC_BRANCH) \ --build-arg OSMO_GBPROXY_BRANCH=$(OSMO_GBPROXY_BRANCH) \ --build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \ --build-arg OSMO_GSM_TESTER_BRANCH=$(OSMO_GSM_TESTER_BRANCH) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0ff3e8f298bd0d743b91d41620623d14911fef63 Gerrit-Change-Number: 28300 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-cbc[master]: Rework cbsp_cbc_create() params

by pespin

pespin has uploaded a new patch set (#2). ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/99/28299/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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in osmo-cbc[master]: Rework cbsp_cbc_create() params

by pespin

pespin has uploaded this change for review. ( 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. 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/99/28299/1 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 47d2d9e..a7dc50f 100644 --- a/src/cbsp_server.h +++ b/src/cbsp_server.h @@ -22,9 +22,7 @@ /* receive call-back; called for every received message */ 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 { @@ -43,3 +41,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; -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-cbc[master]: cbsp_server.h: Move function to the proper section

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28298 ) Change subject: cbsp_server.h: Move function to the proper section ...................................................................... cbsp_server.h: Move function to the proper section Change-Id: I47f694c2ffa1df50394ff01977ddb85768657062 --- M src/cbsp_server.h 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/98/28298/1 diff --git a/src/cbsp_server.h b/src/cbsp_server.h index 9a87ef5..47d2d9e 100644 --- a/src/cbsp_server.h +++ b/src/cbsp_server.h @@ -22,6 +22,9 @@ /* receive call-back; called for every received message */ 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)); /* a single (remote) client connected to the (local) CBC server */ struct osmo_cbsp_cbc_client { @@ -40,6 +43,3 @@ 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); -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)); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I47f694c2ffa1df50394ff01977ddb85768657062 Gerrit-Change-Number: 28298 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2022