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

[M] Change in osmocom-bb[master]: modem: get rid of app_data.{ccch_mode,si}, use ms->cellsel
by fixeria 14 Mar '23

14 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31652 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: modem: get rid of app_data.{ccch_mode,si}, use ms->cellsel ...................................................................... modem: get rid of app_data.{ccch_mode,si}, use ms->cellsel Change-Id: Ib711a3b893c43c0875c431c90cd0a2ebfafe1926 Related: OS#5500 --- M src/host/layer23/src/modem/app_modem.c 1 file changed, 37 insertions(+), 24 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 955a819..b5275f9 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -60,8 +60,6 @@ static struct { struct osmocom_ms *ms; - enum ccch_mode ccch_mode; - struct gsm48_sysinfo si; /* TODO: use mobile->rrlayer API instead */ struct { @@ -132,19 +130,20 @@ static int modem_tx_chan_req(struct osmocom_ms *ms, bool single_block) { + struct gsm322_cellsel *cs = &ms->cellsel; struct gsm48_rrlayer *rr = &ms->rrlayer; OSMO_ASSERT(rr->state == GSM48_RR_ST_IDLE); - if (!app_data.si.si1 || !app_data.si.si13) + if (!cs->sel_si.si1 || !cs->sel_si.si13) return -EAGAIN; - if (!app_data.si.gprs.supported) + if (!cs->sel_si.gprs.supported) return -ENOTSUP; rr->cr_ra = gen_chan_req(single_block); LOGP(DRR, LOGL_NOTICE, "Sending CHANNEL REQUEST (0x%02x)\n", rr->cr_ra); l1ctl_tx_rach_req(ms, RSL_CHAN_RACH, 0x00, rr->cr_ra, 0, - app_data.ccch_mode == CCCH_MODE_COMBINED); + cs->ccch_mode == CCCH_MODE_COMBINED); rr->state = GSM48_RR_ST_CONN_PEND; return 0; @@ -152,14 +151,15 @@ static int handle_si1(struct osmocom_ms *ms, struct msgb *msg) { + struct gsm322_cellsel *cs = &ms->cellsel; int rc; if (msgb_l3len(msg) != GSM_MACBLOCK_LEN) return -EINVAL; - if (!memcmp(&app_data.si.si1_msg[0], msgb_l3(msg), msgb_l3len(msg))) + if (!memcmp(&cs->sel_si.si1_msg[0], msgb_l3(msg), msgb_l3len(msg))) return 0; /* this message is already handled */ - rc = gsm48_decode_sysinfo1(&app_data.si, msgb_l3(msg), msgb_l3len(msg)); + rc = gsm48_decode_sysinfo1(&cs->sel_si, msgb_l3(msg), msgb_l3len(msg)); if (rc != 0) { LOGP(DRR, LOGL_ERROR, "Failed to decode SI1 message\n"); return rc; @@ -170,75 +170,78 @@ static int handle_si3(struct osmocom_ms *ms, struct msgb *msg) { + struct gsm322_cellsel *cs = &ms->cellsel; int rc; if (msgb_l3len(msg) != GSM_MACBLOCK_LEN) return -EINVAL; - if (!memcmp(&app_data.si.si3_msg[0], msgb_l3(msg), msgb_l3len(msg))) + if (!memcmp(&cs->sel_si.si3_msg[0], msgb_l3(msg), msgb_l3len(msg))) return 0; /* this message is already handled */ - rc = gsm48_decode_sysinfo3(&app_data.si, msgb_l3(msg), msgb_l3len(msg)); + rc = gsm48_decode_sysinfo3(&cs->sel_si, msgb_l3(msg), msgb_l3len(msg)); if (rc != 0) { LOGP(DRR, LOGL_ERROR, "Failed to decode SI3 message\n"); return rc; } - if (app_data.ccch_mode == CCCH_MODE_NONE) { - if (app_data.si.ccch_conf == RSL_BCCH_CCCH_CONF_1_C) - app_data.ccch_mode = CCCH_MODE_COMBINED; + if (cs->ccch_mode == CCCH_MODE_NONE) { + if (cs->sel_si.ccch_conf == RSL_BCCH_CCCH_CONF_1_C) + cs->ccch_mode = CCCH_MODE_COMBINED; else - app_data.ccch_mode = CCCH_MODE_NON_COMBINED; - l1ctl_tx_ccch_mode_req(ms, app_data.ccch_mode); + cs->ccch_mode = CCCH_MODE_NON_COMBINED; + l1ctl_tx_ccch_mode_req(ms, cs->ccch_mode); } - if (!app_data.si.gprs.supported) { + if (!cs->sel_si.gprs.supported) { LOGP(DRR, LOGL_NOTICE, "SI3 Rest Octets IE contains no GPRS Indicator\n"); return 0; } LOGP(DRR, LOGL_NOTICE, "Found GPRS Indicator (RA Colour %u, SI13 on BCCH %s)\n", - app_data.si.gprs.ra_colour, app_data.si.gprs.si13_pos ? "Ext" : "Norm"); + cs->sel_si.gprs.ra_colour, cs->sel_si.gprs.si13_pos ? "Ext" : "Norm"); return 0; } static int handle_si4(struct osmocom_ms *ms, struct msgb *msg) { + struct gsm322_cellsel *cs = &ms->cellsel; int rc; if (msgb_l3len(msg) != GSM_MACBLOCK_LEN) return -EINVAL; - if (!memcmp(&app_data.si.si4_msg[0], msgb_l3(msg), msgb_l3len(msg))) + if (!memcmp(&cs->sel_si.si4_msg[0], msgb_l3(msg), msgb_l3len(msg))) return 0; /* this message is already handled */ - rc = gsm48_decode_sysinfo4(&app_data.si, msgb_l3(msg), msgb_l3len(msg)); + rc = gsm48_decode_sysinfo4(&cs->sel_si, msgb_l3(msg), msgb_l3len(msg)); if (rc != 0) { LOGP(DRR, LOGL_ERROR, "Failed to decode SI4 message\n"); return rc; } - if (!app_data.si.gprs.supported) { + if (!cs->sel_si.gprs.supported) { LOGP(DRR, LOGL_NOTICE, "SI4 Rest Octets IE contains no GPRS Indicator\n"); return 0; } LOGP(DRR, LOGL_NOTICE, "Found GPRS Indicator (RA Colour %u, SI13 on BCCH %s)\n", - app_data.si.gprs.ra_colour, app_data.si.gprs.si13_pos ? "Ext" : "Norm"); + cs->sel_si.gprs.ra_colour, cs->sel_si.gprs.si13_pos ? "Ext" : "Norm"); return 0; } static int handle_si13(struct osmocom_ms *ms, struct msgb *msg) { - int rc; struct osmo_gprs_rlcmac_prim *rlcmac_prim; + struct gsm322_cellsel *cs = &ms->cellsel; + int rc; if (msgb_l3len(msg) != GSM_MACBLOCK_LEN) return -EINVAL; - if (!memcmp(&app_data.si.si13_msg[0], msgb_l3(msg), msgb_l3len(msg))) + if (!memcmp(&cs->sel_si.si13_msg[0], msgb_l3(msg), msgb_l3len(msg))) return 0; /* this message is already handled */ - rc = gsm48_decode_sysinfo13(&app_data.si, msgb_l3(msg), msgb_l3len(msg)); + rc = gsm48_decode_sysinfo13(&cs->sel_si, msgb_l3(msg), msgb_l3len(msg)); if (rc != 0) return rc; @@ -332,7 +335,7 @@ unsigned int arfcn = i & 1023; unsigned int k; - if (~app_data.si.freq[arfcn].mask & 0x01) + if (~ms->cellsel.sel_si.freq[arfcn].mask & 0x01) continue; k = ia->mob_alloc_len - (j >> 3) - 1; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib711a3b893c43c0875c431c90cd0a2ebfafe1926 Gerrit-Change-Number: 31652 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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

[S] Change in libosmocore[master]: select.c: Clarify osmo_fd_unregister() can only be called on register...
by osmith 14 Mar '23

14 Mar '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31902 ) Change subject: select.c: Clarify osmo_fd_unregister() can only be called on registered osmo_fds ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5e397e121f2fe2254c7f4b474e6eefd7aebe7a83 Gerrit-Change-Number: 31902 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 11:58:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: select.c: Clarify osmo_fd_unregister() can only be called on register...
by osmith 14 Mar '23

14 Mar '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31902 ) Change subject: select.c: Clarify osmo_fd_unregister() can only be called on registered osmo_fds ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5e397e121f2fe2254c7f4b474e6eefd7aebe7a83 Gerrit-Change-Number: 31902 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 11:58:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: bsc_subscriber: Optimize lookup of bsub by TMSI
by osmith 14 Mar '23

14 Mar '23

Attention is currently required from: laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31875 ) Change subject: bsc_subscriber: Optimize lookup of bsub by TMSI ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If27429e715ef4b327177e427249e68321a6e83cc Gerrit-Change-Number: 31875 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 11:57:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: select.c: Clarify osmo_fd_(un)register() API expectations of register...
by pespin 14 Mar '23

14 Mar '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31901 ) Change subject: select.c: Clarify osmo_fd_(un)register() API expectations of registered fd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I53d95aad15b33dd66aa5c7dd11745a35c4481f33 Gerrit-Change-Number: 31901 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-Comment-Date: Tue, 14 Mar 2023 11:53:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: configure.ac: Fix typo in enable flag description
by fixeria 14 Mar '23

14 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31905 ) Change subject: configure.ac: Fix typo in enable flag description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida390c50379a429a4b42434e32954eeb832a11ff Gerrit-Change-Number: 31905 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 11:52:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: configure.ac: Fix logic enabling osmo_fd fd checks
by fixeria 14 Mar '23

14 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31904 ) Change subject: configure.ac: Fix logic enabling osmo_fd fd checks ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I81112fa1f6ce1a8e5fe85468241ad385ed8805d3 Gerrit-Change-Number: 31904 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 11:52:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmo-bsc[master]: Optimize subscr_conns lookup
by osmith 14 Mar '23

14 Mar '23

Attention is currently required from: laforge, pespin, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31866 ) Change subject: Optimize subscr_conns lookup ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/osmo-bsc/bsc_sccp.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31866/comment/d867f0cb_0931a418 PS2, Line 47: OSMO_ASSERT(conn_id != SCCP_CONN_ID_UNSET); > In any case that would be something for the caller to do. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I667d3ec1dad0ab7bc0fa4799d9611f3a914d07e5 Gerrit-Change-Number: 31866 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 11:52:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[L] Change in osmo-bsc[master]: Optimize subscr_conns lookup
by pespin 14 Mar '23

14 Mar '23

Attention is currently required from: osmith, laforge, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31866 ) Change subject: Optimize subscr_conns lookup ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/bsc_sccp.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31866/comment/35d2fdac_7be9f1dc PS2, Line 47: OSMO_ASSERT(conn_id != SCCP_CONN_ID_UNSET); > while unlikely, as I understand it can still happen that all IDs are exhausted and we end up with UN […] In any case that would be something for the caller to do. It is logically incorrect to try to register a gscon here which got no conn_id yet, so it's fine asserting here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I667d3ec1dad0ab7bc0fa4799d9611f3a914d07e5 Gerrit-Change-Number: 31866 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 11:44:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: select.c: osmo_fd_unregister(): Avoid assert hit with old buggy users...
by osmith 14 Mar '23

14 Mar '23

Attention is currently required from: laforge, pespin, fixeria, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31903 ) Change subject: select.c: osmo_fd_unregister(): Avoid assert hit with old buggy users of the API ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/core/select.c: https://gerrit.osmocom.org/c/libosmocore/+/31903/comment/037d2d38_f5b0e5ad PS2, Line 234: fprintf(stderr, "osmo_fd_unregister(fd=%u) out of expected range (0..%u), fix your code!!!\n", > I didn't find any osmocom log function here, only fprintf, so I assumed we want to keep osmo_log out […] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If77b84d603a42a216d550d9708eb62f645634a61 Gerrit-Change-Number: 31903 Gerrit-PatchSet: 3 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 11:44:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0