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

[S] Change in osmocom-bb[master]: layer23: modem: grr: Log ignored CCCH ImmAss

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/32589 to look at the new patch set (#3). Change subject: layer23: modem: grr: Log ignored CCCH ImmAss ...................................................................... layer23: modem: grr: Log ignored CCCH ImmAss There seems to be some bug when using virtphy where sometimes the received T2 and/or T3 in the ImmASs is not matching what we sent. This helps in showing the problem and not failing silently. Change-Id: Iaecd2616733d84f35a825916fe888142800b426b --- M src/host/layer23/src/modem/grr.c 1 file changed, 30 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/32589/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iaecd2616733d84f35a825916fe888142800b426b Gerrit-Change-Number: 32589 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: gmm: Activate PDP Context of APN after GPRS attach

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/32590 to look at the new patch set (#3). Change subject: layer23: modem: gmm: Activate PDP Context of APN after GPRS attach ...................................................................... layer23: modem: gmm: Activate PDP Context of APN after GPRS attach Change-Id: Icb667a6a3359267d2eb20e11a40eb27a8c3f7e2d --- M src/host/layer23/src/modem/gmm.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/90/32590/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icb667a6a3359267d2eb20e11a40eb27a8c3f7e2d Gerrit-Change-Number: 32590 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: sm: Properly inform SM layer of ownership transfer

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/32588 to look at the new patch set (#2). Change subject: layer23: modem: sm: Properly inform SM layer of ownership transfer ...................................................................... layer23: modem: sm: Properly inform SM layer of ownership transfer Change-Id: I95ed63fe6442369ab3afb75cbd9908b87addbb3e --- M src/host/layer23/src/modem/sm.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/88/32588/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I95ed63fe6442369ab3afb75cbd9908b87addbb3e Gerrit-Change-Number: 32588 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: modem: Delay GPRS attach at startup until modem is ready

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32567 ) Change subject: layer23: modem: Delay GPRS attach at startup until modem is ready ...................................................................... Patch Set 1: (2 comments) File src/host/layer23/include/osmocom/bb/modem/modem.h: https://gerrit.osmocom.org/c/osmocom-bb/+/32567/comment/4638b6a3_350a9a42 PS1, Line 12: }; > what's the rationale behind not using a full osmo_fsm? It may become a full osmo_fsm at some point, or even not, or even several FSMs, or god knows. I still need to figure out some stuff and for now I simply prefer having something minimal working which allows to test the entire thing and I can then understand the whole system better. At some point we may want to move this to an FSM (or not). Right now, adding an FSM is a lot of boilerplate I want to avoid. File src/host/layer23/src/modem/app_modem.c: https://gerrit.osmocom.org/c/osmocom-bb/+/32567/comment/a2f88d63_313dc1cf PS1, Line 83: LOGP(DRLCMAC, LOGL_INFO, "Delaying GPRS attach, waiting for:%s%s%s%s%s%s\n", > How about moving this log message into modem_gprs_attach_if_needed()? From the function names this w […] No, I want to keep it here since I want to have all the logic together. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5029d9e8a47b8544b3b803c4db6352269bac3c0e Gerrit-Change-Number: 32567 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 May 2023 14:05:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: modem: Resolve auth requests coming from GMM layer

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32551 ) Change subject: layer23: modem: Resolve auth requests coming from GMM layer ...................................................................... layer23: modem: Resolve auth requests coming from GMM layer Change-Id: I75dc3fe3e4d9e23443fb778e36ca024f1bc46641 --- M src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/include/osmocom/bb/modem/gmm.h M src/host/layer23/src/modem/app_modem.c M src/host/layer23/src/modem/gmm.c 4 files changed, 57 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index e4888a7..d9c6255 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -20,6 +20,11 @@ #include <osmocom/bb/common/sim.h> #include <osmocom/bb/common/l1ctl.h> +struct osmobb_ms_gmm_layer { + uint8_t ac_ref_nr; + uint8_t key_seq; + uint8_t rand[16]; +}; struct osmosap_entity { struct osmo_fsm_inst *fi; @@ -93,6 +98,7 @@ /* GPRS */ struct gprs_settings gprs; + struct osmobb_ms_gmm_layer gmmlayer; /* Audio I/O */ struct gapk_io_state *gapk_io; diff --git a/src/host/layer23/include/osmocom/bb/modem/gmm.h b/src/host/layer23/include/osmocom/bb/modem/gmm.h index 6269c82..41e1e7e 100644 --- a/src/host/layer23/include/osmocom/bb/modem/gmm.h +++ b/src/host/layer23/include/osmocom/bb/modem/gmm.h @@ -1,6 +1,7 @@ #pragma once #include <stdbool.h> +#include <stdint.h> struct osmocom_ms; @@ -8,3 +9,5 @@ int modem_gmm_gmmreg_attach_req(const struct osmocom_ms *ms); int modem_gmm_gmmreg_detach_req(const struct osmocom_ms *ms); +int modem_gmm_gmmreg_sim_auth_rsp(const struct osmocom_ms *ms, + uint8_t *sres, uint8_t *kc, uint8_t kc_len); diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index d80fe91..07211d0 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -135,7 +135,9 @@ case S_L23_SUBSCR_SIM_AUTH_RESP: sim_auth_resp = signal_data; ms = sim_auth_resp->ms; - /* TODO: pass sim_auth_resp->sres to GMM layer */ + modem_gmm_gmmreg_sim_auth_rsp(ms, sim_auth_resp->sres, + ms->subscr.key, + sizeof(ms->subscr.key)); break; default: OSMO_ASSERT(0); diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index 0ad3035..129c4ba 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -65,6 +65,22 @@ __func__, pdu_name, cause, get_value_string(gsm48_gmm_cause_names, cause)); } break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMREG_SIM_AUTH, PRIM_OP_INDICATION): + LOGP(DGMM, LOGL_NOTICE, "%s(): Rx %s ac_ref_nr=%u key_seq=%u rand=%s\n", + __func__, pdu_name, + gmm_prim->gmmreg.sim_auth_ind.ac_ref_nr, + gmm_prim->gmmreg.sim_auth_ind.key_seq, + osmo_hexdump(gmm_prim->gmmreg.sim_auth_ind.rand, + sizeof(gmm_prim->gmmreg.sim_auth_ind.rand))); + /* Cache request information, it'll be needed during response time: */ + ms->gmmlayer.ac_ref_nr = gmm_prim->gmmreg.sim_auth_ind.ac_ref_nr; + ms->gmmlayer.key_seq = gmm_prim->gmmreg.sim_auth_ind.key_seq; + memcpy(ms->gmmlayer.rand, gmm_prim->gmmreg.sim_auth_ind.rand, + sizeof(ms->gmmlayer.rand)); + /* Request SIM to authenticate. Wait for signal S_L23_SUBSCR_SIM_AUTH_RESP. */ + rc = gsm_subscr_generate_kc(ms, gmm_prim->gmmreg.sim_auth_ind.key_seq, + gmm_prim->gmmreg.sim_auth_ind.rand, false); + break; case OSMO_PRIM(OSMO_GPRS_GMM_GMMREG_DETACH, PRIM_OP_CONFIRM): case OSMO_PRIM(OSMO_GPRS_GMM_GMMREG_DETACH, PRIM_OP_INDICATION): default: @@ -185,3 +201,23 @@ LOGP(DMM, LOGL_ERROR, "Failed submitting GMMREG-DETACH.req\n"); return rc; } + +int modem_gmm_gmmreg_sim_auth_rsp(const struct osmocom_ms *ms, uint8_t *sres, uint8_t *kc, uint8_t kc_len) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + int rc; + + gmm_prim = osmo_gprs_gmm_prim_alloc_gmmreg_sim_auth_rsp(); + gmm_prim->gmmreg.sim_auth_rsp.ac_ref_nr = ms->gmmlayer.ac_ref_nr; + gmm_prim->gmmreg.sim_auth_rsp.key_seq = ms->gmmlayer.key_seq; + memcpy(gmm_prim->gmmreg.sim_auth_rsp.rand, ms->gmmlayer.rand, + sizeof(gmm_prim->gmmreg.sim_auth_rsp.rand)); + memcpy(gmm_prim->gmmreg.sim_auth_rsp.sres, sres, + sizeof(gmm_prim->gmmreg.sim_auth_rsp.sres)); + memcpy(gmm_prim->gmmreg.sim_auth_rsp.kc, kc, + kc_len); + rc = osmo_gprs_gmm_prim_upper_down(gmm_prim); + if (rc < 0) + LOGP(DMM, LOGL_ERROR, "Failed submitting GMMREG-SIM_AUTH.rsp\n"); + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I75dc3fe3e4d9e23443fb778e36ca024f1bc46641 Gerrit-Change-Number: 32551 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: modem: Resolve auth requests coming from GMM layer

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32551 ) Change subject: layer23: modem: Resolve auth requests coming from GMM layer ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I75dc3fe3e4d9e23443fb778e36ca024f1bc46641 Gerrit-Change-Number: 32551 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 May 2023 14:02:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in libosmocore[master]: codec: add define constants for RFC5993 and TS101318

by pespin

Attention is currently required from: neels, fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32594 ) Change subject: codec: add define constants for RFC5993 and TS101318 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I125ef9cdab98c073971841c175b1a7dcd927f9c2 Gerrit-Change-Number: 32594 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 May 2023 14:00:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in libosmocore[master]: select: speed up osmo_fd_is_registered

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32579 ) Change subject: select: speed up osmo_fd_is_registered ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Yes, but lets see if we can cause any harm with the check: […] You cannot guarantee that a correct pointer won't be LLIST_POISON1. As per the NULL check, ok, but then add a comment saying it's a optimization. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1ce894da39e3f2329c88666a5dda594b8bce4228 Gerrit-Change-Number: 32579 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 May 2023 14:00:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in libosmocore[master]: codec: add define constants for RFC5993 and TS101318

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32594 ) Change subject: codec: add define constants for RFC5993 and TS101318 ...................................................................... codec: add define constants for RFC5993 and TS101318 The difference between the RFC5993 and the TS101318 format is only that RFC5993 has one additional ToC (Table of contents) byte at the beginning. However it can be difficult to remember which of the two formats has the ToC byte at at the beginning and which hasn't. Let's add a constant that defines the length for both formats so that we can make it more clear in the code which format we are refering to. Related: OS#5688 Change-Id: I125ef9cdab98c073971841c175b1a7dcd927f9c2 --- M include/osmocom/codec/codec.h 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/32594/1 diff --git a/include/osmocom/codec/codec.h b/include/osmocom/codec/codec.h index 364385b..a656bcf 100644 --- a/include/osmocom/codec/codec.h +++ b/include/osmocom/codec/codec.h @@ -15,6 +15,10 @@ /* TS 101318 Chapter 5.3: 244 bits + 4bit sig */ #define GSM_EFR_BYTES 31 +/* Number of bytes of an GSM_HR RTP payload */ +#define GSM_HR_BYTES_RTP_RFC5993 (GSM_HR_BYTES + 1) +#define GSM_HR_BYTES_RTP_TS101318 (GSM_HR_BYTES) + extern const uint16_t gsm610_bitorder[]; /* FR */ extern const uint16_t gsm620_unvoiced_bitorder[]; /* HR unvoiced */ extern const uint16_t gsm620_voiced_bitorder[]; /* HR voiced */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I125ef9cdab98c073971841c175b1a7dcd927f9c2 Gerrit-Change-Number: 32594 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[S] Change in libosmocore[master]: select: speed up osmo_fd_is_registered

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32579 ) Change subject: select: speed up osmo_fd_is_registered ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > the iteartion is done precisely to avoid that kind of hacky checks whith assumptions regarding the c […] Yes, but lets see if we can cause any harm with the check: if fd->list.next is NULL, then the fd can not be registered, we return false. This can never be wrong. If there is a pointer in fd->list.next, even if it is just noise we have to go through the check, so everything is still fine. If fd->list.next is LLIST_POISON1, then the fd also can not be registered, we return false. When fd->list.next is LLIST_POISON! by coincidence due to not initializing the list, the fd also cannot be registered. I can not see any problem at the moment, other than the method is a bit hacky. Do you see a problem that I don't see here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1ce894da39e3f2329c88666a5dda594b8bce4228 Gerrit-Change-Number: 32579 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 May 2023 13:18:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023