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

[S] Change in libosmo-abis[master]: e1d: close fd when osmo_fd_setup fails

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32370 ) Change subject: e1d: close fd when osmo_fd_setup fails ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I6b41e5ad8511f2d4e524979631a91ab23dc0b23f Gerrit-Change-Number: 32370 Gerrit-PatchSet: 2 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: Thu, 20 Apr 2023 15:19:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: do not set fd number to 0 after close

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32392 ) Change subject: e1d: do not set fd number to 0 after close ...................................................................... e1d: do not set fd number to 0 after close 0 is reserved for STDIN, so lets not set the file descriptor to 0 after we close it. Lets use -1 instead. Change-Id: I72e4775135caf4e3727c4f0654a545478c73bb83 --- M src/input/e1d.c 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/92/32392/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index 44a710d..01da96d 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -429,13 +429,13 @@ } if (bfd->fd) { close(bfd->fd); - bfd->fd = 0; + bfd->fd = -1; } continue; case E1INP_TS_TYPE_SIGN: if (bfd->fd > 0 && ts_info[ts].cfg.mode != E1DP_TSMODE_HDLCFCS) { close(bfd->fd); - bfd->fd = 0; + bfd->fd = -1; } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, @@ -465,7 +465,7 @@ /* close, if old timeslot mode doesn't match new config */ if (bfd->fd > 0 && ts_info[ts].cfg.mode != E1DP_TSMODE_HDLCFCS) { close(bfd->fd); - bfd->fd = 0; + bfd->fd = -1; } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, @@ -489,7 +489,7 @@ /* close, if old timeslot mode doesn't match new config */ if (bfd->fd > 0 && ts_info[ts].cfg.mode != E1DP_TSMODE_RAW) { close(bfd->fd); - bfd->fd = 0; + bfd->fd = -1; } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I72e4775135caf4e3727c4f0654a545478c73bb83 Gerrit-Change-Number: 32392 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: close fd when osmo_fd_setup fails

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32370 ) Change subject: e1d: close fd when osmo_fd_setup fails ...................................................................... Patch Set 2: (1 comment) File src/input/e1d.c: https://gerrit.osmocom.org/c/libosmo-abis/+/32370/comment/136b3c82_f368538b PS1, Line 513: bfd->fd = 0; > -1 Then I will fix this in the other code locations as well. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I6b41e5ad8511f2d4e524979631a91ab23dc0b23f Gerrit-Change-Number: 32370 Gerrit-PatchSet: 2 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: Thu, 20 Apr 2023 15:07:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[L] Change in libosmo-abis[master]: e1d: reconnect to osmo-e1d after connection loss

by dexter

Attention is currently required from: laforge, keith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/32374 to look at the new patch set (#3). Change subject: e1d: reconnect to osmo-e1d after connection loss ...................................................................... e1d: reconnect to osmo-e1d after connection loss When osmo-e1d crashes while a line is in use the client process may experience not only a lost connection, it may also hang up in an endless loop that would also spam the logfile. The reason for this is that the e1d driver in libosmo-abis lacks mechanisms to detect when the connection to osmo-e1d gets lost. When osmo-e1d goes down the effects should be similar to those of a normal connection loss of an e1 line (cable pulled). So let's add an FSM that takes care of the recovery of the connection when it is lost. Also make sure that no havoc happens when the connection gets lost. Related: OS#5983 Change-Id: Iaf4d42c2f009b1d7666e319fabdeb2598aa0b338 --- M src/input/e1d.c 1 file changed, 253 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/74/32374/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iaf4d42c2f009b1d7666e319fabdeb2598aa0b338 Gerrit-Change-Number: 32374 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: close fd when osmo_fd_setup fails

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/32370 to look at the new patch set (#2). Change subject: e1d: close fd when osmo_fd_setup fails ...................................................................... e1d: close fd when osmo_fd_setup fails When osmo_fd_register() fails we just exit but the file descriptor stays open. A file descriptor in this state does not work. Let's close the file descriptor Change-Id: I6b41e5ad8511f2d4e524979631a91ab23dc0b23f --- M src/input/e1d.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/70/32370/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I6b41e5ad8511f2d4e524979631a91ab23dc0b23f Gerrit-Change-Number: 32370 Gerrit-PatchSet: 2 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-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[L] Change in libosmo-abis[master]: e1d: reconnect to osmo-e1d after connection loss

by dexter

Attention is currently required from: laforge, keith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32374 ) Change subject: e1d: reconnect to osmo-e1d after connection loss ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > I suppose because the issue being attended to here was observed and reported in libosmo-abis using a […] Its a problem with the e1d driver in libosmo-e1d. The file descriptors used to exchange the data on the E1 timeslots are under the control of libosmo-abis (in the line data struct). Also this part of the implementation has to interface between the way libosmo-abis manages the E1 line and osmo-e1d. This is already very application specific. It is true, each application using the osmo-e1d client has the same problem but the problem is no different from handling any other socket connection. One could still think to re-design the API towards osmo-e1d to hide everything socket specific from the API user. Basically the driver would be outsourced to libosmo-e1d and replaced with a minimalistic version that just calls API functions and handles some context. Basically we would have some kind of middle layer between libosmo-abis and the original libosmo-e1d API. I am not sure, this might be overcomplicated. (at least the generation of the EV_CONN_LOST might become easier since we could tie that to the control socket) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iaf4d42c2f009b1d7666e319fabdeb2598aa0b338 Gerrit-Change-Number: 32374 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Thu, 20 Apr 2023 15:07:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: keith <keith(a)rhizomatica.org> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[M] Change in pysim[master]: filesystem: define more convenient codec for EF.ACC

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/32351 ) Change subject: filesystem: define more convenient codec for EF.ACC ...................................................................... filesystem: define more convenient codec for EF.ACC This patch improves the output of the 'read_binary_decoded' command: pySIM-shell (MF/DF.GSM/EF.ACC)> read_binary_decoded { "ACC0": false, "ACC1": false, "ACC2": false, "ACC3": false, "ACC4": false, "ACC5": false, "ACC6": false, "ACC7": false, "ACC8": false, "ACC9": false, "ACC10": false, "ACC11": false, "ACC12": false, "ACC13": false, "ACC14": false, "ACC15": true } And allows to set/unset individual ACCs using 'update_binary_decoded': pySIM-shell (MF/DF.GSM/EF.ACC)> update_binary_decoded --json-path 'ACC15' 0 "0000" pySIM-shell (MF/DF.GSM/EF.ACC)> update_binary_decoded --json-path 'ACC8' 1 "0100" pySIM-shell (MF/DF.GSM/EF.ACC)> update_binary_decoded --json-path 'ACC0' 1 "0101" Change-Id: I805b3277410745815d3fdc44b9c0f8c5be8d7a10 Related: SYS#6425 --- M pySim/ts_51_011.py 1 file changed, 55 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index b9e19b2..3dc21c8 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -717,13 +717,25 @@ # TS 51.011 Section 10.3.15 class EF_ACC(TransparentEF): + # example: acc_list(15) will produce a dict with only ACC15 being True + # example: acc_list(2, 4) will produce a dict with ACC2 and ACC4 being True + # example: acc_list() will produce a dict with all ACCs being False + acc_list = lambda *active: {'ACC{}'.format(c) : c in active for c in range(16)} + _test_de_encode = [ - ( "0100", "0100" ), + ( "0000", acc_list() ), + ( "0001", acc_list(0) ), + ( "0002", acc_list(1) ), + ( "0100", acc_list(8) ), + ( "8000", acc_list(15) ), + ( "802b", acc_list(0,1,3,5,15) ), ] def __init__(self, fid='6f78', sfid=None, name='EF.ACC', desc='Access Control Class', size=(2, 2), **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) - self._construct = HexAdapter(Bytes(2)) + # LSB of octet 2 is ACC=0 ... MSB of octet 1 is ACC=15 + flags = ['ACC{}'.format(c) / Flag for c in range(16)] + self._construct = ByteSwapped(BitsSwapped(BitStruct(*flags))) # TS 51.011 Section 10.3.16 class EF_LOCI(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I805b3277410745815d3fdc44b9c0f8c5be8d7a10 Gerrit-Change-Number: 32351 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: CSD: support non-transparent data rates

by fixeria

Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32369 ) Change subject: CSD: support non-transparent data rates ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5f4bdf17a9833f65a0b623a033da838a2594d68 Gerrit-Change-Number: 32369 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 20 Apr 2023 14:56:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-pcu[master]: ms: Rename field timer -> release_timer

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32391 ) Change subject: ms: Rename field timer -> release_timer ...................................................................... ms: Rename field timer -> release_timer Rename it so that it becomes clear what the timer is used for. Change-Id: Id4738ea196b232858e1ec9cdc439f9b81839058f --- M src/gprs_ms.c M src/gprs_ms.h M tests/ms/MsTest.cpp 3 files changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/91/32391/1 diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 1450d19..720617e 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -151,7 +151,7 @@ LOGP(DMS, LOGL_INFO, "Creating MS object\n"); ms->imsi[0] = '\0'; - osmo_timer_setup(&ms->timer, ms_release_timer_cb, ms); + osmo_timer_setup(&ms->release_timer, ms_release_timer_cb, ms); llc_queue_init(&ms->llc_queue, ms); memset(&ms->llc_timer, 0, sizeof(ms->llc_timer)); osmo_timer_setup(&ms->llc_timer, ms_llc_timer_cb, ms); @@ -189,7 +189,7 @@ ms_set_reserved_slots(ms, NULL, 0, 0); - osmo_timer_del(&ms->timer); + osmo_timer_del(&ms->release_timer); if (ms->ul_tbf) { tbf_set_ms(ul_tbf_as_tbf(ms->ul_tbf), NULL); @@ -241,17 +241,17 @@ } LOGPMS(ms, DMS, LOGL_INFO, "Schedule MS release in %lu secs\n", delay_rel_sec); - osmo_timer_schedule(&ms->timer, delay_rel_sec, 0); + osmo_timer_schedule(&ms->release_timer, delay_rel_sec, 0); } static void ms_becomes_active(struct GprsMs *ms) { - if (!osmo_timer_pending(&ms->timer)) + if (!osmo_timer_pending(&ms->release_timer)) return; LOGPMS(ms, DMS, LOGL_DEBUG, "Cancel scheduled MS release\n"); - osmo_timer_del(&ms->timer); + osmo_timer_del(&ms->release_timer); } void ms_set_mode(struct GprsMs *ms, enum mcs_kind mode) diff --git a/src/gprs_ms.h b/src/gprs_ms.h index 4f6456e..b2b3274 100644 --- a/src/gprs_ms.h +++ b/src/gprs_ms.h @@ -79,7 +79,7 @@ struct osmo_timer_list llc_timer; struct osmo_use_count use_count; - struct osmo_timer_list timer; + struct osmo_timer_list release_timer; int64_t last_cs_not_low; diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 776f77c7..ea54a12 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -404,7 +404,7 @@ /* test MS still exists and it's idle: */ OSMO_ASSERT(bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI) != NULL); OSMO_ASSERT(ms_is_idle(ms)); - OSMO_ASSERT(osmo_timer_pending(&ms->timer)); + OSMO_ASSERT(osmo_timer_pending(&ms->release_timer)); usleep(1100000); osmo_timers_update(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id4738ea196b232858e1ec9cdc439f9b81839058f Gerrit-Change-Number: 32391 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[M] Change in osmo-pcu[master]: ms: Get rid of ms->delay field

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32390 ) Change subject: ms: Get rid of ms->delay field ...................................................................... ms: Get rid of ms->delay field Simply apply the content of the configured timer when the MS goes idle. Having that field is convenient to do tricky stuff in unit tests, but makes the main osmo-pcu app more complex for no good enough reason. Change-Id: I8d44318b37b6605afd84db8ccec0d75e6db293b9 --- M src/bts.cpp M src/gprs_ms.c M src/gprs_ms.h M tests/alloc/AllocTest.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp M tests/ulc/PdchUlcTest.cpp 7 files changed, 30 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/32390/1 diff --git a/src/bts.cpp b/src/bts.cpp index 4cbe68e..d4bb35f 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -241,11 +241,8 @@ static int bts_talloc_destructor(struct gprs_rlcmac_bts* bts) { struct GprsMs *ms; - while ((ms = llist_first_entry_or_null(&bts->ms_list, struct GprsMs, list))) { - ms_set_timeout(ms, 0); - bts_stat_item_dec(bts, STAT_MS_PRESENT); + while ((ms = llist_first_entry_or_null(&bts->ms_list, struct GprsMs, list))) talloc_free(ms); - } gprs_bssgp_destroy(bts); diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 877422f..1450d19 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -170,8 +170,6 @@ if (!ms->ctrs) goto free_ret; - ms_set_timeout(ms, osmo_tdef_get(bts->pcu->T_defs, -2030, OSMO_TDEF_S, -1)); - if (use_ref) ms_ref(ms, use_ref); return ms; @@ -219,6 +217,8 @@ /* MS has no attached TBFs anymore. */ static void ms_becomes_idle(struct GprsMs *ms) { + unsigned long delay_rel_sec = osmo_tdef_get(ms->bts->pcu->T_defs, -2030, OSMO_TDEF_S, -1); + ms_set_reserved_slots(ms, NULL, 0, 0); ms->first_common_ts = NULL; @@ -226,7 +226,7 @@ * Skip delaying free() through release timer if delay is configured to be 0. * This is useful for synced freed during unit tests. */ - if (ms->delay == 0) { + if (delay_rel_sec == 0) { talloc_free(ms); return; } @@ -240,8 +240,8 @@ return; } - LOGPMS(ms, DMS, LOGL_INFO, "Schedule MS release in %u secs\n", ms->delay); - osmo_timer_schedule(&ms->timer, ms->delay, 0); + LOGPMS(ms, DMS, LOGL_INFO, "Schedule MS release in %lu secs\n", delay_rel_sec); + osmo_timer_schedule(&ms->timer, delay_rel_sec, 0); } static void ms_becomes_active(struct GprsMs *ms) @@ -398,9 +398,6 @@ struct llist_item *pos; struct gprs_rlcmac_tbf *tbf; - /* free immediately when it becomes idle: */ - ms->delay = 0; - tbf = ul_tbf_as_tbf(ms_ul_tbf(ms)); if (tbf && !tbf_timers_pending(tbf, T_MAX)) tbf_free(tbf); @@ -415,7 +412,8 @@ } /* Flag it with invalid data so that it cannot be looked up anymore and - * shows up specially if listed in VTY: */ + * shows up specially if listed in VTY. Furthermore, it will also trigger + * immediate free() when it becomes idle: */ ms->tlli = GSM_RESERVED_TMSI; ms->new_dl_tlli = ms->tlli; ms->new_ul_tlli = ms->tlli; diff --git a/src/gprs_ms.h b/src/gprs_ms.h index 03508ff..4f6456e 100644 --- a/src/gprs_ms.h +++ b/src/gprs_ms.h @@ -80,7 +80,6 @@ struct osmo_use_count use_count; struct osmo_timer_list timer; - unsigned delay; int64_t last_cs_not_low; @@ -216,11 +215,6 @@ return ms->mode; } -static inline void ms_set_timeout(struct GprsMs *ms, unsigned secs) -{ - ms->delay = secs; -} - static inline unsigned ms_nack_rate_dl(const struct GprsMs *ms) { return ms->nack_rate_dl; diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index 8a67152..a84bd64 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -225,7 +225,7 @@ ms = ms_alloc(bts, __func__); ms_set_ms_class(ms, ms_class); /* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */ - ms_set_timeout(ms, 0); + OSMO_ASSERT(osmo_tdef_set(the_pcu->T_defs, -2030, 0, OSMO_TDEF_S) == 0); ul_tbf = ul_tbf_alloc(bts, ms, -1, true); if (!ul_tbf) { ms_unref(ms, __func__); @@ -273,7 +273,7 @@ ms = ms_alloc(bts, __func__); ms_set_ms_class(ms, ms_class); /* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */ - ms_set_timeout(ms, 0); + OSMO_ASSERT(osmo_tdef_set(the_pcu->T_defs, -2030, 0, OSMO_TDEF_S) == 0); dl_tbf = dl_tbf_alloc(bts, ms, -1, true); if (!dl_tbf) { ms_unref(ms, __func__); @@ -329,7 +329,7 @@ ms = ms_alloc(bts, __func__); ms_set_ms_class(ms, ms_class); /* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */ - ms_set_timeout(ms, 0); + OSMO_ASSERT(osmo_tdef_set(the_pcu->T_defs, -2030, 0, OSMO_TDEF_S) == 0); ul_tbf = ul_tbf_alloc(bts, ms, -1, false); if (!ul_tbf) { ms_unref(ms, __func__); diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 2a15a7b..776f77c7 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -378,9 +378,10 @@ printf("=== start %s ===\n", __func__); + OSMO_ASSERT(osmo_tdef_set(the_pcu->T_defs, -2030, 1, OSMO_TDEF_S) == 0); + ms = ms_alloc(bts, __func__); ms_set_tlli(ms, tlli); - ms_set_timeout(ms, 1); OSMO_ASSERT(ms_is_idle(ms)); @@ -415,6 +416,8 @@ talloc_free(ul_tbf); talloc_free(bts); printf("=== end %s ===\n", __func__); + /* Return the timer to the usually expected value 0 for other tests: */ + OSMO_ASSERT(osmo_tdef_set(the_pcu->T_defs, -2030, 0, OSMO_TDEF_S) == 0); } static void test_ms_cs_selection() diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index ad08318..76394e2 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -627,7 +627,7 @@ fprintf(stderr, "=== end %s ===\n", __func__); /* Restore MS release timeout to 0 to make sure it is freed immediately: */ - ms_set_timeout(ms, 0); + OSMO_ASSERT(osmo_tdef_set(the_pcu->T_defs, -2030, 0, OSMO_TDEF_S) == 0); TALLOC_FREE(the_pcu); } diff --git a/tests/ulc/PdchUlcTest.cpp b/tests/ulc/PdchUlcTest.cpp index be370bd..a13479f 100644 --- a/tests/ulc/PdchUlcTest.cpp +++ b/tests/ulc/PdchUlcTest.cpp @@ -320,6 +320,7 @@ log_parse_category_mask(osmo_stderr_target, "DPCU,1:DRLCMAC,1:DRLCMACUL,1:DMS,1"); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); + OSMO_ASSERT(osmo_tdef_set(the_pcu->T_defs, -2030, 0, OSMO_TDEF_S) == 0); test_reserve_multiple(); test_fn_wrap_around(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8d44318b37b6605afd84db8ccec0d75e6db293b9 Gerrit-Change-Number: 32390 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023