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

Change in osmo-remsim[master]: Install + package remsim-apitool as separate sub-package

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28563 ) Change subject: Install + package remsim-apitool as separate sub-package ...................................................................... Install + package remsim-apitool as separate sub-package As the script depends on python3, let's put it into a new osmo-remsim-apitool package. Closes: OS#5612 Change-Id: I11d779f66833b5294ffeb422ce6b2a705719a899 --- M contrib/Makefile.am R contrib/osmo-remsim-apitool M contrib/osmo-remsim.spec.in M debian/control A debian/osmo-remsim-apitool.install 5 files changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/63/28563/1 diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 17f56ed..3db49a4 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = etc_default systemd -EXTRA_DIST = remsim-apitool.py owhw-event-script.sh +EXTRA_DIST = owhw-event-script.sh + +bin_SCRIPTS = osmo-remsim-apitool diff --git a/contrib/remsim-apitool.py b/contrib/osmo-remsim-apitool similarity index 100% rename from contrib/remsim-apitool.py rename to contrib/osmo-remsim-apitool diff --git a/contrib/osmo-remsim.spec.in b/contrib/osmo-remsim.spec.in index 3097b8f..150a8ec 100644 --- a/contrib/osmo-remsim.spec.in +++ b/contrib/osmo-remsim.spec.in @@ -95,6 +95,17 @@ it maintains a list of clients + bankds connected to it, as well as the dynamic SIM card mappings between them. +%package -n osmo-remsim-apitool +Summary: Osmocom Remote SIM - API tool for Server +License: GPL-2.0-or-later +Group: Productivity/Telephony/Servers +Requires: python3 + +%description -n osmo-remsim-apitool +This is a small python tool for generating API requests to remsim-server, +which can be used by the system administrator to introspect and/or modify +the state (mostly slotmaps). + %package -n osmo-remsim-bankd Summary: Osmocom Remote SIM - Bank Daemon License: GPL-2.0-or-later @@ -191,6 +202,9 @@ %{_bindir}/osmo-remsim-server %{_unitdir}/osmo-remsim-server.service +%files -n osmo-remsim-server +%{_bindir}/osmo-remsim-apitool + %files -n osmo-remsim-bankd %{_bindir}/osmo-remsim-bankd %{_unitdir}/osmo-remsim-bankd.service diff --git a/debian/control b/debian/control index 7a847b8..4fdba3c 100644 --- a/debian/control +++ b/debian/control @@ -51,6 +51,15 @@ it maintains a list of clients + bankds connected to it, as well as the dynamic SIM card mappings between them. +Package: osmo-remsim-apitool +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends}, python3 +Description: Osmocom Remote SIM - API tool for server + This is a small python tool for generating API requests to remsim-server, + which can be used by the system administrator to introspect and/or modify + the state (mostly slotmaps). + Package: osmo-remsim-bankd Architecture: any Multi-Arch: same diff --git a/debian/osmo-remsim-apitool.install b/debian/osmo-remsim-apitool.install new file mode 100644 index 0000000..fd47f34 --- /dev/null +++ b/debian/osmo-remsim-apitool.install @@ -0,0 +1 @@ +usr/bin/osmo-remsim-apitool -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I11d779f66833b5294ffeb422ce6b2a705719a899 Gerrit-Change-Number: 28563 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-remsim[master]: main_fsm: Log bankd config (ip/port/bank_id/slot_nr) + disconnect

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28562 ) Change subject: main_fsm: Log bankd config (ip/port/bank_id/slot_nr) + disconnect ...................................................................... main_fsm: Log bankd config (ip/port/bank_id/slot_nr) + disconnect Closes: OS#6513 Change-Id: I30a814ba95eb9c545220a1513805f41ccb5acb42 --- M src/client/main_fsm.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/62/28562/1 diff --git a/src/client/main_fsm.c b/src/client/main_fsm.c index 0aa7429..be3238f 100644 --- a/src/client/main_fsm.c +++ b/src/client/main_fsm.c @@ -233,6 +233,7 @@ switch (event) { case MF_E_BANKD_LOST: + LOGPFSML(fi, LOGL_ERROR, "Connection to bankd lost\n"); osmo_fsm_inst_state_chg(fi, MF_ST_WAIT_BANKD, 0, 0); break; case MF_E_SRVC_CONFIG_BANK: @@ -244,6 +245,8 @@ rspro_IpAddr2str(&pdu_rx->msg.choice.configClientBankReq.bankd.ip)); bc->bankd_conn.server_port = pdu_rx->msg.choice.configClientBankReq.bankd.port; rspro2bank_slot(&bc->bankd_slot, &pdu_rx->msg.choice.configClientBankReq.bankSlot); + LOGPFSML(fi, LOGL_INFO, "Rx configClientBankReq(%s:%u / B%u:%u)\n", bc->bankd_conn.server_host, + bc->bankd_conn.server_port, bc->bankd_slot.bank_id, bc->bankd_slot.slot_nr); /* bankd port 0 is a magic value to indicate "no bankd" */ if (bc->bankd_conn.server_port == 0) osmo_fsm_inst_state_chg(fi, MF_ST_UNCONFIGURED, 0, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I30a814ba95eb9c545220a1513805f41ccb5acb42 Gerrit-Change-Number: 28562 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-remsim[master]: bankd: log BankID:SlotNr in every log line

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28561 ) Change subject: bankd: log BankID:SlotNr in every log line ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I84879609781a301338dacde7ff495632e3af08b9 Gerrit-Change-Number: 28561 Gerrit-PatchSet: 1 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-Comment-Date: Mon, 11 Jul 2022 20:27:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-remsim[master]: bankd: log BankID:SlotNr in every log line

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28561 ) Change subject: bankd: log BankID:SlotNr in every log line ...................................................................... bankd: log BankID:SlotNr in every log line It's relatively inconvenient having to mentally map the slot-number to a thread-id on every (re)connect to correlate the logs. The logs should contain the Bank/Slot number they relate to. Closes: OS#5611 Change-Id: I84879609781a301338dacde7ff495632e3af08b9 --- M src/bankd/bankd.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/61/28561/1 diff --git a/src/bankd/bankd.h b/src/bankd/bankd.h index c007802..9bf9bc9 100644 --- a/src/bankd/bankd.h +++ b/src/bankd/bankd.h @@ -20,7 +20,7 @@ extern struct value_string worker_state_names[]; #define LOGW(w, fmt, args...) \ - LOGP(DBANKDW, LOGL_INFO, "[%03u %s] " fmt, (w)->num, get_value_string(worker_state_names, (w)->state), \ + LOGP(DBANKDW, LOGL_INFO, "[%03u B%u:%u %s] " fmt, (w)->num, (w)->slot.bank_id, (w)->slot.slot_nr, get_value_string(worker_state_names, (w)->state), \ ## args) struct bankd; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I84879609781a301338dacde7ff495632e3af08b9 Gerrit-Change-Number: 28561 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: return prim pointer from l1sched_prim_alloc()

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28549 ) Change subject: trxcon: return prim pointer from l1sched_prim_alloc() ...................................................................... Patch Set 4: (1 comment) Patchset: PS3: > well an _init() function is expected to initialize something that was provided by the caller. […] Renamed the function in a separate change: https://gerrit.osmocom.org/c/osmocom-bb/+/28560/1, this way it should be cleaner. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0fa41cf55e90d191d032bca1754941cca763b03e Gerrit-Change-Number: 28549 Gerrit-PatchSet: 4 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: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 11 Jul 2022 20:05:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rename l1sched_prim_init() to l1sched_prim_alloc()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28560 ) Change subject: trxcon: rename l1sched_prim_init() to l1sched_prim_alloc() ...................................................................... trxcon: rename l1sched_prim_init() to l1sched_prim_alloc() The current function name is confusing, because l1sched_prim_init() is not only initializing a primitive, but also allocating it on heap. Let's use '_alloc' instead of '_init' to reflect that. Change-Id: Ie1bebb6829ba9f640455685fcd7309b6aa442ef0 Related: OS#5599, OS#3761 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_prim.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/28560/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h index d8f51a5..b1eee39 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h @@ -358,7 +358,7 @@ enum l1sched_lchan_type chan); /* Primitive management functions */ -int l1sched_prim_init(void *ctx, struct l1sched_ts_prim **prim, +int l1sched_prim_alloc(void *ctx, struct l1sched_ts_prim **prim, size_t pl_len, uint8_t chan_nr, uint8_t link_id); int l1sched_prim_push(struct trx_instance *trx, struct l1sched_ts_prim *prim, uint8_t chan_nr); diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 980ac49..0d5bcb9 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -541,7 +541,7 @@ } /* Init a new primitive */ - rc = l1sched_prim_init(l1l->trx, &prim, len, ul->chan_nr, ul->link_id); + rc = l1sched_prim_alloc(l1l->trx, &prim, len, ul->chan_nr, ul->link_id); if (rc) goto exit; @@ -724,7 +724,7 @@ chan_nr, link_id, payload_len); /* Init a new primitive */ - rc = l1sched_prim_init(l1l->trx, &prim, payload_len, + rc = l1sched_prim_alloc(l1l->trx, &prim, payload_len, chan_nr, link_id); if (rc) goto exit; diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 64517f5..bf36e7a 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -44,7 +44,7 @@ * @param link_id RSL link description (used to set a proper chan) * @return zero in case of success, otherwise a error number */ -int l1sched_prim_init(void *ctx, struct l1sched_ts_prim **prim, +int l1sched_prim_alloc(void *ctx, struct l1sched_ts_prim **prim, size_t pl_len, uint8_t chan_nr, uint8_t link_id) { enum l1sched_lchan_type lchan_type; @@ -161,7 +161,7 @@ }; /* Allocate a new primitive */ - rc = l1sched_prim_init(lchan, &prim, GSM_MACBLOCK_LEN, + rc = l1sched_prim_alloc(lchan, &prim, GSM_MACBLOCK_LEN, l1sched_lchan_desc[lchan->type].chan_nr, L1SCHED_CH_LID_SACCH); OSMO_ASSERT(rc == 0); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1bebb6829ba9f640455685fcd7309b6aa442ef0 Gerrit-Change-Number: 28560 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: return prim pointer from l1sched_prim_alloc()

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28549 to look at the new patch set (#4). Change subject: trxcon: return prim pointer from l1sched_prim_alloc() ...................................................................... trxcon: return prim pointer from l1sched_prim_alloc() Returning prim pointer is more convinient from the API point of view. Change-Id: I0fa41cf55e90d191d032bca1754941cca763b03e Related: OS#5599, OS#3761 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_prim.c 3 files changed, 27 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/49/28549/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0fa41cf55e90d191d032bca1754941cca763b03e Gerrit-Change-Number: 28549 Gerrit-PatchSet: 4 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-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: allocate a prim in l1sched_prim_push()

by fixeria

Attention is currently required from: laforge. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28551 to look at the new patch set (#4). Change subject: trxcon: allocate a prim in l1sched_prim_push() ...................................................................... trxcon: allocate a prim in l1sched_prim_push() Make l1sched_prim_alloc() private and call it from l1sched_prim_push(). This makes the API more convinient, because both functions are always used together. Change-Id: Ia9c0170fb06efcef569e987b57ab9ab7f7c7e847 Related: OS#5599, OS#3761 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_prim.c 3 files changed, 29 insertions(+), 52 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/51/28551/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9c0170fb06efcef569e987b57ab9ab7f7c7e847 Gerrit-Change-Number: 28551 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: fix uint8_t used for length in l1sched_prim_alloc()

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28550 to look at the new patch set (#4). Change subject: trxcon: fix uint8_t used for length in l1sched_prim_alloc() ...................................................................... trxcon: fix uint8_t used for length in l1sched_prim_alloc() Using uint8_t makes it impossible to allocate primitives with payload of size 255 - sizeof(struct l1sched_ts_prim) and greater. Change-Id: Ic19b8433118798f57500119f1caf10e117e5db19 Related: OS#5599, OS#3761 --- M src/host/trxcon/src/sched_prim.c 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/50/28550/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic19b8433118798f57500119f1caf10e117e5db19 Gerrit-Change-Number: 28550 Gerrit-PatchSet: 4 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-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: use abstract API for RACH primitives

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28552 to look at the new patch set (#4). Change subject: trxcon: use abstract API for RACH primitives ...................................................................... trxcon: use abstract API for RACH primitives Using L1CTL specific structures as the primitive payload was a beautiful hack in the early days of trxcon. But since we're going to separate the scheduler into an interface independent library, we have to introduce and use an abstract API. Change-Id: I84597d44ea7d74b8840a919ecb09988ba1980a73 Related: OS#5599, OS#3761 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_lchan_rach.c M src/host/trxcon/src/sched_prim.c 4 files changed, 78 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/52/28552/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I84597d44ea7d74b8840a919ecb09988ba1980a73 Gerrit-Change-Number: 28552 Gerrit-PatchSet: 4 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-MessageType: newpatchset

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022