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

Change in osmocom-bb[master]: trxcon: remove unused #imports in sched_clck.c
by fixeria 22 Jul '22

22 Jul '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28726 ) Change subject: trxcon: remove unused #imports in sched_clck.c ...................................................................... trxcon: remove unused #imports in sched_clck.c Change-Id: I41e08c2a970334f87fa9fca8d21a55295b9eddc5 --- M src/host/trxcon/src/sched_clck.c 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/src/sched_clck.c b/src/host/trxcon/src/sched_clck.c index 9c77382..7ac83e2 100644 --- a/src/host/trxcon/src/sched_clck.c +++ b/src/host/trxcon/src/sched_clck.c @@ -32,15 +32,11 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/bits.h> -#include <osmocom/core/fsm.h> #include <osmocom/core/timer.h> #include <osmocom/core/timer_compat.h> -#include <osmocom/gsm/a5.h> #include <osmocom/bb/trxcon/l1sched.h> #include <osmocom/bb/trxcon/logging.h> -#include <osmocom/bb/trxcon/trx_if.h> #define MAX_FN_SKEW 50 #define TRX_LOSS_FRAMES 400 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I41e08c2a970334f87fa9fca8d21a55295b9eddc5 Gerrit-Change-Number: 28726 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-MessageType: merged

1 0

Change in osmocom-bb[master]: trxcon: call osmo_timer_del() unconditionally
by fixeria 22 Jul '22

22 Jul '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28719 ) Change subject: trxcon: call osmo_timer_del() unconditionally ...................................................................... trxcon: call osmo_timer_del() unconditionally osmo_timer_del() does check if a timer is active internally. Change-Id: I4ede5b19eeb847fe8fdaed52a8b5c801b3de209a --- M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c 3 files changed, 3 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 66ddac1..f8faa97 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -186,8 +186,7 @@ trxcon->fbsb_conf_sent = true; /* Abort FBSB expire timer */ - if (osmo_timer_pending(&trxcon->fbsb_timer)) - osmo_timer_del(&trxcon->fbsb_timer); + osmo_timer_del(&trxcon->fbsb_timer); return l1ctl_client_send(l1c, msg); } diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index f627de8..dd679f2 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -504,8 +504,7 @@ LOGPFSML(trx->fi, LOGL_INFO, "Response message: '%s'\n", buf); /* Abort expire timer */ - if (osmo_timer_pending(&trx->trx_ctrl_timer)) - osmo_timer_del(&trx->trx_ctrl_timer); + osmo_timer_del(&trx->trx_ctrl_timer); /* Get command for response message */ if (llist_empty(&trx->trx_ctrl_list)) { diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 77f481a..9f672e8 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -364,8 +364,7 @@ if (trxcon->trx != NULL) trx_if_close(trxcon->trx); - if (osmo_timer_pending(&trxcon->fbsb_timer)) - osmo_timer_del(&trxcon->fbsb_timer); + osmo_timer_del(&trxcon->fbsb_timer); if (trxcon->fi != NULL) osmo_fsm_inst_free(trxcon->fi); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4ede5b19eeb847fe8fdaed52a8b5c801b3de209a Gerrit-Change-Number: 28719 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-MessageType: merged

1 0

Change in docker-playground[master]: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format
by pespin 22 Jul '22

22 Jul '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28733 ) Change subject: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format ...................................................................... ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format Requires: osmo-cbc.git Change-Id I47756dddd8f9b8450ba14c914614fd2391d5486e Change-Id: I3654acdf4b68886133af7f418726903f3fee57eb --- M ttcn3-cbc-test/osmo-cbc.cfg 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/33/28733/1 diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg index 4332812..0e131c0 100644 --- a/ttcn3-cbc-test/osmo-cbc.cfg +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -31,11 +31,9 @@ sbcap local-ip 172.18.27.20 local-port 29168 - peer ttcn3-bsc - protocol cbsp + peer cbsp ttcn3-bsc remote-port 9999 remote-ip 172.18.27.100 - peer ttcn3-mme - protocol sbcap + peer sbcap ttcn3-mme remote-port 9998 remote-ip 172.18.27.100 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3654acdf4b68886133af7f418726903f3fee57eb Gerrit-Change-Number: 28733 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-cbc[master]: cbc_main: Fix setting default SBc-AP local address
by pespin 22 Jul '22

22 Jul '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28731 ) Change subject: cbc_main: Fix setting default SBc-AP local address ...................................................................... cbc_main: Fix setting default SBc-AP local address The issue was not spotted until now because until recently cbc_vty_go_parent was not called due to another bug. Change-Id: I697597438d8c45f5956b12e2a6ea76413e945e5e --- M src/cbc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/cbc_main.c b/src/cbc_main.c index a670722..cd80e31 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -88,7 +88,7 @@ switch (vty->node) { case SBcAP_NODE: /* If no local addr set, add a default one: */ - if (g_cbc->config.sbcap.num_local_host) { + if (g_cbc->config.sbcap.num_local_host == 0) { g_cbc->config.sbcap.local_host[0] = talloc_strdup(g_cbc, "127.0.0.1"); g_cbc->config.sbcap.num_local_host = 1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I697597438d8c45f5956b12e2a6ea76413e945e5e Gerrit-Change-Number: 28731 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-cbc[master]: cbc_main: Fix setting default SBc-AP local address
by pespin 22 Jul '22

22 Jul '22

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28731 ) Change subject: cbc_main: Fix setting default SBc-AP local address ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I697597438d8c45f5956b12e2a6ea76413e945e5e Gerrit-Change-Number: 28731 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 12:26:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: Introduce APDU/TPDU trace decoder
by laforge 22 Jul '22

22 Jul '22

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/28725 to look at the new patch set (#4). Change subject: Introduce APDU/TPDU trace decoder ...................................................................... Introduce APDU/TPDU trace decoder This introduces a new pySim.apdu module hierarchy, which contains classes that represent TPDU/APDUs as exchanged between SIM/UICC/USIM/ISIM card and UE. It contains instruction level decoders for SELECT, READ BINARY and friends, and then uses the pySim.filesystem.Runtime{Lchan,State} classes to keep track of the currently selected EF/DF/ADF for each logical channel, and uses the file-specific decoder classes of pySim to decode the actual file content that is being read or written. This provides a much more meaningful decode of protocol traces than wireshark will ever be able to give us. Furthermore, there's the new pySim.apdu_source set of classes which provides "input plugins" for obtaining APDU traces in a variety of formats. So far, GSMTAP UDP live capture and pyshark based RSPRO live and pcap file reading are imlpemented. Change-Id: I862d93163d495a294364168f7818641e47b18c0a Closes: OS#5126 --- M README.md M contrib/jenkins.sh A pySim-trace.py A pySim/apdu/__init__.py A pySim/apdu/global_platform.py A pySim/apdu/ts_102_221.py A pySim/apdu/ts_31_102.py A pySim/apdu_source/__init__.py A pySim/apdu_source/gsmtap.py A pySim/apdu_source/pyshark_rspro.py A pySim/gsmtap.py M pySim/ts_31_102.py M requirements.txt M setup.py A tests/test_apdu.py 15 files changed, 1,855 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/25/28725/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I862d93163d495a294364168f7818641e47b18c0a Gerrit-Change-Number: 28725 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

Change in osmo-upf[master]: add osmo-pfcp-tool
by laforge 22 Jul '22

22 Jul '22

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28310 ) Change subject: add osmo-pfcp-tool ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > commitlog needs at least a paragraph of description about the tool. still nothing in the commit message. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I34a80d43a14c7b68952c7d337d8042d6f28ceae7 Gerrit-Change-Number: 28310 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 12:19:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: gb/gprs_ns: call osmo_timer_del() unconditionally
by laforge 22 Jul '22

22 Jul '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28720 ) Change subject: gb/gprs_ns: call osmo_timer_del() unconditionally ...................................................................... gb/gprs_ns: call osmo_timer_del() unconditionally osmo_timer_del() does check if a timer is active internally. Change-Id: I3fdfcde33bc6f8a88680ad3f1dde2b6ff8846020 --- M src/gb/gprs_ns.c 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 9f5df8f..e250eda 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -352,8 +352,7 @@ */ void gprs_nsvc_delete(struct gprs_nsvc *nsvc) { - if (osmo_timer_pending(&nsvc->timer)) - osmo_timer_del(&nsvc->timer); + osmo_timer_del(&nsvc->timer); llist_del(&nsvc->list); rate_ctr_group_free(nsvc->ctrg); osmo_stat_item_group_free(nsvc->statg); @@ -750,8 +749,7 @@ nsvc->nsei, get_value_string(timer_mode_strs, mode), seconds); - if (osmo_timer_pending(&nsvc->timer)) - osmo_timer_del(&nsvc->timer); + osmo_timer_del(&nsvc->timer); osmo_gettimeofday(&nsvc->timer_started, NULL); nsvc->timer_mode = mode; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3fdfcde33bc6f8a88680ad3f1dde2b6ff8846020 Gerrit-Change-Number: 28720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in libosmocore[master]: gb/gprs_ns: call osmo_timer_del() unconditionally
by laforge 22 Jul '22

22 Jul '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28720 ) Change subject: gb/gprs_ns: call osmo_timer_del() unconditionally ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3fdfcde33bc6f8a88680ad3f1dde2b6ff8846020 Gerrit-Change-Number: 28720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 12:18:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: call osmo_timer_del() unconditionally, without osmo_timer_pending()
by laforge 22 Jul '22

22 Jul '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28722 ) Change subject: call osmo_timer_del() unconditionally, without osmo_timer_pending() ...................................................................... call osmo_timer_del() unconditionally, without osmo_timer_pending() osmo_timer_del() does check if a timer is active internally. Change-Id: I3e42a74d59b8e8d0d46cc4027676149689cc18a3 --- M src/osmo-bsc/acc.c M tests/acc/acc_test.c M tests/gsm0408/gsm0408_test.c 3 files changed, 6 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c index 1f23107..80a3576 100644 --- a/src/osmo-bsc/acc.c +++ b/src/osmo-bsc/acc.c @@ -73,9 +73,8 @@ if (!osmo_timer_pending(&acc_mgr->rotate_timer)) osmo_timer_schedule(&acc_mgr->rotate_timer, acc_mgr->rotation_time_sec, 0); } else { - /* No rotation needed, disable rotation timer */ - if (osmo_timer_pending(&acc_mgr->rotate_timer)) - osmo_timer_del(&acc_mgr->rotate_timer); + /* No rotation needed, disable rotation timer (if pending) */ + osmo_timer_del(&acc_mgr->rotate_timer); } } @@ -565,8 +564,7 @@ */ void acc_ramp_abort(struct acc_ramp *acc_ramp) { - if (osmo_timer_pending(&acc_ramp->step_timer)) - osmo_timer_del(&acc_ramp->step_timer); + osmo_timer_del(&acc_ramp->step_timer); acc_mgr_set_len_allowed_ramp(&acc_ramp->bts->acc_mgr, 10); } diff --git a/tests/acc/acc_test.c b/tests/acc/acc_test.c index ce3b0cb..887e891 100644 --- a/tests/acc/acc_test.c +++ b/tests/acc/acc_test.c @@ -58,10 +58,8 @@ #define bts_del(bts) _bts_del(bts, __func__) static inline void _bts_del(struct gsm_bts *bts, const char *msg) { - if (osmo_timer_pending(&bts->acc_mgr.rotate_timer)) - osmo_timer_del(&bts->acc_mgr.rotate_timer); - if (osmo_timer_pending(&bts->acc_ramp.step_timer)) - osmo_timer_del(&bts->acc_ramp.step_timer); + osmo_timer_del(&bts->acc_mgr.rotate_timer); + osmo_timer_del(&bts->acc_ramp.step_timer); /* no need to llist_del(&bts->list), we never registered the bts there. */ talloc_free(bts->site_mgr); fprintf(stderr, "BTS deallocated OK in %s()\n", msg); diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 03b2ee1..999ee80 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -137,8 +137,7 @@ #define bts_del(bts) _bts_del(bts, __func__) static inline void _bts_del(struct gsm_bts *bts, const char *msg) { - if (osmo_timer_pending(&bts->acc_mgr.rotate_timer)) - osmo_timer_del(&bts->acc_mgr.rotate_timer); + osmo_timer_del(&bts->acc_mgr.rotate_timer); /* no need to llist_del(&bts->list), we never registered the bts there. */ talloc_free(bts->site_mgr); printf("BTS deallocated OK in %s()\n", msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3e42a74d59b8e8d0d46cc4027676149689cc18a3 Gerrit-Change-Number: 28722 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2025

2024

2023

2022

gerrit-log July 2022