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

[L] Change in osmo-bts[master]: Merge gsm_network into gsm_bts_sm and place gsm_bts under it
by pespin 11 Apr '23

11 Apr '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32236 ) Change subject: Merge gsm_network into gsm_bts_sm and place gsm_bts under it ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ideb0d458ec631008223f861cf8b46d09524a1a21 Gerrit-Change-Number: 32236 Gerrit-PatchSet: 5 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-Comment-Date: Tue, 11 Apr 2023 09:48:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: Allocate pcu_sock_state using g_bts_sm talloc context
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32264 ) Change subject: pcu_sock: Allocate pcu_sock_state using g_bts_sm talloc context ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29eae7bcc66dc5e646b8a4703871682202259bed Gerrit-Change-Number: 32264 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 09:48:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: Move pcu_sock_state to gprs section of bts_sm
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32263 ) Change subject: Move pcu_sock_state to gprs section of bts_sm ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7d739287fd11f81ce657bac362e55fa822fb0ef5 Gerrit-Change-Number: 32263 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 09:48:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: Move GPRS NSE under BTS SiteMgr
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32240 ) Change subject: Move GPRS NSE under BTS SiteMgr ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File src/common/bts_sm.c: https://gerrit.osmocom.org/c/osmo-bts/+/32240/comment/32b86736_2a44fd14 PS1, Line 77: %d", 0 > Ack Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If44d8f256cab7b2660900cedfb0ed9fe67eb3420 Gerrit-Change-Number: 32240 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 09:47:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: Drop bts_sm pointer
by pespin 11 Apr '23

11 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32265 ) Change subject: pcu_sock: Drop bts_sm pointer ...................................................................... pcu_sock: Drop bts_sm pointer It is not really needed since the object is global. Change-Id: I17f7c42dc9f38485dbcc8595a3a3dbf5a80a7961 --- M src/common/pcu_sock.c 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/32265/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 7d0c796..daa1a57 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -947,7 +947,6 @@ */ struct pcu_sock_state { - struct gsm_bts_sm *bts_sm; struct osmo_fd listen_bfd; /* fd for listen socket */ struct osmo_fd conn_bfd; /* fd for connection to lcr */ struct llist_head upqueue; /* queue for sending messages */ @@ -990,7 +989,7 @@ unsigned int tn; /* FIXME: allow multiple BTS */ - bts = llist_entry(state->bts_sm->bts_list.next, struct gsm_bts, list); + bts = llist_entry(g_bts_sm->bts_list.next, struct gsm_bts, list); LOGP(DPCU, LOGL_NOTICE, "PCU socket has LOST connection\n"); oml_tx_failure_event_rep(&bts->gprs.cell.mo, NM_SEVER_MAJOR, OSMO_EVT_PCU_VERS, @@ -1183,7 +1182,6 @@ return -ENOMEM; INIT_LLIST_HEAD(&state->upqueue); - state->bts_sm = g_bts_sm; state->conn_bfd.fd = -1; bfd = &state->listen_bfd; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f7c42dc9f38485dbcc8595a3a3dbf5a80a7961 Gerrit-Change-Number: 32265 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-bts[master]: Merge gsm_network into gsm_bts_sm and place gsm_bts under it
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32236 ) Change subject: Merge gsm_network into gsm_bts_sm and place gsm_bts under it ...................................................................... Patch Set 5: Code-Review+1 (4 comments) File src/common/bts.c: https://gerrit.osmocom.org/c/osmo-bts/+/32236/comment/4964755f_ae6cc6c6 PS4, Line 406: g_bts_sm->num_bts++; > This change would not be part of this patch however, I'll fix it in a followup patch. Done https://gerrit.osmocom.org/c/osmo-bts/+/32262. File src/common/bts_sm.c: https://gerrit.osmocom.org/c/osmo-bts/+/32236/comment/cd291f02_0b2c12e8 PS4, Line 37: talloc_free > I prefer doing it this way in order to control the order of stuff being freed. Done File src/common/oml.c: https://gerrit.osmocom.org/c/osmo-bts/+/32236/comment/7be6a4d1_87af8346 PS4, Line 154: if (!bts) { > Ack Done File src/common/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bts/+/32236/comment/562cbc93_3529b683 PS4, Line 957: struct gsm_bts_sm *bts_sm > Yes we could, I'm not sure if it makes sense doing it in this commit or not, I simply changed the mi […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ideb0d458ec631008223f861cf8b46d09524a1a21 Gerrit-Change-Number: 32236 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 09:47:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: Update g_bts_sm->num_bts when bts is added/removed from bts list
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32262 ) Change subject: Update g_bts_sm->num_bts when bts is added/removed from bts list ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifa162d01d908eba8cadd8f01dd4d698491176fe8 Gerrit-Change-Number: 32262 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 09:40:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: Allocate pcu_sock_state using g_bts_sm talloc context
by pespin 11 Apr '23

11 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32264 ) Change subject: pcu_sock: Allocate pcu_sock_state using g_bts_sm talloc context ...................................................................... pcu_sock: Allocate pcu_sock_state using g_bts_sm talloc context Change-Id: I29eae7bcc66dc5e646b8a4703871682202259bed --- M src/common/pcu_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/32264/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index e7bedd1..7d0c796 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -1178,7 +1178,7 @@ struct osmo_fd *bfd; int rc; - state = talloc_zero(NULL, struct pcu_sock_state); + state = talloc_zero(g_bts_sm, struct pcu_sock_state); if (!state) return -ENOMEM; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29eae7bcc66dc5e646b8a4703871682202259bed Gerrit-Change-Number: 32264 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: Move pcu_sock_state to gprs section of bts_sm
by pespin 11 Apr '23

11 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32263 ) Change subject: Move pcu_sock_state to gprs section of bts_sm ...................................................................... Move pcu_sock_state to gprs section of bts_sm Change-Id: I7d739287fd11f81ce657bac362e55fa822fb0ef5 --- M include/osmo-bts/bts_sm.h M src/common/pcu_sock.c 2 files changed, 16 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/32263/1 diff --git a/include/osmo-bts/bts_sm.h b/include/osmo-bts/bts_sm.h index 3106115..e6610a5 100644 --- a/include/osmo-bts/bts_sm.h +++ b/include/osmo-bts/bts_sm.h @@ -37,8 +37,8 @@ struct llist_head bts_list; unsigned int num_bts; struct osmo_plmn_id plmn; - struct pcu_sock_state *pcu_state; struct { + struct pcu_sock_state *pcu_state; struct gsm_gprs_nse nse; } gprs; }; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index fe2dc17..e7bedd1 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -585,7 +585,7 @@ int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; struct msgb *msg; struct gsm_pcu_if *pcu_prim; struct gsm_pcu_if_pag_req *pag_req; @@ -955,7 +955,7 @@ int pcu_sock_send(struct msgb *msg) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; struct osmo_fd *conn_bfd; struct gsm_pcu_if *pcu_prim = (struct gsm_pcu_if *) msg->data; @@ -1209,7 +1209,7 @@ osmo_signal_register_handler(SS_GLOBAL, pcu_if_signal_cb, NULL); - g_bts_sm->pcu_state = state; + g_bts_sm->gprs.pcu_state = state; LOGP(DPCU, LOGL_INFO, "Started listening on PCU socket: %s\n", path); @@ -1218,7 +1218,7 @@ void pcu_sock_exit(void) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; struct osmo_fd *bfd, *conn_bfd; if (!state) @@ -1232,11 +1232,11 @@ close(bfd->fd); osmo_fd_unregister(bfd); talloc_free(state); - g_bts_sm->pcu_state = NULL; + g_bts_sm->gprs.pcu_state = NULL; } bool pcu_connected(void) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; if (!state) return false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7d739287fd11f81ce657bac362e55fa822fb0ef5 Gerrit-Change-Number: 32263 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: Update g_bts_sm->num_bts when bts is added/removed from bts list
by pespin 11 Apr '23

11 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32262 ) Change subject: Update g_bts_sm->num_bts when bts is added/removed from bts list ...................................................................... Update g_bts_sm->num_bts when bts is added/removed from bts list Change-Id: Ifa162d01d908eba8cadd8f01dd4d698491176fe8 --- M src/common/bts.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/32262/1 diff --git a/src/common/bts.c b/src/common/bts.c index 72c29f8..a35c6d5 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -219,6 +219,7 @@ bts_osmux_release(bts); llist_del(&bts->list); + g_bts_sm->num_bts--; return 0; } @@ -233,6 +234,7 @@ /* add to list of BTSs */ llist_add_tail(&bts->list, &bts_sm->bts_list); + g_bts_sm->num_bts++; bts->site_mgr = bts_sm; bts->nr = bts_num; @@ -376,7 +378,6 @@ /* TRX0 was allocated early during gsm_bts_alloc, not later through VTY */ bts_model_trx_init(bts->c0); - g_bts_sm->num_bts++; if (!initialized) { osmo_signal_register_handler(SS_GLOBAL, bts_signal_cbfn, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifa162d01d908eba8cadd8f01dd4d698491176fe8 Gerrit-Change-Number: 32262 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0