Attention is currently required from: fixeria.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38083?usp=email )
Change subject: bts: Remove from net->bts_list during talloc destructor
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
File src/osmo-bsc/gsm_data.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/38083/comment/1de8a16c_cb099df6?usp… :
PS1, Line 84: _register
> so we no longer register anything here anymore?
tbh all this stuff should go away and be unified, I really don't like this gsm_bts_alloc_register vs gsm_bts_sm_alloc()...
But this is really not needed /directly related to the patchset at hand so leaving it as is.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38083?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2bb1d51541c79e417c0359830e9f095be4669867
Gerrit-Change-Number: 38083
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: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 10 Sep 2024 23:01:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38082?usp=email )
Change subject: bts: Make sure bts_location entries in bts->loc_list are freed
......................................................................
bts: Make sure bts_location entries in bts->loc_list are freed
This went unnoticed because so far there's not clear way to free a BTS,
eg. through VTY.
Change-Id: I4de3d56a4f1f6bd1fe880b72cdd384c2398dabc9
---
M include/osmocom/bsc/bts.h
M src/osmo-bsc/bts.c
M src/osmo-bsc/bts_ctrl.c
3 files changed, 4 insertions(+), 2 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/bsc/bts.h b/include/osmocom/bsc/bts.h
index a8680d8..38e675a 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -337,7 +337,7 @@
/* list header in net->bts_list */
struct llist_head list;
- /* Geographical location of the BTS */
+ /* Geographical location of the BTS, head list of "struct bts_location" */
struct llist_head loc_list;
/* number of this BTS in network */
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index 260e24e..0d33427 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -156,6 +156,8 @@
static int gsm_bts_talloc_destructor(struct gsm_bts *bts)
{
+ /* Entries in bts->loc_list are freed by talloc recursively, no need to free them here. */
+
paging_destructor(bts);
bts_setup_ramp_remove(bts);
diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c
index 48b1b8a..76806f4 100644
--- a/src/osmo-bsc/bts_ctrl.c
+++ b/src/osmo-bsc/bts_ctrl.c
@@ -169,7 +169,7 @@
return CTRL_CMD_ERROR;
}
- curloc = talloc_zero(tall_bsc_ctx, struct bts_location);
+ curloc = talloc_zero(bts, struct bts_location);
if (!curloc) {
talloc_free(tmp);
goto oom;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38082?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4de3d56a4f1f6bd1fe880b72cdd384c2398dabc9
Gerrit-Change-Number: 38082
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-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: pespin.
fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38086?usp=email )
Change subject: tests/ctrl/osmo-bsc-neigh-test.cfg: Fix duplicate <LAC,CI> between bts1 and bts2
......................................................................
Patch Set 2: Code-Review+1
(1 comment)
File tests/ctrl/osmo-bsc-neigh-test.cfg:
https://gerrit.osmocom.org/c/osmo-bsc/+/38086/comment/1e9ff869_d3a3e544?usp… :
PS2, Line 161: arfcn 880
```
01:11 < fixeria> indeed, even the ARFCNs are the same
01:12 < pespin> fixeria, ah it probably also makes sense to change the ARFCN if they are neighbors
```
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38086?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I7d1ebd529e050ecb4c14b9d3523637e4c8c87e1d
Gerrit-Change-Number: 38086
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, 10 Sep 2024 19:13:24 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes