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

[S] Change in libosmo-gprs[master]: gmm: Make OSMO_GPRS_GMM_TLLI_UNASSIGNED def publicly available

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33772 ) Change subject: gmm: Make OSMO_GPRS_GMM_TLLI_UNASSIGNED def publicly available ...................................................................... gmm: Make OSMO_GPRS_GMM_TLLI_UNASSIGNED def publicly available This can be used for users receiving the GMMRR_ASSIGN_REQ primitive to find out if it's a creation, update or deletion of a TLLI. Change-Id: I881b1370b283ceee98c035ed42b91f7e12611979 --- M include/osmocom/gprs/gmm/gmm.h M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm.c 3 files changed, 18 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/gmm/gmm.h b/include/osmocom/gprs/gmm/gmm.h index 49954e8..1fcd95b 100644 --- a/include/osmocom/gprs/gmm/gmm.h +++ b/include/osmocom/gprs/gmm/gmm.h @@ -5,6 +5,9 @@ #include <stdint.h> #include <stddef.h> +/* 3GPP TS 44.064 § 8.3 TLLI assignment procedures */ +#define OSMO_GPRS_GMM_TLLI_UNASSIGNED (0xffffffff) + /* Use stack as MS or as network? */ enum osmo_gprs_gmm_location { OSMO_GPRS_GMM_LOCATION_UNSET, diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h index 5a29600..66ea8d7 100644 --- a/include/osmocom/gprs/gmm/gmm_private.h +++ b/include/osmocom/gprs/gmm/gmm_private.h @@ -19,9 +19,6 @@ #include <osmocom/gprs/gmm/gmm_prim.h> #include <osmocom/gprs/gmm/gmm_ms_fsm.h> -/* 3GPP TS 44.064 § 8.3 TLLI assignment procedures */ -#define GPRS_GMM_TLLI_UNASSIGNED (0xffffffff) - #define GPRS_GMM_SESS_ID_UNASSIGNED (0xffffffff) extern int g_gmm_log_cat[_OSMO_GPRS_GMM_LOGC_MAX]; diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 9f7a9fd..8a293a3 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -165,7 +165,7 @@ gmme->ptmsi_sig = GSM_RESERVED_TMSI; gmme->ptmsi = ptmsi; gmme->old_ptmsi = GSM_RESERVED_TMSI; - gmme->old_tlli = GPRS_GMM_TLLI_UNASSIGNED; + gmme->old_tlli = OSMO_GPRS_GMM_TLLI_UNASSIGNED; gmme->auth_ciph.req.ac_ref_nr = 0xff; /* invalid value */ OSMO_STRLCPY_ARRAY(gmme->imsi, imsi); @@ -299,7 +299,7 @@ rc = -ERANGE; failed: LOGGMM(LOGL_ERROR, "Failed to allocate a TLLI: %d (%s)\n", rc, strerror(-rc)); - return GPRS_GMM_TLLI_UNASSIGNED; + return OSMO_GPRS_GMM_TLLI_UNASSIGNED; } /* TS 24.008 4.7.2.1.1 READY timer behaviour (A/Gb mode only) */ @@ -1000,7 +1000,7 @@ /* Submit LLGMM-ASSIGN-REQ as per TS 24.007 Annex C.3 */ gmme->old_tlli = gmme->tlli; - gmme->tlli = GPRS_GMM_TLLI_UNASSIGNED; + gmme->tlli = OSMO_GPRS_GMM_TLLI_UNASSIGNED; rc = gprs_gmm_submit_llgmm_assing_req(gmme); if (rc < 0) goto rejected; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I881b1370b283ceee98c035ed42b91f7e12611979 Gerrit-Change-Number: 33772 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Make OSMO_GPRS_GMM_TLLI_UNASSIGNED def publicly available

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33772 ) Change subject: gmm: Make OSMO_GPRS_GMM_TLLI_UNASSIGNED def publicly available ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I881b1370b283ceee98c035ed42b91f7e12611979 Gerrit-Change-Number: 33772 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 11:44:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Introduce L1CTL-CCCH_READY.ind primitive

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33770 ) Change subject: rlcmac: Introduce L1CTL-CCCH_READY.ind primitive ...................................................................... rlcmac: Introduce L1CTL-CCCH_READY.ind primitive This is used by lower layer L1CTL to notify the upper layer RLCMAC when it's prepared to use CCCH. Change-Id: I4cfb1e2db217a97b7a1dc8849cd13d58e4034c56 --- M include/osmocom/gprs/rlcmac/rlcmac_prim.h M src/rlcmac/gre.c M src/rlcmac/rlcmac_prim.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 5 files changed, 61 insertions(+), 34 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/rlcmac/rlcmac_prim.h b/include/osmocom/gprs/rlcmac/rlcmac_prim.h index 16d43d1..70d1075 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac_prim.h +++ b/include/osmocom/gprs/rlcmac/rlcmac_prim.h @@ -113,6 +113,7 @@ OSMO_GPRS_RLCMAC_L1CTL_CFG_DL_TBF, OSMO_GPRS_RLCMAC_L1CTL_PDCH_ESTABLISH, OSMO_GPRS_RLCMAC_L1CTL_PDCH_RELEASE, + OSMO_GPRS_RLCMAC_L1CTL_CCCH_READY, }; extern const struct value_string osmo_gprs_rlcmac_l1ctl_prim_type_names[]; @@ -192,6 +193,9 @@ } fhp; /* fh == true */ }; } pdch_est_req; + /* OSMO_GPRS_RLCMAC_L1CTL_CCCH_READY | Ind */ + struct { + } ccch_ready; }; }; @@ -231,3 +235,4 @@ struct osmo_gprs_rlcmac_prim *osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_rts_ind(uint8_t ts_nr, uint32_t fn, uint8_t usf); struct osmo_gprs_rlcmac_prim *gprs_rlcmac_prim_alloc_l1ctl_pdch_est_req(uint8_t ts_nr, uint8_t tsc, uint8_t ta); struct osmo_gprs_rlcmac_prim *gprs_rlcmac_prim_alloc_l1ctl_pdch_rel_req(void); +struct osmo_gprs_rlcmac_prim *osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_ready_ind(void); diff --git a/src/rlcmac/gre.c b/src/rlcmac/gre.c index 3d2297f..f23defd 100644 --- a/src/rlcmac/gre.c +++ b/src/rlcmac/gre.c @@ -39,9 +39,8 @@ /* We have to defer going to CCCH a bit to leave space for last PKT CTRL ACK to be transmitted */ static void _defer_pkt_idle_timer_cb(void *data) { - struct gprs_rlcmac_entity *gre = data; gprs_rlcmac_submit_l1ctl_pdch_rel_req(); - gprs_rlcmac_entity_start_ul_tbf_pkt_acc_proc_if_needed(gre); + /* Wait for L1CTL-CCCH_READY.ind before attempting new pkt-access-procedure if needed. */ } struct gprs_rlcmac_entity *gprs_rlcmac_entity_alloc(uint32_t tlli) diff --git a/src/rlcmac/rlcmac_prim.c b/src/rlcmac/rlcmac_prim.c index 5261a73..d3df15f 100644 --- a/src/rlcmac/rlcmac_prim.c +++ b/src/rlcmac/rlcmac_prim.c @@ -72,6 +72,7 @@ { OSMO_GPRS_RLCMAC_L1CTL_CFG_DL_TBF, "CFG_DL_TBF" }, { OSMO_GPRS_RLCMAC_L1CTL_PDCH_ESTABLISH, "PDCH_ESTABLISH" }, { OSMO_GPRS_RLCMAC_L1CTL_PDCH_RELEASE, "PDCH_RELEASE" }, + { OSMO_GPRS_RLCMAC_L1CTL_CCCH_READY, "CCCH_READY" }, { 0, NULL } }; @@ -346,6 +347,14 @@ return rlcmac_prim; } +/* L1CTL-CCCH_READY.ind */ +struct osmo_gprs_rlcmac_prim *osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_ready_ind(void) +{ + struct osmo_gprs_rlcmac_prim *rlcmac_prim; + rlcmac_prim = rlcmac_prim_l1ctl_alloc(OSMO_GPRS_RLCMAC_L1CTL_CCCH_READY, PRIM_OP_INDICATION, 0); + return rlcmac_prim; +} + int gprs_rlcmac_prim_handle_unsupported(struct osmo_gprs_rlcmac_prim *rlcmac_prim) { LOGRLCMAC(LOGL_ERROR, "Unsupported rlcmac_prim! %s\n", osmo_gprs_rlcmac_prim_name(rlcmac_prim)); @@ -602,6 +611,19 @@ return rc; } +static int rlcmac_prim_handle_l1ctl_ccch_ready_ind(struct osmo_gprs_rlcmac_prim *rlcmac_prim) +{ + struct gprs_rlcmac_entity *gre; + + /* Lower layers are synced to CCCH, check if some MS was waiting for + * that condition to start packet-access-procedure (see + * _defer_pkt_idle_timer_cb) */ + llist_for_each_entry(gre, &g_rlcmac_ctx->gre_list, entry) + gprs_rlcmac_entity_start_ul_tbf_pkt_acc_proc_if_needed(gre); + return 0; + +} + static int gprs_rlcmac_prim_l1ctl_lower_up(struct osmo_gprs_rlcmac_prim *rlcmac_prim) { int rc; @@ -616,6 +638,9 @@ case OSMO_PRIM(OSMO_GPRS_RLCMAC_L1CTL_CCCH_DATA, PRIM_OP_INDICATION): rc = rlcmac_prim_handle_l1ctl_ccch_data_ind(rlcmac_prim); break; + case OSMO_PRIM(OSMO_GPRS_RLCMAC_L1CTL_CCCH_READY, PRIM_OP_INDICATION): + rc = rlcmac_prim_handle_l1ctl_ccch_ready_ind(rlcmac_prim); + break; default: rc = -ENOTSUP; } diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err index c6a7a73..fd43fe3 100644 --- a/tests/rlcmac/rlcmac_prim_test.err +++ b/tests/rlcmac/rlcmac_prim_test.err @@ -175,19 +175,7 @@ DLGLOBAL INFO UL_TBF{FLOW}: Deallocated DLGLOBAL INFO Tx L1CTL-PDCH_REL.req DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_RELEASE.request -DLGLOBAL INFO UL_TBF{NEW}: Allocated -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Allocated -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START -DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START -DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7a -DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request -DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL INFO DL_TBF_ASS{IDLE}: Deallocated -DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: Deallocated -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CFG_UL_TBF.req ul_tbf_nr=1 (release) -DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request -DLGLOBAL INFO UL_TBF{ASSIGN}: Deallocated DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly DLGLOBAL INFO DL_TBF_ASS{IDLE}: Allocated @@ -196,7 +184,7 @@ DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7c +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7a DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL DEBUG Rx from lower layers: L1CTL-CCCH_DATA.indication @@ -234,7 +222,7 @@ DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x79 +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7c DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL DEBUG Rx from lower layers: L1CTL-CCCH_DATA.indication @@ -269,7 +257,7 @@ DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7d +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x79 DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL DEBUG Rx from lower layers: L1CTL-CCCH_DATA.indication @@ -304,7 +292,7 @@ DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7a +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7d DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL DEBUG Rx from lower layers: L1CTL-CCCH_DATA.indication @@ -349,7 +337,7 @@ DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7b +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7a DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request @@ -495,7 +483,7 @@ DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7a +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7b DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request @@ -523,7 +511,7 @@ DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7b +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7a DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL DEBUG Rx from lower layers: L1CTL-CCCH_DATA.indication @@ -703,7 +691,7 @@ DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7e +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7b DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL DEBUG Rx from lower layers: L1CTL-CCCH_DATA.indication @@ -812,7 +800,7 @@ DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN -DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7c +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7e DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL DEBUG Rx from lower layers: L1CTL-CCCH_DATA.indication diff --git a/tests/rlcmac/rlcmac_prim_test.ok b/tests/rlcmac/rlcmac_prim_test.ok index 731bd20..daea0f2 100644 --- a/tests/rlcmac/rlcmac_prim_test.ok +++ b/tests/rlcmac/rlcmac_prim_test.ok @@ -45,11 +45,9 @@ sys={20.027690}, mono={20.027690}: clock_override_add sys={20.027690}, mono={20.027690}: Expect defer_pkt_idle_timer timeout test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_RELEASE.request -test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7a -test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=1 ul_slotmask=0x00 === test_ul_tbf_t3166_timeout start === sys={0.000000}, mono={0.000000}: clock_override_set -test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7c +test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7a test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 test_rlcmac_prim_up_cb(): Rx GMMRR-LLC_TRANSMITTED.indication TLLI=0x00002342 @@ -58,7 +56,7 @@ sys={5.000000}, mono={5.000000}: Expect T3166 timeout test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_RELEASE.request -test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x79 +test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7c test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=4 ts=7 data_len=34 data=[3c 01 01 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 00 ] @@ -66,7 +64,7 @@ sys={10.000000}, mono={10.000000}: Expect T3166 timeout test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_RELEASE.request -test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7d +test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x79 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=4 ts=7 data_len=34 data=[3c 01 01 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 00 ] @@ -74,7 +72,7 @@ sys={15.000000}, mono={15.000000}: Expect T3166 timeout test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_RELEASE.request -test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7a +test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7d test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=4 ts=7 data_len=34 data=[3c 01 01 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 00 ] @@ -87,7 +85,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_RELEASE.request === test_ul_tbf_n3104_timeout start === sys={0.000000}, mono={0.000000}: clock_override_set -test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7b +test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7a test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 RTS 0: FN=8 @@ -117,7 +115,7 @@ RTS 11: FN=56 test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_RELEASE.request -test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7a +test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7b test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=56 ts=7 data_len=34 data=[00 01 04 3d 00 00 23 42 71 62 f2 24 6c 84 44 04 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 @@ -125,7 +123,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 === test_ul_tbf_t3182_timeout start === sys={0.000000}, mono={0.000000}: clock_override_set -test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7b +test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7a test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 test_rlcmac_prim_up_cb(): Rx GMMRR-LLC_TRANSMITTED.indication TLLI=0x00002342 @@ -161,7 +159,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_RELEASE.request === test_ul_tbf_countdown_procedure start === sys={0.000000}, mono={0.000000}: clock_override_set -test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7e +test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7b test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 test_rlcmac_prim_up_cb(): Rx GMMRR-LLC_TRANSMITTED.indication TLLI=0x00002342 @@ -182,7 +180,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 === test_ul_tbf_request_another_ul_tbf start === sys={0.000000}, mono={0.000000}: clock_override_set -test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7c +test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7e test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 test_rlcmac_prim_up_cb(): Rx GMMRR-LLC_TRANSMITTED.indication TLLI=0x00002342 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4cfb1e2db217a97b7a1dc8849cd13d58e4034c56 Gerrit-Change-Number: 33770 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Introduce L1CTL-CCCH_READY.ind primitive

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33770 ) Change subject: rlcmac: Introduce L1CTL-CCCH_READY.ind primitive ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4cfb1e2db217a97b7a1dc8849cd13d58e4034c56 Gerrit-Change-Number: 33770 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 11:44:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in docker-playground[master]: osmo-uecups-master: remove useradd

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33773 ) Change subject: osmo-uecups-master: remove useradd ...................................................................... osmo-uecups-master: remove useradd debian-bookworm-build already adds a user (as it is a combination of debian-bullseye-build and debian-bullseye-jenkins, and the latter did it). Remove the additional useradd in osmo-uecups-master to fix: useradd: UID 1000 is not unique I've looked through related configs and scripts and the username is not hardcoded there. Related: OS#6057 Change-Id: I28f2a110167f550e1b38332ed4e7124b9e76f312 --- M osmo-uecups-master/Dockerfile 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile index 7841b32..7f30155 100644 --- a/osmo-uecups-master/Dockerfile +++ b/osmo-uecups-master/Dockerfile @@ -34,8 +34,6 @@ COPY osmo-uecups-daemon.cfg /data/osmo-uecups-daemon.cfg -RUN useradd -m --uid=1000 osmocom - WORKDIR /data CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-uecups-daemon -c /data/osmo-uecups-daemon.cfg >/data/osmo-uecups-daemon.log 2>&1"] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I28f2a110167f550e1b38332ed4e7124b9e76f312 Gerrit-Change-Number: 33773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in docker-playground[master]: osmo-uecups-master: remove useradd

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33773 ) Change subject: osmo-uecups-master: remove useradd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I28f2a110167f550e1b38332ed4e7124b9e76f312 Gerrit-Change-Number: 33773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 11:43:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in docker-playground[master]: osmo-uecups-master: remove useradd

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33773 ) Change subject: osmo-uecups-master: remove useradd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I28f2a110167f550e1b38332ed4e7124b9e76f312 Gerrit-Change-Number: 33773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 11:43:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-remsim[master]: user_shell: Fix unchecked return value of osmo_fd_register()

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/33779 ) Change subject: user_shell: Fix unchecked return value of osmo_fd_register() ...................................................................... user_shell: Fix unchecked return value of osmo_fd_register() Fixes: CID#307519: Unchecked return value (CHECKED_RETURN) Change-Id: I68ed44464573b9a6fecd07cf13fd2d6f4a1013bb --- M src/client/user_shell.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/79/33779/1 diff --git a/src/client/user_shell.c b/src/client/user_shell.c index 5d37e97..f0dcd55 100644 --- a/src/client/user_shell.c +++ b/src/client/user_shell.c @@ -170,11 +170,15 @@ int client_user_main(struct bankd_client *bc) { struct stdin_state ss; + int rc; /* register stdin file descriptor with osmocom select loop abstraction */ memset(&ss, 0, sizeof(ss)); osmo_fd_setup(&ss.ofd, fileno(stdin), OSMO_FD_READ, &stdin_fd_cb, &ss, 0); - osmo_fd_register(&ss.ofd); + rc = osmo_fd_register(&ss.ofd); + if (rc < 0) + return rc; + ss.bc = bc; while (1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/33779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I68ed44464573b9a6fecd07cf13fd2d6f4a1013bb Gerrit-Change-Number: 33779 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-remsim[master]: user_ifdhandler: Fix missing check of osmo_fd_register return val

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/33778 ) Change subject: user_ifdhandler: Fix missing check of osmo_fd_register return val ...................................................................... user_ifdhandler: Fix missing check of osmo_fd_register return val Fixes: CID#307514: Unchecked return value (CHECKED_RETURN) Change-Id: I99d7254b6cc3bf5ead800dafabc77a965857911c --- M src/client/user_ifdhandler.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/78/33778/1 diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c index 5e7fb7a..c6a9392 100644 --- a/src/client/user_ifdhandler.c +++ b/src/client/user_ifdhandler.c @@ -396,7 +396,8 @@ INIT_LLIST_HEAD(&ct->it_msgq); osmo_fd_setup(&ct->it_ofd, cfg->it_sock_fd, OSMO_FD_READ, &it_sock_fd_cb, ct, 0); - osmo_fd_register(&ct->it_ofd); + rc = osmo_fd_register(&ct->it_ofd); + OSMO_ASSERT(rc == 0); /* ensure we get properly cleaned up if cancelled */ pthread_cleanup_push(client_pthread_cleanup, ct); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/33778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I99d7254b6cc3bf5ead800dafabc77a965857911c Gerrit-Change-Number: 33778 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-remsim[master]: rspro_client_fsm: Fix integer overflow calculating re-establishment d...

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/33777 ) Change subject: rspro_client_fsm: Fix integer overflow calculating re-establishment delay ...................................................................... rspro_client_fsm: Fix integer overflow calculating re-establishment delay Fixes: CID#307493: Unintentional integer overflow (OVERFLOW_BEFORE_WIDEN) Change-Id: Ib1cca5ac0d27807936a52e0c013f0442350ecc00 --- M src/rspro_client_fsm.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/77/33777/1 diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 321dcf2..72176ab 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -238,7 +238,7 @@ } /* determine if we need to delay reestablishment */ - const int64_t need_ms = k_reestablish_delay_s[srvc->reestablish_delay_idx] * 1000; + const int64_t need_ms = (int64_t) k_reestablish_delay_s[srvc->reestablish_delay_idx] * 1000; int64_t delay_ms = need_ms - since_last_ms; if (delay_ms > 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/33777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib1cca5ac0d27807936a52e0c013f0442350ecc00 Gerrit-Change-Number: 33777 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2023