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

Change in osmocom-bb[master]: layer23: mobile: Several fixes and improvements in show_ms_cmd

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30969 ) Change subject: layer23: mobile: Several fixes and improvements in show_ms_cmd ...................................................................... layer23: mobile: Several fixes and improvements in show_ms_cmd Fix missing VTY param description. Fix wrong indentation. Fix unneeded else after early return. Change-Id: I4a55328e71ec16355974c20275c0e525077252e1 --- M src/host/layer23/src/mobile/vty_interface.c 1 file changed, 8 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 943ebd9..6fc7f5b 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -242,7 +242,8 @@ DEFUN(show_ms, show_ms_cmd, "show ms [MS_NAME]", - SHOW_STR "Display available MS entities\n") + SHOW_STR "Display available MS entities\n" + "Display specific MS with given name") { struct osmocom_ms *ms; @@ -254,13 +255,13 @@ } } vty_out(vty, "MS name '%s' does not exits.%s", argv[0], - VTY_NEWLINE); + VTY_NEWLINE); return CMD_WARNING; - } else { - llist_for_each_entry(ms, &ms_list, entity) { - gsm_ms_dump(ms, vty); - vty_out(vty, "%s", VTY_NEWLINE); - } + } + + llist_for_each_entry(ms, &ms_list, entity) { + gsm_ms_dump(ms, vty); + vty_out(vty, "%s", VTY_NEWLINE); } return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4a55328e71ec16355974c20275c0e525077252e1 Gerrit-Change-Number: 30969 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Move support.{c,h} under common/

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30973 ) Change subject: layer23: Move support.{c,h} under common/ ...................................................................... layer23: Move support.{c,h} under common/ Some of those can be reused by other apps (like modem). Change-Id: I3c5af4db8e603aa004d0b6410b09b5143173b874 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am M src/host/layer23/include/osmocom/bb/common/ms.h R src/host/layer23/include/osmocom/bb/common/support.h M src/host/layer23/include/osmocom/bb/mobile/Makefile.am M src/host/layer23/src/common/Makefile.am R src/host/layer23/src/common/support.c M src/host/layer23/src/mobile/Makefile.am 7 files changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve neels: Looks good to me, but someone else must approve diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index c756b8e..54799be 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -13,5 +13,6 @@ sap_fsm.h \ sap_interface.h \ sim.h \ + support.h \ vty.h \ $(NULL) diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index bbb5491..3a16293 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -6,10 +6,10 @@ #include <osmocom/core/write_queue.h> /* FIXME no 'mobile' specific stuff should be here */ -#include <osmocom/bb/mobile/support.h> #include <osmocom/bb/mobile/settings.h> #include <osmocom/bb/mobile/subscriber.h> #include <osmocom/gsm/lapdm.h> +#include <osmocom/bb/common/support.h> #include <osmocom/bb/common/sap_interface.h> #include <osmocom/bb/common/sap_proto.h> #include <osmocom/bb/mobile/gsm48_rr.h> diff --git a/src/host/layer23/include/osmocom/bb/mobile/support.h b/src/host/layer23/include/osmocom/bb/common/support.h similarity index 99% rename from src/host/layer23/include/osmocom/bb/mobile/support.h rename to src/host/layer23/include/osmocom/bb/common/support.h index c56c78e..2fae57e 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/support.h +++ b/src/host/layer23/include/osmocom/bb/common/support.h @@ -110,7 +110,7 @@ uint16_t start; uint16_t end; uint16_t max; - uint16_t temp; + uint16_t temp; }; extern struct gsm_support_scan_max gsm_sup_smax[]; diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index 978a701..e18b2bd 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am @@ -1,4 +1,4 @@ noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \ - gsm48_rr.h mncc.h settings.h subscriber.h support.h \ + gsm48_rr.h mncc.h settings.h subscriber.h \ transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h \ app_mobile.h voice.h gapk_io.h diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index 7d27eb1..36342df 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -24,6 +24,7 @@ sap_proto.c \ sap_interface.c \ sim.c \ + support.c \ sysinfo.c \ utils.c \ vty.c \ diff --git a/src/host/layer23/src/mobile/support.c b/src/host/layer23/src/common/support.c similarity index 100% rename from src/host/layer23/src/mobile/support.c rename to src/host/layer23/src/common/support.c diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index a83e082..9ee0b72 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -29,7 +29,6 @@ primitives.c \ settings.c \ subscriber.c \ - support.c \ transaction.c \ vty_interface.c \ voice.c \ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3c5af4db8e603aa004d0b6410b09b5143173b874 Gerrit-Change-Number: 30973 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Move subscriber.{c,h} under common/

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30974 ) Change subject: layer23: Move subscriber.{c,h} under common/ ...................................................................... layer23: Move subscriber.{c,h} under common/ Some of those can be reused by other apps (like modem). Change-Id: I3727e40bcc9a4ee93aaf2c4ced070cc789653e80 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am M src/host/layer23/include/osmocom/bb/common/ms.h R src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/include/osmocom/bb/mobile/Makefile.am M src/host/layer23/src/common/Makefile.am R src/host/layer23/src/common/subscriber.c M src/host/layer23/src/mobile/Makefile.am M src/host/layer23/src/mobile/gsm48_mm.c 8 files changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve neels: Looks good to me, but someone else must approve diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index 54799be..f09353b 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -13,6 +13,7 @@ sap_fsm.h \ sap_interface.h \ sim.h \ + subscriber.h \ support.h \ vty.h \ $(NULL) diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index 3a16293..db6b276 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -7,8 +7,8 @@ /* FIXME no 'mobile' specific stuff should be here */ #include <osmocom/bb/mobile/settings.h> -#include <osmocom/bb/mobile/subscriber.h> #include <osmocom/gsm/lapdm.h> +#include <osmocom/bb/common/subscriber.h> #include <osmocom/bb/common/support.h> #include <osmocom/bb/common/sap_interface.h> #include <osmocom/bb/common/sap_proto.h> diff --git a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h similarity index 100% rename from src/host/layer23/include/osmocom/bb/mobile/subscriber.h rename to src/host/layer23/include/osmocom/bb/common/subscriber.h diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index e18b2bd..6d9950b 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am @@ -1,4 +1,4 @@ noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \ - gsm48_rr.h mncc.h settings.h subscriber.h \ + gsm48_rr.h mncc.h settings.h \ transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h \ app_mobile.h voice.h gapk_io.h diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index 36342df..4dfa1f3 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -24,6 +24,7 @@ sap_proto.c \ sap_interface.c \ sim.c \ + subscriber.c \ support.c \ sysinfo.c \ utils.c \ diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/common/subscriber.c similarity index 99% rename from src/host/layer23/src/mobile/subscriber.c rename to src/host/layer23/src/common/subscriber.c index 164622a..89cacb7 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -28,8 +28,8 @@ #include <osmocom/bb/common/sap_interface.h> #include <osmocom/bb/common/sap_proto.h> #include <osmocom/bb/common/networks.h> +#include <osmocom/bb/common/subscriber.h> #include <osmocom/bb/mobile/vty.h> -#include <osmocom/bb/mobile/subscriber.h> /* enable to get an empty list of forbidden PLMNs, even if stored on SIM. * if list is changed, the result is not written back to SIM */ diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index 9ee0b72..dedee5f 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -28,7 +28,6 @@ mncc_sock.c \ primitives.c \ settings.c \ - subscriber.c \ transaction.c \ vty_interface.c \ voice.c \ diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 500eff6..60be569 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -34,6 +34,7 @@ #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/utils.h> +#include <osmocom/bb/common/subscriber.h> #include <osmocom/bb/mobile/gsm48_cc.h> #include <osmocom/bb/mobile/gsm480_ss.h> #include <osmocom/bb/mobile/gsm411_sms.h> @@ -42,7 +43,6 @@ #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/gsm48_rr.h> #include <osmocom/bb/mobile/gsm322.h> -#include <osmocom/bb/mobile/subscriber.h> extern void *l23_ctx; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3727e40bcc9a4ee93aaf2c4ced070cc789653e80 Gerrit-Change-Number: 30974 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Initial VTY framework to share VTY code between apps

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30961 ) Change subject: layer23: Initial VTY framework to share VTY code between apps ...................................................................... layer23: Initial VTY framework to share VTY code between apps A small layer23 framework is added which allows apps to easily share/reuse VTY commands while giving some flexiblity to add new per-app specific configs/cmds, since not all commands may be relevant for all apps. Some of the mobile app code is moved to common, and sample infra is added to modem app. Future commits will most probably keep moving more stuff mobile->common and then reusing those in modem app, as found needed. Change-Id: Iabfb3129199488d790b89884bc1e424f2aca696f --- M src/host/layer23/include/osmocom/bb/common/Makefile.am A src/host/layer23/include/osmocom/bb/common/vty.h M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/include/osmocom/bb/modem/Makefile.am A src/host/layer23/include/osmocom/bb/modem/vty.h M src/host/layer23/src/common/Makefile.am A src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/vty_interface.c M src/host/layer23/src/modem/Makefile.am M src/host/layer23/src/modem/app_modem.c A src/host/layer23/src/modem/vty.c 12 files changed, 311 insertions(+), 91 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index 8663d9c..c756b8e 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -13,4 +13,5 @@ sap_fsm.h \ sap_interface.h \ sim.h \ + vty.h \ $(NULL) diff --git a/src/host/layer23/include/osmocom/bb/common/vty.h b/src/host/layer23/include/osmocom/bb/common/vty.h new file mode 100644 index 0000000..dd5e7f2 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/common/vty.h @@ -0,0 +1,25 @@ +#pragma once + +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/vty/vty.h> +#include <osmocom/vty/buffer.h> +#include <osmocom/vty/command.h> + +struct osmocom_ms; + +enum l23_vty_node { + MS_NODE = _LAST_OSMOVTY_NODE + 1, + _LAST_L23VTY_NODE, +}; + +int l23_vty_init(int (*config_write_ms_node_cb)(struct vty *)); + +struct osmocom_ms *l23_vty_get_ms(const char *name, struct vty *vty); +void l23_ms_dump(struct osmocom_ms *ms, struct vty *vty); +void l23_vty_config_write_ms_node(struct vty *vty, const struct osmocom_ms *ms, const char *prefix); +void l23_vty_config_write_ms_node_contents(struct vty *vty, const struct osmocom_ms *ms, const char *prefix); + +extern struct llist_head ms_list; + +extern struct cmd_element l23_show_ms_cmd; +extern struct cmd_element l23_cfg_ms_cmd; diff --git a/src/host/layer23/include/osmocom/bb/mobile/vty.h b/src/host/layer23/include/osmocom/bb/mobile/vty.h index d066804..6bd1b37 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/vty.h +++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h @@ -6,14 +6,14 @@ #include <osmocom/vty/buffer.h> #include <osmocom/vty/command.h> +#include <osmocom/bb/common/vty.h> + enum ms_vty_node { - MS_NODE = _LAST_OSMOVTY_NODE + 1, - TESTSIM_NODE, + TESTSIM_NODE = _LAST_L23VTY_NODE + 1, SUPPORT_NODE, AUDIO_NODE, }; -int ms_vty_go_parent(struct vty *vty); int ms_vty_init(void); extern void vty_notify(struct osmocom_ms *ms, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); diff --git a/src/host/layer23/include/osmocom/bb/modem/Makefile.am b/src/host/layer23/include/osmocom/bb/modem/Makefile.am index d99240d..309a514 100644 --- a/src/host/layer23/include/osmocom/bb/modem/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/modem/Makefile.am @@ -1 +1,4 @@ -noinst_HEADERS = modem.h +noinst_HEADERS = \ + modem.h \ + vty.h \ + $(NULL) diff --git a/src/host/layer23/include/osmocom/bb/modem/vty.h b/src/host/layer23/include/osmocom/bb/modem/vty.h new file mode 100644 index 0000000..14ec624 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/modem/vty.h @@ -0,0 +1,3 @@ +#pragma once + +int modem_vty_init(void); diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index f6578ec..7d27eb1 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -26,4 +26,5 @@ sim.c \ sysinfo.c \ utils.c \ + vty.c \ $(NULL) diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c new file mode 100644 index 0000000..34d39b0 --- /dev/null +++ b/src/host/layer23/src/common/vty.c @@ -0,0 +1,182 @@ +/* + * (C) 2010 by Andreas Eversberg <jolly(a)eversberg.eu> + * (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <string.h> +#include <stdlib.h> +#include <stdarg.h> +#include <unistd.h> +#include <sys/types.h> + +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm48.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/signal.h> +#include <osmocom/crypt/auth.h> + +#include <osmocom/bb/common/vty.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> +#include <osmocom/bb/common/networks.h> +#include <osmocom/bb/common/gps.h> +#include <osmocom/bb/mobile/mncc.h> +#include <osmocom/bb/mobile/mncc_ms.h> +#include <osmocom/bb/mobile/transaction.h> +#include <osmocom/bb/mobile/vty.h> +#include <osmocom/bb/mobile/app_mobile.h> +#include <osmocom/bb/mobile/gsm480_ss.h> +#include <osmocom/bb/mobile/gsm411_sms.h> +#include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/misc.h> + +static struct cmd_node ms_node = { + MS_NODE, + "%s(ms)# ", + 1 +}; + +struct osmocom_ms *l23_vty_get_ms(const char *name, struct vty *vty) +{ + struct osmocom_ms *ms; + + llist_for_each_entry(ms, &ms_list, entity) { + if (!strcmp(ms->name, name)) { + if (ms->shutdown != MS_SHUTDOWN_NONE) { + vty_out(vty, "MS '%s' is admin down.%s", name, + VTY_NEWLINE); + return NULL; + } + return ms; + } + } + vty_out(vty, "MS name '%s' does not exist.%s", name, VTY_NEWLINE); + + return NULL; +} + +/* placeholder for layer23 shared MS info to be dumped */ +void l23_ms_dump(struct osmocom_ms *ms, struct vty *vty) +{ + char *service = ""; + + if (!ms->started) + service = ", radio is not started"; + else if (ms->mmlayer.state == GSM48_MM_ST_MM_IDLE) { + /* current MM idle state */ + switch (ms->mmlayer.substate) { + case GSM48_MM_SST_NORMAL_SERVICE: + case GSM48_MM_SST_PLMN_SEARCH_NORMAL: + service = ", service is normal"; + break; + case GSM48_MM_SST_LOC_UPD_NEEDED: + case GSM48_MM_SST_ATTEMPT_UPDATE: + service = ", service is limited (pending)"; + break; + case GSM48_MM_SST_NO_CELL_AVAIL: + service = ", service is unavailable"; + break; + default: + if (ms->subscr.sim_valid) + service = ", service is limited"; + else + service = ", service is limited " + "(IMSI detached)"; + break; + } + } else + service = ", MM connection active"; + + vty_out(vty, "MS '%s' is %s%s%s%s", ms->name, + (ms->shutdown != MS_SHUTDOWN_NONE) ? "administratively " : "", + (ms->shutdown != MS_SHUTDOWN_NONE || !ms->started) ? "down" : "up", + (ms->shutdown == MS_SHUTDOWN_NONE) ? service : "", + VTY_NEWLINE); +} + + +gDEFUN(l23_show_ms, l23_show_ms_cmd, "show ms [MS_NAME]", + SHOW_STR "Display available MS entities\n") +{ + struct osmocom_ms *ms; + + if (argc) { + llist_for_each_entry(ms, &ms_list, entity) { + if (!strcmp(ms->name, argv[0])) { + l23_ms_dump(ms, vty); + return CMD_SUCCESS; + } + } + vty_out(vty, "MS name '%s' does not exist.%s", argv[0], + VTY_NEWLINE); + return CMD_WARNING; + } + + llist_for_each_entry(ms, &ms_list, entity) { + l23_ms_dump(ms, vty); + vty_out(vty, "%s", VTY_NEWLINE); + } + + return CMD_SUCCESS; +} + +/* per MS config */ +gDEFUN(l23_cfg_ms, l23_cfg_ms_cmd, "ms MS_NAME", + "Select a mobile station to configure\nName of MS (see \"show ms\")") +{ + struct osmocom_ms *ms; + + llist_for_each_entry(ms, &ms_list, entity) { + if (!strcmp(ms->name, argv[0])) { + vty->index = ms; + vty->node = MS_NODE; + return CMD_SUCCESS; + } + } + + vty_out(vty, "MS name '%s' does not exits%s", argv[0], + VTY_NEWLINE); + return CMD_WARNING; +} + +void l23_vty_config_write_ms_node(struct vty *vty, const struct osmocom_ms *ms, const char *prefix) +{ + size_t prefix_len = strlen(prefix); + char *prefix_content = alloca(prefix_len + 1 + 1); + + memcpy(prefix_content, prefix, prefix_len); + prefix_content[prefix_len] = ' '; + prefix_content[prefix_len + 1] = '\0'; + + vty_out(vty, "%sms %s%s", prefix, ms->name, VTY_NEWLINE); + l23_vty_config_write_ms_node_contents(vty, ms, prefix_content); +} + +void l23_vty_config_write_ms_node_contents(struct vty *vty, const struct osmocom_ms *ms, const char *prefix) +{ + /* placeholder for shared VTY commands */ +} + +int l23_vty_init(int (*config_write_ms_node_cb)(struct vty *)) +{ + install_node(&ms_node, config_write_ms_node_cb); + + /* Register the talloc context introspection command */ + osmo_talloc_vty_add_cmds(); + + return 0; +} + diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index b2133f7..b4466de 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -446,7 +446,6 @@ static struct vty_app_info vty_info = { .name = "OsmocomBB", .version = PACKAGE_VERSION, - .go_parent_cb = ms_vty_go_parent, }; /* global init */ diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 6fc7f5b..39a64fd 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -41,15 +41,8 @@ #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/misc.h> -extern struct llist_head ms_list; extern struct llist_head active_connections; -struct cmd_node ms_node = { - MS_NODE, - "%s(ms)# ", - 1 -}; - struct cmd_node testsim_node = { TESTSIM_NODE, "%s(test-sim)# ", @@ -133,25 +126,6 @@ vty_restart(vty, ms); } -static struct osmocom_ms *get_ms(const char *name, struct vty *vty) -{ - struct osmocom_ms *ms; - - llist_for_each_entry(ms, &ms_list, entity) { - if (!strcmp(ms->name, name)) { - if (ms->shutdown != MS_SHUTDOWN_NONE) { - vty_out(vty, "MS '%s' is admin down.%s", name, - VTY_NEWLINE); - return NULL; - } - return ms; - } - } - vty_out(vty, "MS name '%s' does not exist.%s", name, VTY_NEWLINE); - - return NULL; -} - static void gsm_ms_dump(struct osmocom_ms *ms, struct vty *vty) { struct gsm_settings *set = &ms->settings; @@ -274,7 +248,7 @@ struct osmocom_ms *ms; if (argc) { - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; gsm_support_dump(ms, print_vty, vty); @@ -295,7 +269,7 @@ struct osmocom_ms *ms; if (argc) { - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; gsm_subscr_dump(&ms->subscr, print_vty, vty); @@ -317,7 +291,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -336,7 +310,7 @@ struct gsm48_sysinfo *s; uint16_t arfcn = atoi(argv[1]); - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -367,7 +341,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -384,7 +358,7 @@ struct osmocom_ms *ms; uint16_t mcc = 0, mnc = 0; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -412,7 +386,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -427,7 +401,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -441,7 +415,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -456,7 +430,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -475,7 +449,7 @@ uint16_t mcc = 0x001, mnc = 0x01f, lac = 0x0000; uint32_t tmsi = 0xffffffff; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -552,7 +526,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -574,7 +548,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -594,7 +568,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -617,7 +591,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -642,7 +616,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -662,7 +636,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -682,7 +656,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -706,7 +680,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -734,7 +708,7 @@ mnc = gsm_input_mnc((char *)argv[2]), lac = strtoul(argv[3], NULL, 16); - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -772,7 +746,7 @@ mnc = gsm_input_mnc((char *)argv[2]); int found = 0; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; plmn = &ms->plmn; @@ -826,7 +800,7 @@ struct gsm_settings_abbrev *abbrev; char *number; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; set = &ms->settings; @@ -869,7 +843,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -885,7 +859,7 @@ struct osmocom_ms *ms; struct gsm_settings *set; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; set = &ms->settings; @@ -911,7 +885,7 @@ struct gsm_settings_abbrev *abbrev; char *number, *sms_sca = NULL; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; set = &ms->settings; @@ -970,7 +944,7 @@ { struct osmocom_ms *ms; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -989,7 +963,7 @@ struct gsm_settings *set; struct msgb *nmsg; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; set = &ms->settings; @@ -1018,7 +992,7 @@ uint16_t mcc = gsm_input_mcc((char *)argv[1]), mnc = gsm_input_mnc((char *)argv[2]); - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -1045,7 +1019,7 @@ struct gsm322_plmn *plmn; struct gsm322_plmn_list *temp; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; set = &ms->settings; @@ -1072,7 +1046,7 @@ struct osmocom_ms *ms; struct msgb *nmsg; - ms = get_ms(argv[0], vty); + ms = l23_vty_get_ms(argv[0], vty); if (!ms) return CMD_WARNING; @@ -1323,6 +1297,9 @@ struct gsm_settings_abbrev *abbrev; vty_out(vty, "ms %s%s", ms->name, VTY_NEWLINE); + + l23_vty_config_write_ms_node_contents(vty, ms, " "); + vty_out(vty, " layer2-socket %s%s", set->layer2_socket_path, VTY_NEWLINE); vty_out(vty, " sap-socket %s%s", set->sap_socket_path, VTY_NEWLINE); @@ -2996,25 +2973,6 @@ return CMD_SUCCESS; } -int ms_vty_go_parent(struct vty *vty) -{ - switch (vty->node) { - case MS_NODE: - vty->node = CONFIG_NODE; - vty->index = NULL; - break; - case TESTSIM_NODE: - case SUPPORT_NODE: - case AUDIO_NODE: - vty->node = MS_NODE; - break; - default: - vty->node = CONFIG_NODE; - } - - return vty->node; -} - DEFUN(off, off_cmd, "off", "Turn mobiles off (shutdown) and exit") { @@ -3028,6 +2986,11 @@ int ms_vty_init(void) { + int rc; + + if ((rc = l23_vty_init(config_write)) < 0) + return rc; + install_element_ve(&show_ms_cmd); install_element_ve(&show_subscr_cmd); install_element_ve(&show_support_cmd); @@ -3078,7 +3041,8 @@ install_element(CONFIG_NODE, &cfg_ms_create_cmd); install_element(CONFIG_NODE, &cfg_ms_rename_cmd); install_element(CONFIG_NODE, &cfg_no_ms_cmd); - install_node(&ms_node, config_write); + + /* MS_NODE is installed by l23_vty_init(). App specific commands below: */ install_element(MS_NODE, &cfg_ms_show_this_cmd); install_element(MS_NODE, &cfg_ms_layer2_cmd); install_element(MS_NODE, &cfg_ms_sap_cmd); @@ -3205,9 +3169,6 @@ install_element(AUDIO_NODE, &cfg_ms_audio_alsa_out_dev_cmd); install_element(AUDIO_NODE, &cfg_ms_audio_alsa_in_dev_cmd); - /* Register the talloc context introspection command */ - osmo_talloc_vty_add_cmds(); - return 0; } diff --git a/src/host/layer23/src/modem/Makefile.am b/src/host/layer23/src/modem/Makefile.am index 3fa1ceb..3f4c261 100644 --- a/src/host/layer23/src/modem/Makefile.am +++ b/src/host/layer23/src/modem/Makefile.am @@ -16,6 +16,7 @@ modem_SOURCES = \ $(top_srcdir)/src/common/main.c \ app_modem.c \ + vty.c \ $(NULL) modem_LDADD = \ $(top_builddir)/src/common/liblayer23.a \ diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 61266f5..a1bb27a 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -41,6 +41,7 @@ #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/l23_app.h> #include <osmocom/bb/common/sysinfo.h> +#include <osmocom/bb/modem/vty.h> #include <l1ctl_proto.h> @@ -490,12 +491,6 @@ return L23_OPT_ARFCN | L23_OPT_TAP | L23_OPT_VTY | L23_OPT_DBG; } -static int l23_vty_init(void) -{ - /* TODO: add sample specific vty nodes/cmds */ - return 0; -} - static struct vty_app_info _modem_vty_info = { .name = "modem", .version = PACKAGE_VERSION, @@ -505,7 +500,7 @@ .copyright = "Copyright (C) 2022 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de>\n", .cfg_supported = &l23_cfg_supported, .vty_info = &_modem_vty_info, - .vty_init = l23_vty_init, + .vty_init = modem_vty_init, }; struct l23_app_info *l23_app_info(void) diff --git a/src/host/layer23/src/modem/vty.c b/src/host/layer23/src/modem/vty.c new file mode 100644 index 0000000..2320efc --- /dev/null +++ b/src/host/layer23/src/modem/vty.c @@ -0,0 +1,49 @@ +/* + * (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <string.h> +#include <stdlib.h> +#include <stdarg.h> +#include <unistd.h> +#include <sys/types.h> + +#include <osmocom/vty/vty.h> +#include <osmocom/vty/command.h> + +#include <osmocom/bb/common/vty.h> +#include <osmocom/bb/common/ms.h> + + +static int config_write(struct vty *vty) +{ + struct osmocom_ms *ms; + llist_for_each_entry(ms, &ms_list, entity) + l23_vty_config_write_ms_node(vty, ms, ""); + return CMD_SUCCESS; +} + +int modem_vty_init(void) +{ + int rc; + + if ((rc = l23_vty_init(config_write)) < 0) + return rc; + install_element_ve(&l23_show_ms_cmd); + install_element(CONFIG_NODE, &l23_cfg_ms_cmd); + + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iabfb3129199488d790b89884bc1e424f2aca696f Gerrit-Change-Number: 30961 Gerrit-PatchSet: 11 Gerrit-Owner: pespin <pespin(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-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: mobile: Fix typo in vty string

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30968 ) Change subject: layer23: mobile: Fix typo in vty string ...................................................................... layer23: mobile: Fix typo in vty string Change-Id: I05238b72735600aae46126c24d5e96444e91ef06 --- M src/host/layer23/src/mobile/vty_interface.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index ff88104..943ebd9 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -147,7 +147,7 @@ return ms; } } - vty_out(vty, "MS name '%s' does not exits.%s", name, VTY_NEWLINE); + vty_out(vty, "MS name '%s' does not exist.%s", name, VTY_NEWLINE); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I05238b72735600aae46126c24d5e96444e91ef06 Gerrit-Change-Number: 30968 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Add missing header dependencies to several files

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30959 ) Change subject: layer23: Add missing header dependencies to several files ...................................................................... layer23: Add missing header dependencies to several files Change-Id: I9819b12d1c24f6ee197daa887452b09418d689e8 --- M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/include/osmocom/bb/common/l1l2_interface.h M src/host/layer23/include/osmocom/bb/common/sim.h M src/host/layer23/include/osmocom/bb/misc/log.h M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/include/osmocom/bb/mobile/mncc.h M src/host/layer23/include/osmocom/bb/mobile/settings.h M src/host/layer23/src/common/gps.c M src/host/layer23/src/common/l1ctl_lapdm_glue.c M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_fsm.c M src/host/layer23/src/misc/app_cbch_sniff.c M src/host/layer23/src/misc/app_echo_test.c M src/host/layer23/src/misc/cell_log.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/gsm322.c M src/host/layer23/src/mobile/gsm414.c M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/subscriber.c M src/host/layer23/src/mobile/voice.c 24 files changed, 48 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index 7e9bf83..5b20506 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -2,6 +2,7 @@ #define osmocom_l1ctl_h #include <osmocom/core/msgb.h> +#include <osmocom/core/prim.h> #include <osmocom/bb/common/osmocom_data.h> struct osmocom_ms; diff --git a/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h b/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h index 41403d8..4f46914 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h @@ -1,6 +1,8 @@ #ifndef _L1L2_INTERFACE_H #define _L1L2_INTERFACE_H +#include <osmocom/core/msgb.h> + int layer2_open(struct osmocom_ms *ms, const char *socket_path); int layer2_close(struct osmocom_ms *ms); int osmo_send_l1(struct osmocom_ms *ms, struct msgb *msg); diff --git a/src/host/layer23/include/osmocom/bb/common/sim.h b/src/host/layer23/include/osmocom/bb/common/sim.h index 191a717..321baf4 100644 --- a/src/host/layer23/include/osmocom/bb/common/sim.h +++ b/src/host/layer23/include/osmocom/bb/common/sim.h @@ -17,6 +17,8 @@ #pragma once +#include <osmocom/gsm/protocol/gsm_04_08.h> + /* 9.2 commands */ #define GSM1111_CLASS_GSM 0xa0 #define GSM1111_INST_SELECT 0xa4 diff --git a/src/host/layer23/include/osmocom/bb/misc/log.h b/src/host/layer23/include/osmocom/bb/misc/log.h index 7f69b57..54d795b 100644 --- a/src/host/layer23/include/osmocom/bb/misc/log.h +++ b/src/host/layer23/include/osmocom/bb/misc/log.h @@ -1,5 +1,7 @@ #pragma once +#include <osmocom/bb/common/sysinfo.h> + enum { LOG_TYPE_NONE = 0, LOG_TYPE_SYSINFO, diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h index bf3aa25..ce80317 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h @@ -1,6 +1,8 @@ #ifndef _GSM48_MM_H #define _GSM48_MM_H +struct gsm_settings; + /* GSM 04.07 9.2.2 */ #define GSM48_MMXX_MASK 0xf00 #define GSM48_MMCC_CLASS 0x100 diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h index 0e27026..ae9b867 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h @@ -1,6 +1,7 @@ #ifndef _GSM48_RR_H #define _GSM48_RR_H +#include <osmocom/core/timer.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #define GSM_TA_CM 55385 diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index f5dbbe8..1ab83ef 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -23,6 +23,7 @@ #define _MNCC_H #include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> #include <osmocom/gsm/mncc.h> struct gsm_call { diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h index 879be54..7b64e40 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/settings.h +++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h @@ -1,6 +1,9 @@ #ifndef _settings_h #define _settings_h +#include <osmocom/core/utils.h> +#include <osmocom/core/linuxlist.h> + #define MOB_C7_DEFLT_ANY_TIMEOUT 30 /* CC (Call Control) message handling entity */ diff --git a/src/host/layer23/src/common/gps.c b/src/host/layer23/src/common/gps.c index b6b547b..3c69352 100644 --- a/src/host/layer23/src/common/gps.c +++ b/src/host/layer23/src/common/gps.c @@ -29,6 +29,7 @@ #endif #include <osmocom/core/utils.h> +#include <osmocom/core/select.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/logging.h> diff --git a/src/host/layer23/src/common/l1ctl_lapdm_glue.c b/src/host/layer23/src/common/l1ctl_lapdm_glue.c index a754476..601bed6 100644 --- a/src/host/layer23/src/common/l1ctl_lapdm_glue.c +++ b/src/host/layer23/src/common/l1ctl_lapdm_glue.c @@ -17,6 +17,7 @@ */ #include <stdint.h> +#include <errno.h> #include <l1ctl_proto.h> diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index 04a5dba..9db285f 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -24,6 +24,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/socket.h> +#include <osmocom/core/select.h> #include <sys/socket.h> #include <sys/un.h> diff --git a/src/host/layer23/src/common/sap_fsm.c b/src/host/layer23/src/common/sap_fsm.c index 7e08836..ce0a22d 100644 --- a/src/host/layer23/src/common/sap_fsm.c +++ b/src/host/layer23/src/common/sap_fsm.c @@ -27,6 +27,7 @@ #include <osmocom/core/socket.h> #include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> +#include <osmocom/core/write_queue.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/logging.h> diff --git a/src/host/layer23/src/misc/app_cbch_sniff.c b/src/host/layer23/src/misc/app_cbch_sniff.c index d5424ba..24caae9 100644 --- a/src/host/layer23/src/misc/app_cbch_sniff.c +++ b/src/host/layer23/src/misc/app_cbch_sniff.c @@ -23,14 +23,15 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/l23_app.h> #include <osmocom/bb/misc/layer3.h> +#include <osmocom/bb/common/sysinfo.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> #include <osmocom/core/select.h> #include <osmocom/core/signal.h> #include <osmocom/gsm/rsl.h> - #include <osmocom/gsm/protocol/gsm_08_58.h> +#include <osmocom/gsm/lapdm.h> #include <l1ctl_proto.h> diff --git a/src/host/layer23/src/misc/app_echo_test.c b/src/host/layer23/src/misc/app_echo_test.c index 6d95e65..3cf854a 100644 --- a/src/host/layer23/src/misc/app_echo_test.c +++ b/src/host/layer23/src/misc/app_echo_test.c @@ -26,7 +26,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> #include <osmocom/core/select.h> - +#include <osmocom/core/timer.h> static struct { struct osmo_timer_list timer; diff --git a/src/host/layer23/src/misc/cell_log.c b/src/host/layer23/src/misc/cell_log.c index 57bed0f..ab8678d 100644 --- a/src/host/layer23/src/misc/cell_log.c +++ b/src/host/layer23/src/misc/cell_log.c @@ -32,12 +32,16 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/rsl.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/lapdm.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/gps.h> +#include <osmocom/bb/common/sysinfo.h> +#include <osmocom/bb/mobile/gsm48_rr.h> #include <osmocom/bb/misc/cell_log.h> #include <osmocom/bb/misc/geo.h> diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index e59ecb9..5ea31c0 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -26,16 +26,21 @@ #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/gps.h> +#include <osmocom/bb/common/sap_interface.h> +#include <osmocom/bb/common/sim.h> + #include <osmocom/bb/mobile/gsm48_rr.h> #include <osmocom/bb/mobile/gsm480_ss.h> +#include <osmocom/bb/mobile/gsm48_mm.h> +#include <osmocom/bb/mobile/gsm48_cc.h> #include <osmocom/bb/mobile/gsm411_sms.h> +#include <osmocom/bb/mobile/gsm322.h> #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/app_mobile.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/voice.h> #include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/primitives.h> -#include <osmocom/bb/common/sap_interface.h> #include <osmocom/vty/ports.h> #include <osmocom/vty/logging.h> diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 9b3806f..b94fbaf 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -33,9 +33,12 @@ #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/networks.h> +#include <osmocom/bb/common/utils.h> #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/app_mobile.h> -#include <osmocom/bb/common/utils.h> +#include <osmocom/bb/mobile/gsm322.h> +#include <osmocom/bb/mobile/gsm48_mm.h> +#include <osmocom/bb/mobile/settings.h> #include <l1ctl_proto.h> diff --git a/src/host/layer23/src/mobile/gsm414.c b/src/host/layer23/src/mobile/gsm414.c index 2fcf4dc..e4a4edd 100644 --- a/src/host/layer23/src/mobile/gsm414.c +++ b/src/host/layer23/src/mobile/gsm414.c @@ -34,6 +34,7 @@ #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/logging.h> +#include <osmocom/bb/mobile/gsm48_rr.h> #include <l1ctl_proto.h> diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 80aff82..8e3c976 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -26,18 +26,22 @@ #include <osmocom/core/utils.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/utils.h> #include <osmocom/bb/mobile/gsm48_cc.h> #include <osmocom/bb/mobile/gsm480_ss.h> #include <osmocom/bb/mobile/gsm411_sms.h> #include <osmocom/bb/mobile/app_mobile.h> #include <osmocom/bb/mobile/primitives.h> #include <osmocom/bb/mobile/vty.h> -#include <osmocom/bb/common/utils.h> +#include <osmocom/bb/mobile/gsm48_rr.h> +#include <osmocom/bb/mobile/gsm322.h> +#include <osmocom/bb/mobile/subscriber.h> extern void *l23_ctx; diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index deb76c9..44d7440 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -74,10 +74,12 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/utils.h> #include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/vty.h> -#include <osmocom/bb/common/utils.h> +#include <osmocom/bb/mobile/gsm48_rr.h> +#include <osmocom/bb/mobile/settings.h> #include <l1ctl_proto.h> diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 5accd5e..5d4502a 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -28,6 +28,7 @@ #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/mncc_ms.h> #include <osmocom/bb/mobile/vty.h> +#include <osmocom/bb/mobile/settings.h> static uint32_t new_callref = 1; static LLIST_HEAD(call_list); diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 445190e..846cda2 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -21,6 +21,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/bb/mobile/app_mobile.h> +#include <osmocom/bb/mobile/settings.h> #include <osmocom/bb/common/utils.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 4009238..a226889 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -28,6 +28,7 @@ #include <osmocom/bb/common/sap_proto.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/mobile/vty.h> +#include <osmocom/bb/mobile/subscriber.h> /* enable to get an empty list of forbidden PLMNs, even if stored on SIM. * if list is changed, the result is not written back to SIM */ diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 260e1d2..0840ea5 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -29,6 +29,7 @@ #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/mncc.h> +#include <osmocom/bb/mobile/mncc_sock.h> #include <osmocom/bb/mobile/voice.h> /* Forward a Downlink voice frame to the external MNCC handler */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9819b12d1c24f6ee197daa887452b09418d689e8 Gerrit-Change-Number: 30959 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Move osmocom_ms to a separate file

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30960 ) Change subject: layer23: Move osmocom_ms to a separate file ...................................................................... layer23: Move osmocom_ms to a separate file This way we can extend its API and contents more easily, and keep most of it together in one place. Change-Id: Icb4891cc1e4a0ecb5f09cb8a84b0ebe1b91a46b8 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am A src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/include/osmocom/bb/common/osmocom_data.h M src/host/layer23/src/common/Makefile.am M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/main.c A src/host/layer23/src/common/ms.c M src/host/layer23/src/common/sap_fsm.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/common/sim.c M src/host/layer23/src/misc/app_cbch_sniff.c M src/host/layer23/src/misc/app_ccch_scan.c M src/host/layer23/src/misc/cell_log.c M src/host/layer23/src/misc/rslms.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/gapk_io.c M src/host/layer23/src/mobile/gsm322.c M src/host/layer23/src/mobile/gsm411_sms.c M src/host/layer23/src/mobile/gsm414.c M src/host/layer23/src/mobile/gsm480_ss.c M src/host/layer23/src/mobile/gsm48_cc.c M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/script_lua.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/subscriber.c M src/host/layer23/src/mobile/support.c M src/host/layer23/src/mobile/transaction.c M src/host/layer23/src/mobile/voice.c M src/host/layer23/src/mobile/vty_interface.c M src/host/layer23/src/modem/app_modem.c 33 files changed, 176 insertions(+), 118 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index 31bb6b6..8663d9c 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -3,6 +3,7 @@ l1l2_interface.h \ l23_app.h \ logging.h \ + ms.h \ networks.h \ gps.h \ sysinfo.h \ diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h new file mode 100644 index 0000000..b9c9276 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -0,0 +1,102 @@ +/* Mobile Station */ +#pragma once + +#include <osmocom/core/select.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/write_queue.h> + +/* FIXME no 'mobile' specific stuff should be here */ +#include <osmocom/bb/mobile/support.h> +#include <osmocom/bb/mobile/settings.h> +#include <osmocom/bb/mobile/subscriber.h> +#include <osmocom/gsm/lapdm.h> +#include <osmocom/bb/common/sap_interface.h> +#include <osmocom/bb/common/sap_proto.h> +#include <osmocom/bb/mobile/gsm48_rr.h> +#include <osmocom/bb/common/sysinfo.h> +#include <osmocom/bb/mobile/gsm322.h> +#include <osmocom/bb/mobile/gsm48_mm.h> +#include <osmocom/bb/mobile/gsm48_cc.h> +#include <osmocom/bb/mobile/mncc_sock.h> +#include <osmocom/bb/common/sim.h> +#include <osmocom/bb/common/l1ctl.h> + + +struct osmosap_entity { + struct osmo_fsm_inst *fi; + uint16_t max_msg_size; + + /* Current state of remote SIM card */ + enum sap_card_status_type card_status; + + /* Optional SAP message call-back */ + sap_msg_cb_t sap_msg_cb; + /* Optional response call-back */ + sap_rsp_cb_t sap_rsp_cb; +}; + +struct osmol1_entity { + int (*l1_traffic_ind)(struct osmocom_ms *ms, struct msgb *msg); +}; + +struct osmomncc_entity { + int (*mncc_recv)(struct osmocom_ms *ms, int msg_type, void *arg); + struct mncc_sock_state *sock_state; + uint32_t ref; +}; + +/* RX measurement statistics */ +struct rx_meas_stat { + uint32_t last_fn; + + /* cumulated values of current cell from SACCH dl */ + uint32_t frames; + uint32_t snr; + uint32_t berr; + uint32_t rxlev; + + /* counters loss criterion */ + int16_t dsc, ds_fail; + int16_t s, rl_fail; +}; + +enum { + MS_SHUTDOWN_NONE = 0, + MS_SHUTDOWN_IMSI_DETACH = 1, + MS_SHUTDOWN_WAIT_RESET = 2, + MS_SHUTDOWN_COMPL = 3, +}; + +struct osmocom_ms { + struct llist_head entity; + char *name; + struct osmo_wqueue l2_wq, sap_wq; + uint16_t test_arfcn; + struct osmol1_entity l1_entity; + + bool started, deleting; + uint8_t shutdown; + struct gsm_support support; + struct gsm_settings settings; + struct gsm_subscriber subscr; + struct gsm_sim sim; + struct lapdm_channel lapdm_channel; + struct osmosap_entity sap_entity; + struct rx_meas_stat meas; + struct gsm48_rrlayer rrlayer; + struct gsm322_plmn plmn; + struct gsm322_cellsel cellsel; + struct gsm48_mmlayer mmlayer; + struct gsm48_cclayer cclayer; + struct osmomncc_entity mncc_entity; + struct llist_head trans_list; + + /* Audio I/O */ + struct gapk_io_state *gapk_io; + + void *lua_state; + int lua_cb_ref; + char *lua_script; +}; + +struct osmocom_ms *osmocom_ms_alloc(void *ctx); diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index a8af1e8..d78edc3 100644 --- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -1,108 +1,10 @@ -#ifndef osmocom_data_h -#define osmocom_data_h +#pragma once -#include <osmocom/core/select.h> -#include <osmocom/gsm/gsm_utils.h> -#include <osmocom/core/write_queue.h> +#include <stdint.h> struct osmocom_ms; struct gapk_io_state; - /* FIXME no 'mobile' specific stuff should be here */ -#include <osmocom/bb/mobile/support.h> -#include <osmocom/bb/mobile/settings.h> -#include <osmocom/bb/mobile/subscriber.h> -#include <osmocom/gsm/lapdm.h> -#include <osmocom/bb/common/sap_interface.h> -#include <osmocom/bb/common/sap_proto.h> -#include <osmocom/bb/mobile/gsm48_rr.h> -#include <osmocom/bb/common/sysinfo.h> -#include <osmocom/bb/mobile/gsm322.h> -#include <osmocom/bb/mobile/gsm48_mm.h> -#include <osmocom/bb/mobile/gsm48_cc.h> -#include <osmocom/bb/mobile/mncc_sock.h> -#include <osmocom/bb/common/sim.h> -#include <osmocom/bb/common/l1ctl.h> - -struct osmosap_entity { - struct osmo_fsm_inst *fi; - uint16_t max_msg_size; - - /* Current state of remote SIM card */ - enum sap_card_status_type card_status; - - /* Optional SAP message call-back */ - sap_msg_cb_t sap_msg_cb; - /* Optional response call-back */ - sap_rsp_cb_t sap_rsp_cb; -}; - -struct osmol1_entity { - int (*l1_traffic_ind)(struct osmocom_ms *ms, struct msgb *msg); -}; - -struct osmomncc_entity { - int (*mncc_recv)(struct osmocom_ms *ms, int msg_type, void *arg); - struct mncc_sock_state *sock_state; - uint32_t ref; -}; - - -/* RX measurement statistics */ -struct rx_meas_stat { - uint32_t last_fn; - - /* cumulated values of current cell from SACCH dl */ - uint32_t frames; - uint32_t snr; - uint32_t berr; - uint32_t rxlev; - - /* counters loss criterion */ - int16_t dsc, ds_fail; - int16_t s, rl_fail; -}; - -enum { - MS_SHUTDOWN_NONE = 0, - MS_SHUTDOWN_IMSI_DETACH = 1, - MS_SHUTDOWN_WAIT_RESET = 2, - MS_SHUTDOWN_COMPL = 3, -}; - -/* One Mobilestation for osmocom */ -struct osmocom_ms { - struct llist_head entity; - char *name; - struct osmo_wqueue l2_wq, sap_wq; - uint16_t test_arfcn; - struct osmol1_entity l1_entity; - - bool started, deleting; - uint8_t shutdown; - struct gsm_support support; - struct gsm_settings settings; - struct gsm_subscriber subscr; - struct gsm_sim sim; - struct lapdm_channel lapdm_channel; - struct osmosap_entity sap_entity; - struct rx_meas_stat meas; - struct gsm48_rrlayer rrlayer; - struct gsm322_plmn plmn; - struct gsm322_cellsel cellsel; - struct gsm48_mmlayer mmlayer; - struct gsm48_cclayer cclayer; - struct osmomncc_entity mncc_entity; - struct llist_head trans_list; - - /* Audio I/O */ - struct gapk_io_state *gapk_io; - - void *lua_state; - int lua_cb_ref; - char *lua_script; -}; - enum osmobb_sig_subsys { SS_L1CTL, SS_GLOBAL, @@ -153,5 +55,3 @@ uint16_t band_arfcn; uint8_t rx_lev; }; - -#endif diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index 185bf04..f6578ec 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -18,6 +18,7 @@ l1l2_interface.c \ l1ctl_lapdm_glue.c \ logging.c \ + ms.c \ networks.c \ sap_fsm.c \ sap_proto.c \ diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 94079c7..2695e53 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -40,6 +40,7 @@ #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/l1l2_interface.h> #include <osmocom/gsm/lapdm.h> #include <osmocom/bb/common/logging.h> diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index 9db285f..94303c2 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -18,6 +18,7 @@ */ #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/l1l2_interface.h> diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index ae4932a..61a8604 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -18,6 +18,7 @@ */ #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/l1l2_interface.h> #include <osmocom/bb/common/sap_interface.h> @@ -265,25 +266,12 @@ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_HEADER_END); - ms = talloc_zero(l23_ctx, struct osmocom_ms); - if (!ms) { - fprintf(stderr, "Failed to allocate MS\n"); - exit(1); - } - print_copyright(); + ms = osmocom_ms_alloc(l23_ctx); + OSMO_ASSERT(ms); llist_add_tail(&ms->entity, &ms_list); - ms->name = talloc_strdup(ms, "1"); - ms->test_arfcn = 871; - ms->lapdm_channel.lapdm_dcch.l1_ctx = ms; - ms->lapdm_channel.lapdm_dcch.l3_ctx = ms; - ms->lapdm_channel.lapdm_acch.l1_ctx = ms; - ms->lapdm_channel.lapdm_acch.l3_ctx = ms; - lapdm_channel_init(&ms->lapdm_channel, LAPDM_MODE_MS); - lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); - rc = l23_app_init(ms); if (rc < 0) { fprintf(stderr, "Failed during l23_app_init()\n"); diff --git a/src/host/layer23/src/common/ms.c b/src/host/layer23/src/common/ms.c new file mode 100644 index 0000000..0b1ccb8 --- /dev/null +++ b/src/host/layer23/src/common/ms.c @@ -0,0 +1,40 @@ +/* Mobile Station */ +/* (C) 2010 by Holger Hans Peter Freyther + * (C) 2010 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <osmocom/bb/common/ms.h> + +struct osmocom_ms *osmocom_ms_alloc(void *ctx) +{ + struct osmocom_ms *ms; + + ms = talloc_zero(ctx, struct osmocom_ms); + if (!ms) + return NULL; + + ms->name = talloc_strdup(ms, "1"); + ms->test_arfcn = 871; + ms->lapdm_channel.lapdm_dcch.l1_ctx = ms; + ms->lapdm_channel.lapdm_dcch.l3_ctx = ms; + ms->lapdm_channel.lapdm_acch.l1_ctx = ms; + ms->lapdm_channel.lapdm_acch.l3_ctx = ms; + lapdm_channel_init(&ms->lapdm_channel, LAPDM_MODE_MS); + lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); + + return ms; +} diff --git a/src/host/layer23/src/common/sap_fsm.c b/src/host/layer23/src/common/sap_fsm.c index ce0a22d..f189bc8 100644 --- a/src/host/layer23/src/common/sap_fsm.c +++ b/src/host/layer23/src/common/sap_fsm.c @@ -30,6 +30,7 @@ #include <osmocom/core/write_queue.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/sap_interface.h> diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index c4f1453..86c70a9 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -34,7 +34,7 @@ #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/logging.h> - +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/sap_interface.h> #include <osmocom/bb/common/sap_proto.h> #include <osmocom/bb/common/sap_fsm.h> diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c index 8e0d799..bd50f62 100644 --- a/src/host/layer23/src/common/sim.c +++ b/src/host/layer23/src/common/sim.c @@ -25,6 +25,7 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/l1ctl.h> extern struct gsmtap_inst *gsmtap_inst; diff --git a/src/host/layer23/src/misc/app_cbch_sniff.c b/src/host/layer23/src/misc/app_cbch_sniff.c index 24caae9..d04faa9 100644 --- a/src/host/layer23/src/misc/app_cbch_sniff.c +++ b/src/host/layer23/src/misc/app_cbch_sniff.c @@ -19,6 +19,7 @@ */ #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/l23_app.h> diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index cfb4392..da8223c 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -32,6 +32,7 @@ #include <osmocom/bb/misc/rslms.h> #include <osmocom/bb/misc/layer3.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/l23_app.h> diff --git a/src/host/layer23/src/misc/cell_log.c b/src/host/layer23/src/misc/cell_log.c index ab8678d..7635f1f 100644 --- a/src/host/layer23/src/misc/cell_log.c +++ b/src/host/layer23/src/misc/cell_log.c @@ -37,6 +37,7 @@ #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/gps.h> diff --git a/src/host/layer23/src/misc/rslms.c b/src/host/layer23/src/misc/rslms.c index afb2727..c071113 100644 --- a/src/host/layer23/src/misc/rslms.c +++ b/src/host/layer23/src/misc/rslms.c @@ -30,6 +30,7 @@ #include <osmocom/bb/misc/rslms.h> #include <osmocom/bb/misc/layer3.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/l1ctl.h> /* Send a 'simple' RLL request to L2 */ diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 5ea31c0..5bf765a 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -22,6 +22,7 @@ #include <signal.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/l1l2_interface.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/logging.h> diff --git a/src/host/layer23/src/mobile/gapk_io.c b/src/host/layer23/src/mobile/gapk_io.c index 0a807ff..a2a4e84 100644 --- a/src/host/layer23/src/mobile/gapk_io.c +++ b/src/host/layer23/src/mobile/gapk_io.c @@ -33,6 +33,7 @@ #include <osmocom/gapk/common.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/mobile/voice.h> diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index b94fbaf..4b73594 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -32,6 +32,7 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/utils.h> #include <osmocom/bb/mobile/vty.h> diff --git a/src/host/layer23/src/mobile/gsm411_sms.c b/src/host/layer23/src/mobile/gsm411_sms.c index 76355c0..d00e94d 100644 --- a/src/host/layer23/src/mobile/gsm411_sms.c +++ b/src/host/layer23/src/mobile/gsm411_sms.c @@ -30,6 +30,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/gsm411_sms.h> diff --git a/src/host/layer23/src/mobile/gsm414.c b/src/host/layer23/src/mobile/gsm414.c index e4a4edd..ced15ed 100644 --- a/src/host/layer23/src/mobile/gsm414.c +++ b/src/host/layer23/src/mobile/gsm414.c @@ -33,6 +33,7 @@ #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/mobile/gsm48_rr.h> diff --git a/src/host/layer23/src/mobile/gsm480_ss.c b/src/host/layer23/src/mobile/gsm480_ss.c index b0a3dc9..139b45b 100644 --- a/src/host/layer23/src/mobile/gsm480_ss.c +++ b/src/host/layer23/src/mobile/gsm480_ss.c @@ -24,6 +24,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/gsm480_ss.h> diff --git a/src/host/layer23/src/mobile/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c index 1be53ba..4db1925 100644 --- a/src/host/layer23/src/mobile/gsm48_cc.c +++ b/src/host/layer23/src/mobile/gsm48_cc.c @@ -28,6 +28,7 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/gsm48_cc.h> diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 8e3c976..500eff6 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -30,6 +30,7 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/utils.h> diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 44d7440..87a0dcd 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -69,6 +69,7 @@ #include <osmocom/core/bitvec.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/l1l2_interface.h> #include <osmocom/bb/common/l23_app.h> #include <osmocom/bb/common/logging.h> diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 5d4502a..16cabc1 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -25,6 +25,7 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/mncc_ms.h> #include <osmocom/bb/mobile/vty.h> diff --git a/src/host/layer23/src/mobile/script_lua.c b/src/host/layer23/src/mobile/script_lua.c index f8f2bf3..eb3f008 100644 --- a/src/host/layer23/src/mobile/script_lua.c +++ b/src/host/layer23/src/mobile/script_lua.c @@ -19,6 +19,7 @@ #include <lauxlib.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/mobile/app_mobile.h> #include <osmocom/bb/common/logging.h> diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 846cda2..b6e251b 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -25,6 +25,7 @@ #include <osmocom/bb/common/utils.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/networks.h> static char *layer2_socket_path = "/tmp/osmocom_l2"; diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index a226889..164622a 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -24,6 +24,7 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/sap_interface.h> #include <osmocom/bb/common/sap_proto.h> #include <osmocom/bb/common/networks.h> diff --git a/src/host/layer23/src/mobile/support.c b/src/host/layer23/src/mobile/support.c index fd1ed74..e82d49f 100644 --- a/src/host/layer23/src/mobile/support.c +++ b/src/host/layer23/src/mobile/support.c @@ -20,6 +20,7 @@ #include <string.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> void gsm_support_init(struct osmocom_ms *ms) { diff --git a/src/host/layer23/src/mobile/transaction.c b/src/host/layer23/src/mobile/transaction.c index fd5a12d..2fb910a 100644 --- a/src/host/layer23/src/mobile/transaction.c +++ b/src/host/layer23/src/mobile/transaction.c @@ -22,6 +22,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/transaction.h> diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 0840ea5..7d6c2e0 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -27,6 +27,7 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/mncc_sock.h> diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 16eedf2..ff88104 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -28,6 +28,7 @@ #include <osmocom/crypt/auth.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/gps.h> #include <osmocom/bb/mobile/mncc.h> diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 1852a0d..61266f5 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -36,6 +36,7 @@ #include <osmocom/gprs/rlcmac/gprs_rlcmac.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/l23_app.h> -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icb4891cc1e4a0ecb5f09cb8a84b0ebe1b91a46b8 Gerrit-Change-Number: 30960 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Move settings.{c,h} under common/

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30975 ) Change subject: layer23: Move settings.{c,h} under common/ ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0a741b2384195d512fdc49eda6762241f385b1f1 Gerrit-Change-Number: 30975 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 10:47:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Move subscriber.{c,h} under common/

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30974 ) Change subject: layer23: Move subscriber.{c,h} under common/ ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3727e40bcc9a4ee93aaf2c4ced070cc789653e80 Gerrit-Change-Number: 30974 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 10:47:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Move support.{c,h} under common/

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30973 ) Change subject: layer23: Move support.{c,h} under common/ ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3c5af4db8e603aa004d0b6410b09b5143173b874 Gerrit-Change-Number: 30973 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 10:47:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023