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

[S] Change in libosmocore[master]: gsm/ipa: Add segmentation callback
by daniel 07 Jun '23

07 Jun '23

Attention is currently required from: arehbein, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33083 ) Change subject: gsm/ipa: Add segmentation callback ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: > 1 failed: > * [build] https://jenkins.osmocom.org/jenkins/job/gerrit-libosmocore-build/a2=default… This is the embedded build (arm-none-eabi). The issue is that ipa.h includes osmo_io.h. On way is to #if (!EMBEDDED) the complete osmo_io.h file similar to socket.h, but I think you can simply remove the includes as nothing in the code needs it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Gerrit-Change-Number: 33083 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Jun 2023 16:27:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: l1ctl_proto: add 'start_fn' field to UL/DL TBF CFG.req messages
by fixeria 07 Jun '23

07 Jun '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33222 ) Change subject: l1ctl_proto: add 'start_fn' field to UL/DL TBF CFG.req messages ...................................................................... l1ctl_proto: add 'start_fn' field to UL/DL TBF CFG.req messages Change-Id: Ibb6a05165fe1c81268fb0e3674adae4065e78171 Related: OS#5500 --- M include/l1ctl_proto.h M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/modem/rlcmac.c 4 files changed, 29 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/22/33222/1 diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index 3512424..f0bc56d 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -350,6 +350,7 @@ uint8_t tbf_ref; uint8_t slotmask; uint8_t padding[2]; + uint32_t start_fn; /* TBF Starting Time (absolute Fn) */ } __attribute__((packed)); /* payload of L1CTL_GPRS_DL_TBF_CFG_REQ */ @@ -358,6 +359,7 @@ uint8_t slotmask; uint8_t dl_tfi; uint8_t padding[1]; + uint32_t start_fn; /* TBF Starting Time (absolute Fn) */ } __attribute__((packed)); /* part of L1CTL_GPRS_{UL,DL}_BLOCK_{REQ,IND} */ diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index 25bc6e8..40b3159 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -81,10 +81,11 @@ /* Transmit L1CTL_GPRS_UL_TBF_CFG_REQ */ int l1ctl_tx_gprs_ul_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_ref, - uint8_t slotmask); + uint8_t slotmask, uint32_t start_fn); /* Transmit L1CTL_GPRS_DL_TBF_CFG_REQ */ int l1ctl_tx_gprs_dl_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_ref, - uint8_t slotmask, uint8_t dl_tfi); + uint8_t slotmask, uint32_t start_fn, + uint8_t dl_tfi); #endif diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 8e55b7b..83ee79c 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -1034,7 +1034,7 @@ /* Transmit L1CTL_GPRS_UL_TBF_CFG_REQ */ int l1ctl_tx_gprs_ul_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_ref, - uint8_t slotmask) + uint8_t slotmask, uint32_t start_fn) { struct l1ctl_gprs_ul_tbf_cfg_req *req; struct msgb *msg; @@ -1047,17 +1047,20 @@ *req = (struct l1ctl_gprs_ul_tbf_cfg_req) { .tbf_ref = tbf_ref, .slotmask = slotmask, + .start_fn = htonl(start_fn), }; - DEBUGP(DL1C, "Tx GPRS UL TBF CFG (tbf_ref=%u, slotmask=0x%02x)\n", - tbf_ref, slotmask); + DEBUGP(DL1C, "Tx GPRS UL TBF CFG: " + "tbf_ref=%u, slotmask=0x%02x, start_fn=%u\n", + tbf_ref, slotmask, start_fn); return osmo_send_l1(ms, msg); } /* Transmit L1CTL_GPRS_DL_TBF_CFG_REQ */ int l1ctl_tx_gprs_dl_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_ref, - uint8_t slotmask, uint8_t dl_tfi) + uint8_t slotmask, uint32_t start_fn, + uint8_t dl_tfi) { struct l1ctl_gprs_dl_tbf_cfg_req *req; struct msgb *msg; @@ -1070,11 +1073,13 @@ *req = (struct l1ctl_gprs_dl_tbf_cfg_req) { .tbf_ref = tbf_ref, .slotmask = slotmask, + .start_fn = htonl(start_fn), .dl_tfi = dl_tfi, }; - DEBUGP(DL1C, "Tx GPRS DL TBF CFG (tbf_ref=%u, slotmask=0x%02x, dl_tfi=%u)\n", - tbf_ref, slotmask, dl_tfi); + DEBUGP(DL1C, "Tx GPRS DL TBF CFG: " + "tbf_ref=%u, slotmask=0x%02x, start_fn=%u, dl_tfi=%u)\n", + tbf_ref, slotmask, start_fn, dl_tfi); return osmo_send_l1(ms, msg); } diff --git a/src/host/layer23/src/modem/rlcmac.c b/src/host/layer23/src/modem/rlcmac.c index fcd2b2e..90710f5 100644 --- a/src/host/layer23/src/modem/rlcmac.c +++ b/src/host/layer23/src/modem/rlcmac.c @@ -162,11 +162,13 @@ case OSMO_PRIM(OSMO_GPRS_RLCMAC_L1CTL_CFG_UL_TBF, PRIM_OP_REQUEST): return l1ctl_tx_gprs_ul_tbf_cfg_req(ms, lp->cfg_ul_tbf_req.ul_tbf_nr, - lp->cfg_ul_tbf_req.ul_slotmask); + lp->cfg_ul_tbf_req.ul_slotmask, + 0xffffffff /* TODO: start Fn */); case OSMO_PRIM(OSMO_GPRS_RLCMAC_L1CTL_CFG_DL_TBF, PRIM_OP_REQUEST): return l1ctl_tx_gprs_dl_tbf_cfg_req(ms, lp->cfg_dl_tbf_req.dl_tbf_nr, lp->cfg_dl_tbf_req.dl_slotmask, + 0xffffffff, /* TODO: start Fn */ lp->cfg_dl_tbf_req.dl_tfi); default: LOGP(DRLCMAC, LOGL_DEBUG, "%s(): Unexpected Rx %s\n", __func__, pdu_name); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibb6a05165fe1c81268fb0e3674adae4065e78171 Gerrit-Change-Number: 33222 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmocom-bb[master]: [WIP] l1gprs: implement TBF starting time support
by fixeria 07 Jun '23

07 Jun '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33223 ) Change subject: [WIP] l1gprs: implement TBF starting time support ...................................................................... [WIP] l1gprs: implement TBF starting time support Change-Id: I174e3c43d2f4c828a528710b284e62c9bb794122 Related: OS#5500 --- M include/l1gprs.h M src/shared/l1gprs.c 2 files changed, 65 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/23/33223/1 diff --git a/include/l1gprs.h b/include/l1gprs.h index bbd654d..82c05d0 100644 --- a/include/l1gprs.h +++ b/include/l1gprs.h @@ -17,6 +17,8 @@ uint8_t tbf_ref; /*! PDCH timeslots used by this TBF */ uint8_t slotmask; + /*! TBF starting time (absolute TDMA Fn) */ + uint8_t start_fn; /*! (Downlink only) DL TFI (Temporary Flow Indentity): 0..31 */ uint8_t dl_tfi; }; @@ -37,8 +39,10 @@ struct l1gprs_state { /*! PDCH state for each timeslot */ struct l1gprs_pdch pdch[8]; - /*! Uplink and Downlink TBFs */ + /*! Uplink and Downlink TBFs (active) */ struct llist_head tbf_list; + /*! Uplink and Downlink TBFs (pending) */ + struct llist_head tbf_list_pending; /*! Logging context (used as prefix for messages) */ char *log_prefix; /*! Some private data for API user */ diff --git a/src/shared/l1gprs.c b/src/shared/l1gprs.c index fd18e4e..15d16ca 100644 --- a/src/shared/l1gprs.c +++ b/src/shared/l1gprs.c @@ -43,6 +43,10 @@ LOGP_GPRS((pdch)->gprs, level, "(PDCH-%u) " fmt, \ (pdch)->tn, ## args) +#define LOG_TBF_CFG_REQ_FMT "tbf_ref=%u, slotmask=0x%02x, start_fn=%u" +#define LOG_TBF_CFG_REQ_ARGS(req) \ + (req)->tbf_ref, (req)->slotmask, ntohl((req)->start_fn) + #define LOG_TBF_FMT "%cL-TBF#%03d" #define LOG_TBF_ARGS(tbf) \ (tbf)->uplink ? 'U' : 'D', tbf->tbf_ref @@ -58,7 +62,7 @@ static struct l1gprs_tbf *l1gprs_tbf_alloc(struct l1gprs_state *gprs, bool uplink, uint8_t tbf_ref, - uint8_t slotmask) + uint8_t slotmask, uint32_t start_fn) { struct l1gprs_tbf *tbf; @@ -68,6 +72,7 @@ tbf->uplink = uplink; tbf->tbf_ref = tbf_ref; tbf->slotmask = slotmask; + tbf->start_fn = start_fn; return tbf; } @@ -80,12 +85,12 @@ talloc_free(tbf); } -static struct l1gprs_tbf *l1gprs_find_tbf(struct l1gprs_state *gprs, +static struct l1gprs_tbf *l1gprs_find_tbf(const struct llist_head *tbf_list, bool uplink, uint8_t tbf_ref) { struct l1gprs_tbf *tbf; - llist_for_each_entry(tbf, &gprs->tbf_list, list) { + llist_for_each_entry(tbf, tbf_list, list) { if (tbf->uplink != uplink) continue; if (tbf->tbf_ref != tbf_ref) @@ -101,6 +106,16 @@ { OSMO_ASSERT(tbf->slotmask != 0x00); + /* TBFs with specific starting time go to pending list */ + if (tbf->start_fn != 0xffffffff) { + llist_add_tail(&tbf->list, &gprs->tbf_list_pending); + + LOGP_GPRS(gprs, LOGL_INFO, + LOG_TBF_FMT " is registered as pending (fn=%u)\n", + LOG_TBF_ARGS(tbf), tbf->start_fn); + return; + } + /* Update the PDCH states */ for (unsigned int tn = 0; tn < ARRAY_SIZE(gprs->pdch); tn++) { struct l1gprs_pdch *pdch = &gprs->pdch[tn]; @@ -123,7 +138,7 @@ llist_add_tail(&tbf->list, &gprs->tbf_list); LOGP_GPRS(gprs, LOGL_INFO, - LOG_TBF_FMT " is registered\n", + LOG_TBF_FMT " is registered as active\n", LOG_TBF_ARGS(tbf)); } @@ -132,7 +147,9 @@ { struct l1gprs_tbf *tbf; - tbf = l1gprs_find_tbf(gprs, uplink, tbf_ref); + tbf = l1gprs_find_tbf(&gprs->tbf_list, uplink, tbf_ref); + if (tbf == NULL) + tbf = l1gprs_find_tbf(&gprs->tbf_list_pending, uplink, tbf_ref); if (tbf == NULL) { LOGP_GPRS(gprs, LOGL_ERROR, "%s(): " LOG_TBF_FMT " not found\n", @@ -168,6 +185,24 @@ l1gprs_tbf_free(tbf); } +/* Check the list of pending TBFs and move those with expired Fn to the active list */ +static void l1gprs_check_pending_tbfs(struct l1gprs_state *gprs, uint32_t fn) +{ + struct l1gprs_tbf *tbf, *tmp; + + llist_for_each_entry_safe(tbf, tmp, &gprs->tbf_list_pending, list) { + if (tbf->start_fn < fn) /* XXX: see 3GPP TS 44.018 section 10.5.2.38 */ + continue; + + LOGP_GPRS(gprs, LOGL_INFO, + LOG_TBF_FMT " becomes active\n", + LOG_TBF_ARGS(tbf)); + + tbf->start_fn = fn; + l1gprs_register_tbf(gprs, tbf); + } +} + #define L1GPRS_L1CTL_MSGB_SIZE 256 #define L1GPRS_L1CTL_MSGB_HEADROOM 32 @@ -286,11 +321,12 @@ } LOGP_GPRS(gprs, LOGL_INFO, - "Rx Uplink TBF config: tbf_ref=%u, slotmask=0x%02x\n", - req->tbf_ref, req->slotmask); + "Rx UL TBF config: " LOG_TBF_CFG_REQ_FMT "\n", + LOG_TBF_CFG_REQ_ARGS(req)); if (req->slotmask != 0x00) { - tbf = l1gprs_tbf_alloc(gprs, true, req->tbf_ref, req->slotmask); + tbf = l1gprs_tbf_alloc(gprs, true, req->tbf_ref, + req->slotmask, ntohl(req->start_fn)); l1gprs_register_tbf(gprs, tbf); } else { l1gprs_unregister_tbf(gprs, true, req->tbf_ref); @@ -314,8 +350,8 @@ } LOGP_GPRS(gprs, LOGL_INFO, - "Rx Downlink TBF config: tbf_ref=%u, slotmask=0x%02x, dl_tfi=%u\n", - req->tbf_ref, req->slotmask, req->dl_tfi); + "Rx DL TBF config: " LOG_TBF_CFG_REQ_FMT ", dl_tfi=%u\n", + LOG_TBF_CFG_REQ_ARGS(req), req->dl_tfi); if (req->dl_tfi > 31) { LOGP_GPRS(gprs, LOGL_ERROR, @@ -325,7 +361,8 @@ } if (req->slotmask != 0x00) { - tbf = l1gprs_tbf_alloc(gprs, false, req->tbf_ref, req->slotmask); + tbf = l1gprs_tbf_alloc(gprs, false, req->tbf_ref, + req->slotmask, ntohl(req->start_fn)); tbf->dl_tfi = req->dl_tfi; l1gprs_register_tbf(gprs, tbf); } else { @@ -409,6 +446,8 @@ BLOCK_IND_IS_PTCCH(ind) ? "PTCCH" : "PDTCH", ind->hdr.fn, ind->data_len, osmo_hexdump(ind->data, ind->data_len)); + l1gprs_check_pending_tbfs(gprs, ind->hdr.fn); + if ((pdch->ul_tbf_count == 0) && (pdch->dl_tbf_count == 0)) { LOGP_PDCH(pdch, LOGL_ERROR, "Rx DL BLOCK.ind, but this PDCH has no configured TBFs\n"); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I174e3c43d2f4c828a528710b284e62c9bb794122 Gerrit-Change-Number: 33223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in libosmo-netif[master]: Add osmo_io support to osmo_stream_cli and osmo_stream_srv
by daniel 07 Jun '23

07 Jun '23

Attention is currently required from: arehbein, daniel. daniel has uploaded a new patch set (#3) to the change originally created by arehbein. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33193 ) Change subject: Add osmo_io support to osmo_stream_cli and osmo_stream_srv ...................................................................... Add osmo_io support to osmo_stream_cli and osmo_stream_srv Change-Id: I2f52c7107c392b6f4b0bf2a84f8c873c084a200c --- M include/osmocom/netif/stream.h M src/stream.c 2 files changed, 394 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/93/33193/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I2f52c7107c392b6f4b0bf2a84f8c873c084a200c Gerrit-Change-Number: 33193 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmocom-bb[master]: modem: do not send RTS.ind if we got PTCCH/D
by fixeria 07 Jun '23

07 Jun '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33110 ) Change subject: modem: do not send RTS.ind if we got PTCCH/D ...................................................................... modem: do not send RTS.ind if we got PTCCH/D Change-Id: Idcdf56de7fc6279d8b942f3670ecdc6f88c3dfd1 Related: OS#5500 --- M src/host/layer23/src/modem/rlcmac.c 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/modem/rlcmac.c b/src/host/layer23/src/modem/rlcmac.c index 161effd..fcd2b2e 100644 --- a/src/host/layer23/src/modem/rlcmac.c +++ b/src/host/layer23/src/modem/rlcmac.c @@ -195,6 +195,10 @@ }; osmo_gprs_rlcmac_prim_lower_up(prim); + /* Do not send RTS.ind if we got PTCCH/D */ + if (fn % 104 == 12) + return 0; + /* Every fn % 13 == 12 we have either a PTCCH or an IDLE slot, thus * every fn % 13 == 8 we add 5 frames, or 4 frames othrwise. The * resulting value is first fn of the next block. */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idcdf56de7fc6279d8b942f3670ecdc6f88c3dfd1 Gerrit-Change-Number: 33110 Gerrit-PatchSet: 2 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 osmocom-bb[master]: modem: do not send RTS.ind if we got PTCCH/D
by fixeria 07 Jun '23

07 Jun '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33110 ) Change subject: modem: do not send RTS.ind if we got PTCCH/D ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File src/host/layer23/src/modem/rlcmac.c: https://gerrit.osmocom.org/c/osmocom-bb/+/33110/comment/ed55177d_31200b00 PS1, Line 187: if (fn % 104 == 12) : return 0; > would make sense to use that #define from two patches eariler... […] Yeah, this is not that easy to do. Ideally, we should move this to libosmocore (`<osmocom/gsm/gsm0502.h>`) so that osmo-{bts,pcu} could reuse these constants/macros, but for now I would prefer to merge this as-is. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idcdf56de7fc6279d8b942f3670ecdc6f88c3dfd1 Gerrit-Change-Number: 33110 Gerrit-PatchSet: 1 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 07 Jun 2023 15:56:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: ts_31_102: Add shell command for GET IDENTITY
by laforge 07 Jun '23

07 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33212 ) Change subject: ts_31_102: Add shell command for GET IDENTITY ...................................................................... ts_31_102: Add shell command for GET IDENTITY GET IDENTITY is used in the "SUCI computation on USIM" feature. Change-Id: I619d397900dbd6565f8f46acdabcee511903830c --- M docs/shell.rst M pySim/commands.py M pySim/ts_31_102.py 3 files changed, 39 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/docs/shell.rst b/docs/shell.rst index cce790a..e13d054 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -566,6 +566,12 @@ :module: pySim.ts_31_102 :func: ADF_USIM.AddlShellCommands.envelope_sms_parser +get_identity +~~~~~~~~~~~~ +.. argparse:: + :module: pySim.ts_31_102 + :func: ADF_USIM.AddlShellCommands.get_id_parser + File-specific commands ---------------------- diff --git a/pySim/commands.py b/pySim/commands.py index dc0edad..3c6ae49 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -641,3 +641,8 @@ def get_data(self, tag: int, cla: int = 0x00): data, sw = self._tp.send_apdu('%02xca%04x00' % (cla, tag)) return (data, sw) + + # TS 31.102 Section 7.5.2 + def get_identity(self, context: int): + data, sw = self._tp.send_apdu_checksw('807800%02x00' % (context)) + return (data, sw) diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 342ea87..81b671e 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1664,6 +1664,23 @@ (data, sw) = self._cmd.card._scc.envelope(b2h(sms_dl.to_tlv())) self._cmd.poutput('SW: %s, data: %s' % (sw, data)) + get_id_parser = argparse.ArgumentParser() + get_id_parser.add_argument("--nswo-context", action='store_true') + + @cmd2.with_argparser(get_id_parser) + def do_get_identity(self, opts): + """Send a GET IDENTITY command to the card. This is part of the + procedure for "SUCI calculation performed on USIM" supported + by USIM with support for both EF.UST service 124 and 125.""" + context = 0x01 # SUCI + if opts.nswo_context: + context = 0x02 # SUCI 5G NSWO + (data, sw) = self._cmd.card._scc.get_identity(context) + do = SUCI_TlvDataObject() + do.from_tlv(h2b(data)) + do_d = do.to_dict() + self._cmd.poutput('SUCI TLV Data Object: %s' % do_d['suci__tlv_data_object']) + # TS 31.102 Section 7.3 sw_usim = { -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I619d397900dbd6565f8f46acdabcee511903830c Gerrit-Change-Number: 33212 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: ts_31_102: Add shell command for GET IDENTITY
by laforge 07 Jun '23

07 Jun '23

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33212 ) Change subject: ts_31_102: Add shell command for GET IDENTITY ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I619d397900dbd6565f8f46acdabcee511903830c Gerrit-Change-Number: 33212 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 07 Jun 2023 15:54:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: move variable declaration of imsi[4] into related scope
by laforge 07 Jun '23

07 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33215 ) Change subject: pcu_sock: move variable declaration of imsi[4] into related scope ...................................................................... pcu_sock: move variable declaration of imsi[4] into related scope The variable imsi[4] may be moved into the scope of case PCU_IF_SAPI_PCH Related: OS#5927 Change-Id: I62aed4f1c600ce2a80d2df928a60b6a2e0ae1889 --- M src/common/pcu_sock.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 811cea4..16048e2 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -667,7 +667,6 @@ struct gsm_bts_trx_ts *ts; struct msgb *msg; int rc = 0; - char imsi[4]; LOGP(DPCU, LOGL_DEBUG, "Data request received: sapi=%s arfcn=%d " "block=%d data=%s\n", sapi_string[data_req->sapi], @@ -679,6 +678,7 @@ { const struct gsm48_imm_ass *gsm48_imm_ass; bool confirm; + char imsi[4]; OSMO_STRLCPY_ARRAY(imsi, (char *)data_req->data); if (data_req->len-3 != GSM_MACBLOCK_LEN) { LOGP(DPCU, LOGL_ERROR, "MAC block with invalid length %d (expecting GSM_MACBLOCK_LEN = %d)\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I62aed4f1c600ce2a80d2df928a60b6a2e0ae1889 Gerrit-Change-Number: 33215 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(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 osmo-bts[master]: pcu_sock: move variable declaration of imsi[4] into related scope
by laforge 07 Jun '23

07 Jun '23

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33215 ) Change subject: pcu_sock: move variable declaration of imsi[4] into related scope ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I62aed4f1c600ce2a80d2df928a60b6a2e0ae1889 Gerrit-Change-Number: 33215 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(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: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Jun 2023 15:53:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0