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

Change in libosmo-abis[master]: Fix support for HDLC/RAW type channels at mISDN.c

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30446 ) Change subject: Fix support for HDLC/RAW type channels at mISDN.c ...................................................................... Patch Set 2: (1 comment) File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/30446/comment/592e5131_5db9d690 PS1, Line 120: in > please add an entry to TOOD-RELEASE as this breaks the ABI towards applications, i.e. […] unfortunately still no entry in the TODO-RELEASE file -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie9a2a3f6ae1ad7da1711b6ff2f0aeda39839a427 Gerrit-Change-Number: 30446 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 17 Jan 2023 09:19:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: common/sim.h: Fix missing pragma once

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30956 ) Change subject: layer23: common/sim.h: Fix missing pragma once ...................................................................... layer23: common/sim.h: Fix missing pragma once Change-Id: Icebe803c7896347915ed72b80d5504d15d717ef3 --- M src/host/layer23/include/osmocom/bb/common/sim.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/sim.h b/src/host/layer23/include/osmocom/bb/common/sim.h index bebcffe..191a717 100644 --- a/src/host/layer23/include/osmocom/bb/common/sim.h +++ b/src/host/layer23/include/osmocom/bb/common/sim.h @@ -15,6 +15,7 @@ * */ +#pragma once /* 9.2 commands */ #define GSM1111_CLASS_GSM 0xa0 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icebe803c7896347915ed72b80d5504d15d717ef3 Gerrit-Change-Number: 30956 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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]: cosmetic layer23/mobile/gsm322: Fix trailing whistespace

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30955 ) Change subject: cosmetic layer23/mobile/gsm322: Fix trailing whistespace ...................................................................... cosmetic layer23/mobile/gsm322: Fix trailing whistespace Change-Id: I32d28ac219d2a573a77a0041a774ca7427388fb0 --- M src/host/layer23/include/osmocom/bb/mobile/gsm322.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h index b332778..86b1ef1 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h @@ -42,7 +42,7 @@ /* GSM 03.22 events */ #define GSM322_EVENT_SWITCH_ON 1 -#define GSM322_EVENT_SWITCH_OFF 2 +#define GSM322_EVENT_SWITCH_OFF 2 #define GSM322_EVENT_SIM_INSERT 3 #define GSM322_EVENT_SIM_REMOVE 4 #define GSM322_EVENT_REG_SUCCESS 5 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I32d28ac219d2a573a77a0041a774ca7427388fb0 Gerrit-Change-Number: 30955 Gerrit-PatchSet: 5 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: misc/log.h: Fix missing pragma once

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30957 ) Change subject: layer23: misc/log.h: Fix missing pragma once ...................................................................... layer23: misc/log.h: Fix missing pragma once Change-Id: Ie57357224ba5ed2bf691e2912ede7ee19012b6dd --- M src/host/layer23/include/osmocom/bb/misc/log.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/misc/log.h b/src/host/layer23/include/osmocom/bb/misc/log.h index d152010..7f69b57 100644 --- a/src/host/layer23/include/osmocom/bb/misc/log.h +++ b/src/host/layer23/include/osmocom/bb/misc/log.h @@ -1,3 +1,4 @@ +#pragma once enum { LOG_TYPE_NONE = 0, 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie57357224ba5ed2bf691e2912ede7ee19012b6dd Gerrit-Change-Number: 30957 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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]: cosmetic: layer23: Fix trailing whitespace

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30958 ) Change subject: cosmetic: layer23: Fix trailing whitespace ...................................................................... cosmetic: layer23: Fix trailing whitespace Change-Id: Ibc464923ac8add74b2b6d57d183fb307be650679 --- 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/src/common/sim.c M src/host/layer23/src/misc/cell_log.c M src/host/layer23/src/misc/rslms.c M src/host/layer23/src/mobile/gsm480_ss.c 6 files changed, 12 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved fixeria: Looks good to me, approved 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 9b499a6..0e27026 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h @@ -149,7 +149,7 @@ /* channel request states */ uint8_t wait_assign; /* waiting for assignment state */ uint8_t n_chan_req; /* number left, incl. current */ - uint8_t chan_req_val; /* current request value */ + uint8_t chan_req_val; /* current request value */ uint8_t chan_req_mask; /* mask of random bits */ /* state of dedicated mdoe */ diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index ebc58a5..f5dbbe8 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -1,4 +1,4 @@ -/* GSM Mobile Radio Interface Layer 3 messages on the A-bis interface +/* GSM Mobile Radio Interface Layer 3 messages on the A-bis interface * 3GPP TS 04.08 version 7.21.0 Release 1998 / ETSI TS 100 940 V7.21.0 */ /* (C) 2008-2009 by Harald Welte <laforge(a)gnumonks.org> diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c index 131a1ef..8e0d799 100644 --- a/src/host/layer23/src/common/sim.c +++ b/src/host/layer23/src/common/sim.c @@ -239,7 +239,7 @@ sim_process_job(ms); return 1; /* work done */ } - + return 0; } diff --git a/src/host/layer23/src/misc/cell_log.c b/src/host/layer23/src/misc/cell_log.c index dc98383..57bed0f 100644 --- a/src/host/layer23/src/misc/cell_log.c +++ b/src/host/layer23/src/misc/cell_log.c @@ -287,7 +287,7 @@ ncch->data[2] = (s->ccch_conf == 1) << 7; ncch->data[3] = 0; ncch->data[4] = RSL_IE_ACCESS_DELAY; - ncch->data[5] = 0; /* no delay */ + ncch->data[5] = 0; /* no delay */ ncch->data[6] = RSL_IE_MS_POWER; ncch->data[7] = 0; /* full power */ @@ -665,7 +665,7 @@ struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); struct tlv_parsed tv; uint8_t ch_type, ch_subch, ch_ts; - + DEBUGP(DRSL, "RSLms UNIT DATA IND chan_nr=0x%02x link_id=0x%02x\n", rllh->chan_nr, rllh->link_id); diff --git a/src/host/layer23/src/misc/rslms.c b/src/host/layer23/src/misc/rslms.c index f7f6fcd..afb2727 100644 --- a/src/host/layer23/src/misc/rslms.c +++ b/src/host/layer23/src/misc/rslms.c @@ -57,7 +57,7 @@ struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); struct tlv_parsed tv; int rc = 0; - + DEBUGP(DRSL, "RSLms UNIT DATA IND chan_nr=0x%02x link_id=0x%02x\n", rllh->chan_nr, rllh->link_id); diff --git a/src/host/layer23/src/mobile/gsm480_ss.c b/src/host/layer23/src/mobile/gsm480_ss.c index b68d542..b0a3dc9 100644 --- a/src/host/layer23/src/mobile/gsm480_ss.c +++ b/src/host/layer23/src/mobile/gsm480_ss.c @@ -360,7 +360,7 @@ static const char *decode_ss_code(uint8_t ss_code) { static char unknown[16]; - + switch (ss_code) { case 33: return "CFU"; @@ -642,7 +642,7 @@ code++; to = ss_code_by_char(code + 1, &ss_code); - + /* register */ if (ss_code && to && to[0] == '*') { OSMO_STRLCPY_ARRAY(dest, to + 1); @@ -660,7 +660,7 @@ uint8_t ss_code = 0; ss_code_by_char(code + 2, &ss_code); - + if (ss_code) return gsm480_tx_cf(trans, GSM0480_MTYPE_REGISTER, GSM0480_OP_CODE_ERASE_SS, ss_code, NULL); @@ -670,7 +670,7 @@ uint8_t ss_code = 0; ss_code_by_char(code + 1, &ss_code); - + if (ss_code) return gsm480_tx_cf(trans, GSM0480_MTYPE_REGISTER, GSM0480_OP_CODE_DEACTIVATE_SS, ss_code, NULL); @@ -708,7 +708,7 @@ /* check for buffer overflow */ if (len < *tag_len) return -1; - + /* return length */ return len; } @@ -834,7 +834,7 @@ vty_notify(ms, "Call Forwarding reply unsupported.\n"); return 0; } - + while (len) { /* sequence tag */ if (parse_tag_asn1(data, len, &tag_data, &tag_len) < 0) { 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibc464923ac8add74b2b6d57d183fb307be650679 Gerrit-Change-Number: 30958 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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: Add initial VTY support for l23_apps

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30950 ) Change subject: layer23: Add initial VTY support for l23_apps ...................................................................... layer23: Add initial VTY support for l23_apps Initial VTY "boilerplate" code for modem app is already added in this commit as a showcase what's needed by an app to have the VTY config file read and VTY interface initialized. Change-Id: Ife3a3373e5a9c0c8e5959ac714e140e72d6c363a --- M src/host/layer23/include/osmocom/bb/common/l23_app.h M src/host/layer23/src/common/main.c M src/host/layer23/src/misc/Makefile.am M src/host/layer23/src/modem/app_modem.c 4 files changed, 76 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/host/layer23/include/osmocom/bb/common/l23_app.h b/src/host/layer23/include/osmocom/bb/common/l23_app.h index cb68d43..633c764 100644 --- a/src/host/layer23/include/osmocom/bb/common/l23_app.h +++ b/src/host/layer23/include/osmocom/bb/common/l23_app.h @@ -2,6 +2,7 @@ #define _L23_APP_H struct option; +struct vty_app_info; /* Options supported by the l23 app */ enum { @@ -10,7 +11,6 @@ L23_OPT_TAP = 4, L23_OPT_VTY = 8, L23_OPT_DBG = 16, - L23_OPT_VTYIP = 32, }; extern void *l23_ctx; @@ -29,12 +29,14 @@ struct l23_app_info { const char *copyright; const char *contribution; + struct vty_app_info *vty_info; /* L23_OPT_VTY */ char *getopt_string; int (*cfg_supported)(); int (*cfg_print_help)(); int (*cfg_getopt_opt)(struct option **options); int (*cfg_handle_opt)(int c,const char *optarg); + int (*vty_init)(void); }; extern struct l23_app_info *l23_app_info(); diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index dcf557f..ae4932a 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -33,6 +33,10 @@ #include <osmocom/core/gsmtap_util.h> #include <osmocom/core/gsmtap.h> #include <osmocom/core/utils.h> +#include <osmocom/vty/vty.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/ports.h> #include <arpa/inet.h> @@ -51,9 +55,8 @@ struct llist_head ms_list; static struct osmocom_ms *ms = NULL; static char *gsmtap_ip = NULL; -static char *vty_ip = "127.0.0.1"; +static char *config_file = NULL; -unsigned short vty_port = 4247; int (*l23_app_start)(struct osmocom_ms *ms) = NULL; int (*l23_app_work)(struct osmocom_ms *ms) = NULL; int (*l23_app_exit)(struct osmocom_ms *ms) = NULL; @@ -97,16 +100,11 @@ printf(" -i --gsmtap-ip The destination IP used for GSMTAP.\n"); if (options & L23_OPT_VTY) - printf(" -v --vty-port The VTY port number to telnet " - "to. (default %u)\n", vty_port); + printf(" -c --config-file The path to the VTY configuration file.\n"); if (options & L23_OPT_DBG) printf(" -d --debug Change debug flags.\n"); - if (options & L23_OPT_VTYIP) - printf(" -u --vty-ip The VTY IP to bind telnet to. " - "(default %s)\n", vty_ip); - if (app && app->cfg_print_help) app->cfg_print_help(); } @@ -123,14 +121,13 @@ {"sap", 1, 0, 'S'}, {"arfcn", 1, 0, 'a'}, {"gsmtap-ip", 1, 0, 'i'}, - {"vty-ip", 1, 0, 'u'}, - {"vty-port", 1, 0, 'v'}, + {"config-file", 1, 0, 'c'}, {"debug", 1, 0, 'd'}, }; app = l23_app_info(); - *opt = talloc_asprintf(l23_ctx, "hs:S:a:i:v:d:u:%s", + *opt = talloc_asprintf(l23_ctx, "hs:S:a:i:c:d:%s", app && app->getopt_string ? app->getopt_string : ""); len = ARRAY_SIZE(long_options); @@ -143,9 +140,8 @@ memcpy(*option + len, app_opp, app_len * sizeof(struct option)); } -static void handle_options(int argc, char **argv) +static void handle_options(int argc, char **argv, struct l23_app_info *app) { - struct l23_app_info *app = l23_app_info(); struct option *long_options; char *opt; @@ -177,11 +173,8 @@ case 'i': gsmtap_ip = optarg; break; - case 'u': - vty_ip = optarg; - break; - case 'v': - vty_port = atoi(optarg); + case 'c': + config_file = optarg; break; case 'd': log_parse_category_mask(osmo_stderr_target, optarg); @@ -221,9 +214,43 @@ app && app->contribution ? app->contribution : ""); } +static int _vty_init(struct l23_app_info *app) +{ + static struct vty_app_info l23_vty_info = { + .name = "OsmocomBB", + .version = PACKAGE_VERSION, + }; + int rc; + + OSMO_ASSERT(app->vty_info); + app->vty_info->tall_ctx = l23_ctx; + vty_init(app->vty_info ? : &l23_vty_info); + logging_vty_add_cmds(); + if (app->vty_init) + app->vty_init(); + if (config_file) { + rc = vty_read_config_file(config_file, NULL); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_FATAL, + "Failed to parse the configuration file '%s'\n", config_file); + return rc; + } + LOGP(DLGLOBAL, LOGL_INFO, "Using configuration from '%s'\n", config_file); + } + rc = telnet_init_default(l23_ctx, NULL, OSMO_VTY_PORT_BB); + if (rc < 0) { + LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n", + vty_get_bind_addr(), OSMO_VTY_PORT_BB, strerror(errno)); + return rc; + } + return rc; +} + int main(int argc, char **argv) { int rc; + struct l23_app_info *app; + unsigned int app_supp_opt = 0x00; INIT_LLIST_HEAD(&ms_list); @@ -257,14 +284,23 @@ lapdm_channel_init(&ms->lapdm_channel, LAPDM_MODE_MS); lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); - handle_options(argc, argv); - rc = l23_app_init(ms); if (rc < 0) { fprintf(stderr, "Failed during l23_app_init()\n"); exit(1); } + app = l23_app_info(); + if (app && app->cfg_supported != NULL) + app_supp_opt = app->cfg_supported(); + + handle_options(argc, argv, app); + + if (app_supp_opt & L23_OPT_VTY) { + if (_vty_init(app) < 0) + exit(1); + } + rc = layer2_open(ms, layer2_socket_path); if (rc < 0) { fprintf(stderr, "Failed during layer2_open()\n"); diff --git a/src/host/layer23/src/misc/Makefile.am b/src/host/layer23/src/misc/Makefile.am index 869fe7b..358be74 100644 --- a/src/host/layer23/src/misc/Makefile.am +++ b/src/host/layer23/src/misc/Makefile.am @@ -6,6 +6,7 @@ AM_CFLAGS = \ -Wall \ $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOGPRSRLCMAC_CFLAGS) \ $(LIBGPS_CFLAGS) \ @@ -14,6 +15,7 @@ LDADD = \ $(top_builddir)/src/common/liblayer23.a \ $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOVTY_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOGPRSRLCMAC_LIBS) \ diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 4529642..1852a0d 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -26,6 +26,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/signal.h> #include <osmocom/core/application.h> +#include <osmocom/vty/vty.h> #include <osmocom/gsm/rsl.h> #include <osmocom/gsm/tlv.h> @@ -485,12 +486,25 @@ static int l23_cfg_supported(void) { - return L23_OPT_ARFCN | L23_OPT_TAP | L23_OPT_DBG; + 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, +}; + static struct l23_app_info info = { .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, }; struct l23_app_info *l23_app_info(void) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ife3a3373e5a9c0c8e5959ac714e140e72d6c363a Gerrit-Change-Number: 30950 Gerrit-PatchSet: 5 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: Introduce l23_app_start() API step

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30943 ) Change subject: layer23: Introduce l23_app_start() API step ...................................................................... layer23: Introduce l23_app_start() API step This commit is a preparation towards having shared VTY infrastructure for layer23 apps. Having 2 steps (first init(), then start()) allows the apps easily struct allocation & initialization, and then start doing work after VTY config has been read. Change-Id: I1d232809764962f82fee86159bc61cdbc3eb3c48 --- M src/host/layer23/include/osmocom/bb/common/l23_app.h M src/host/layer23/src/common/main.c M src/host/layer23/src/misc/app_bcch_scan.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/app_cell_log.c M src/host/layer23/src/modem/app_modem.c 7 files changed, 66 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/host/layer23/include/osmocom/bb/common/l23_app.h b/src/host/layer23/include/osmocom/bb/common/l23_app.h index d5f0fd3..a37e1e0 100644 --- a/src/host/layer23/include/osmocom/bb/common/l23_app.h +++ b/src/host/layer23/include/osmocom/bb/common/l23_app.h @@ -13,9 +13,13 @@ L23_OPT_VTYIP = 32, }; -/* initialization, called once when starting the app, before entering - * select loop */ +/* initialization, called once when starting the app, before reading VTY config */ extern int l23_app_init(struct osmocom_ms *ms); + +/* Start work after reading VTY config and starting layer23 components, + * immediately before entering main select loop */ +extern int (*l23_app_start)(struct osmocom_ms *ms); + extern int (*l23_app_work)(struct osmocom_ms *ms); extern int (*l23_app_exit)(struct osmocom_ms *ms); diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 6841313..dcf557f 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -54,6 +54,7 @@ static char *vty_ip = "127.0.0.1"; unsigned short vty_port = 4247; +int (*l23_app_start)(struct osmocom_ms *ms) = NULL; int (*l23_app_work)(struct osmocom_ms *ms) = NULL; int (*l23_app_exit)(struct osmocom_ms *ms) = NULL; int quit = 0; @@ -249,15 +250,6 @@ ms->name = talloc_strdup(ms, "1"); ms->test_arfcn = 871; - - handle_options(argc, argv); - - rc = layer2_open(ms, layer2_socket_path); - if (rc < 0) { - fprintf(stderr, "Failed during layer2_open()\n"); - exit(1); - } - ms->lapdm_channel.lapdm_dcch.l1_ctx = ms; ms->lapdm_channel.lapdm_dcch.l3_ctx = ms; ms->lapdm_channel.lapdm_acch.l1_ctx = ms; @@ -265,9 +257,19 @@ lapdm_channel_init(&ms->lapdm_channel, LAPDM_MODE_MS); lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); + handle_options(argc, argv); + rc = l23_app_init(ms); - if (rc < 0) + if (rc < 0) { + fprintf(stderr, "Failed during l23_app_init()\n"); exit(1); + } + + rc = layer2_open(ms, layer2_socket_path); + if (rc < 0) { + fprintf(stderr, "Failed during layer2_open()\n"); + exit(1); + } if (gsmtap_ip) { gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); @@ -278,6 +280,14 @@ gsmtap_source_add_sink(gsmtap_inst); } + if (l23_app_start) { + rc = l23_app_start(ms); + if (rc < 0) { + fprintf(stderr, "Failed during l23_app_start()\n"); + exit(1); + } + } + signal(SIGINT, sighandler); signal(SIGHUP, sighandler); signal(SIGTERM, sighandler); diff --git a/src/host/layer23/src/misc/app_bcch_scan.c b/src/host/layer23/src/misc/app_bcch_scan.c index 257469c..fc9bca8 100644 --- a/src/host/layer23/src/misc/app_bcch_scan.c +++ b/src/host/layer23/src/misc/app_bcch_scan.c @@ -47,11 +47,17 @@ return 0; } +static int _bcch_scan_start(struct osmocom_ms *ms) +{ + l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); + return 0; +} + int l23_app_init(struct osmocom_ms *ms) { /* don't do layer3_init() as we don't want an actual L3 */ fps_init(); - l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); + l23_app_start = _bcch_scan_start; return osmo_signal_register_handler(SS_L1CTL, &signal_cb, NULL); } diff --git a/src/host/layer23/src/misc/app_cbch_sniff.c b/src/host/layer23/src/misc/app_cbch_sniff.c index 76d4537..d5424ba 100644 --- a/src/host/layer23/src/misc/app_cbch_sniff.c +++ b/src/host/layer23/src/misc/app_cbch_sniff.c @@ -194,17 +194,22 @@ return 0; } -int l23_app_init(struct osmocom_ms *ms) +static int _cbch_sniff_start(struct osmocom_ms *ms) { - /* don't do layer3_init() as we don't want an actual L3 */ - - g_ms = ms; - lapdm_channel_set_l3(&ms->lapdm_channel, &rcv_rsl, ms); - l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); /* FIXME: L1CTL_RES_T_FULL doesn't reset dedicated mode * (if previously set), so we release it here. */ l1ctl_tx_dm_rel_req(ms); + return 0; +} + +int l23_app_init(struct osmocom_ms *ms) +{ + /* don't do layer3_init() as we don't want an actual L3 */ + l23_app_start = _cbch_sniff_start; + g_ms = ms; + + lapdm_channel_set_l3(&ms->lapdm_channel, &rcv_rsl, ms); return osmo_signal_register_handler(SS_L1CTL, &signal_cb, NULL); } diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 04afdcf..cfb4392 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -490,11 +490,17 @@ return 0; } +static int _ccch_scan_start(struct osmocom_ms *ms) +{ + l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); + return 0; +} int l23_app_init(struct osmocom_ms *ms) { + l23_app_start = _ccch_scan_start; + osmo_signal_register_handler(SS_L1CTL, &signal_cb, NULL); - l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); return layer3_init(ms); } diff --git a/src/host/layer23/src/misc/app_cell_log.c b/src/host/layer23/src/misc/app_cell_log.c index abc472d..f1596c3 100644 --- a/src/host/layer23/src/misc/app_cell_log.c +++ b/src/host/layer23/src/misc/app_cell_log.c @@ -42,6 +42,13 @@ char *logname = "/dev/null"; int RACH_MAX = 2; + +int _scan_start(struct osmocom_ms *ms) +{ + l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); + return 0; +} + int _scan_work(struct osmocom_ms *ms) { return 0; @@ -70,6 +77,7 @@ log_parse_category_mask(osmo_stderr_target, "DSUM"); log_set_log_level(osmo_stderr_target, LOGL_INFO); + l23_app_start = _scan_start; l23_app_work = _scan_work; l23_app_exit = _scan_exit; @@ -77,7 +85,6 @@ if (rc) return rc; - l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); printf("Mobile initialized, please start phone now!\n"); return 0; } diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 7551351..4529642 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -464,18 +464,22 @@ return 0; } +static int _modem_start(struct osmocom_ms *ms) +{ + l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); + return 0; +} int l23_app_init(struct osmocom_ms *ms) { + l23_app_start = _modem_start; + log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); log_set_category_filter(osmo_stderr_target, DLCSN1, 1, LOGL_DEBUG); log_set_category_filter(osmo_stderr_target, DRR, 1, LOGL_INFO); osmo_signal_register_handler(SS_L1CTL, &signal_cb, NULL); - l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); - lapdm_channel_set_l3(&ms->lapdm_channel, &modem_rslms_cb, ms); - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1d232809764962f82fee86159bc61cdbc3eb3c48 Gerrit-Change-Number: 30943 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Move extern declaration of l23_ctx to l23_app.h

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30949 ) Change subject: layer23: Move extern declaration of l23_ctx to l23_app.h ...................................................................... layer23: Move extern declaration of l23_ctx to l23_app.h This way all apps can access it. Change-Id: I570d31cc4014b54b47b11a3a52791f62c999cad8 --- M src/host/layer23/include/osmocom/bb/common/l23_app.h M src/host/layer23/src/misc/app_cell_log.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/l23_app.h b/src/host/layer23/include/osmocom/bb/common/l23_app.h index a37e1e0..cb68d43 100644 --- a/src/host/layer23/include/osmocom/bb/common/l23_app.h +++ b/src/host/layer23/include/osmocom/bb/common/l23_app.h @@ -13,6 +13,8 @@ L23_OPT_VTYIP = 32, }; +extern void *l23_ctx; + /* initialization, called once when starting the app, before reading VTY config */ extern int l23_app_init(struct osmocom_ms *ms); diff --git a/src/host/layer23/src/misc/app_cell_log.c b/src/host/layer23/src/misc/app_cell_log.c index f1596c3..43980e9 100644 --- a/src/host/layer23/src/misc/app_cell_log.c +++ b/src/host/layer23/src/misc/app_cell_log.c @@ -34,8 +34,6 @@ #include <l1ctl_proto.h> -extern void *l23_ctx; - extern uint16_t basic_band_range[][2]; extern uint16_t (*band_range)[][2]; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I570d31cc4014b54b47b11a3a52791f62c999cad8 Gerrit-Change-Number: 30949 Gerrit-PatchSet: 3 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-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: cosmetic: layer23/include/common/Makefile.am: Set one item per line

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30953 ) Change subject: cosmetic: layer23/include/common/Makefile.am: Set one item per line ...................................................................... cosmetic: layer23/include/common/Makefile.am: Set one item per line Change-Id: I2e385d403bd37ad9491fd421509fe7e4104225f9 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved fixeria: 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 f9364cd..31bb6b6 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -1,3 +1,15 @@ -noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h logging.h \ - networks.h gps.h sysinfo.h osmocom_data.h utils.h \ - sap_proto.h sap_fsm.h sap_interface.h sim.h +noinst_HEADERS = \ + l1ctl.h \ + l1l2_interface.h \ + l23_app.h \ + logging.h \ + networks.h \ + gps.h \ + sysinfo.h \ + osmocom_data.h \ + utils.h \ + sap_proto.h \ + sap_fsm.h \ + sap_interface.h \ + sim.h \ + $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2e385d403bd37ad9491fd421509fe7e4104225f9 Gerrit-Change-Number: 30953 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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 extern declaration of l23_ctx to l23_app.h

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30949 ) Change subject: layer23: Move extern declaration of l23_ctx to l23_app.h ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I570d31cc4014b54b47b11a3a52791f62c999cad8 Gerrit-Change-Number: 30949 Gerrit-PatchSet: 3 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-Comment-Date: Tue, 17 Jan 2023 09:18:36 +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