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

Change in libosmocore[master]: libosmogsm: Add osmo_io support to ipa

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30935 ) Change subject: libosmogsm: Add osmo_io support to ipa ...................................................................... Patch Set 3: (3 comments) Patchset: PS3: If those empty functions still need to be filled, the patch should be marked as WIP File include/osmocom/gsm/ipa.h: https://gerrit.osmocom.org/c/libosmocore/+/30935/comment/67134f02_64728a87 PS3, Line 60: ipa_ccm_send_pong_iofd do we really want to expose even more of those low-level functions into the global namespace? The point of osmo_io is to achieve a higher level of abstraction, so nobody except the I/O framework should ever want to use those low-level functions anymore. Also, in general I think the new high-level IPA-on-osmo_io should all be in libosmocore so programs that don't do anything abis/trau/e1 related don't need to depend on libosmo-abis. File src/gsm/ipa.c: https://gerrit.osmocom.org/c/libosmocore/+/30935/comment/2cb358d6_e007c895 PS3, Line 814: v what is the purpose of those empty functions here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0f955d5a36afe7a08d31b8ba4185260362c2bcca Gerrit-Change-Number: 30935 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 11:27:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Add osmo_io with initial poll backend

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30934 ) Change subject: Add osmo_io with initial poll backend ...................................................................... Patch Set 3: (10 comments) File src/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/9bae02a3_ce85f35f PS3, Line 389: g_backend == OSMO_IO_BACKEND_POLL ? "poll" : "uring" there might be more in the future, it might be worth having a separate value_string for that rather than explicitly hard-coding the names on the caller side here. Also, it doesn't hurt to log the actaul fd number while we're logging something anyway. https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/a750a7b0_dc9a555c PS3, Line 406: / c++ style comment https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/c23a484a_4615b9f0 PS3, Line 430: osmo_iofd_get_priv please rename to osmo_iofd_get_priv_nr(). "priv" is also sometimes used as alias to "data" in kernel and osmocom. If we remove the argument from the setup function, then we also need a set_priv_nr(). File src/osmo_io_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/221f9c34_279a479c PS3, Line 17: in I'm wondering if it had any advantage to have only a single function with an argument stating the "operation"? The prototype is almost identical (just int/void return). I'm not sure it would have any advantage. Probably none. https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/4851bdb7_ac9ffd4a PS3, Line 72: struct { : bool read_enabled; : bool read_pending; : bool write_pending; : bool write_enabled; : /* TODO: index into array of registered fd's? */ : } uring; should this maybe introduced only in the actual io_oring patch? File src/osmo_io_poll.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/620c95b7_ad90f478 PS3, Line 84: / maybe still look into this before merging it? https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/26ed1231_29e5d8c9 PS3, Line 114: extraneous empty line https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/85d8716d_adce74ab PS3, Line 117: { coding style https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/d4b0e7dc_8388e60e PS3, Line 143: / same as above https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/13c1983d_94d3470c PS3, Line 146: i should be static? same as all of the iofd_poll_ functions which are exposed as callback via iofd_poll_ops and don't need to be exported as global functions -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Gerrit-Change-Number: 30934 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 11:24:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Add osmo_io with initial poll backend

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30934 ) Change subject: Add osmo_io with initial poll backend ...................................................................... Patch Set 3: (8 comments) Patchset: PS3: In general I think we need to think about naming / namespace pollution. I guess the iofd_* functions are non-static as they will end up geting used form the io_uring backend in another file? Unfortunately, for historical reasons, libosmocore doesn't have a .map file so all the non-static symbols become publicly accessible to applications. And the general rule for (new) library-exported symbols is to use the osmo_ prefix. So I think the cleanest approach would actually be to introduce a .map file and then only export the osmo_iofd_* functions that way, while keeping the iofd_* non-static but not exported? File src/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/82a7173e_92c7c48e PS3, Line 157: */ not critical: I usually put the end-of-comment on the previous line to save extraneous lines in the file (more context on the screen) and to optically have the doxygen-docs directly above the function definition, without a (mostly) empty line. https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/6f6a2141_d40e53cb PS3, Line 203: e no doxygen docs, but function is exported https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/d3f6a27e_69281393 PS3, Line 224: superfluous superflous IMHO means that it's not needed. Maybe "extraneous"? "leftover"? "pending"? https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/d3baccb7_7397c510 PS3, Line 271: { coding style https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/7903a154_ac2309c6 PS3, Line 306: { coding style https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/430479e2_d7e320ad PS3, Line 356: unsigned int size, unsigned int headroom, : int fd we have three integer argiuments after each other, and lots of arguments, which makes it easy to have bugs on the caller side. Maybe we should re-order them somehow (or reduce, if possible)? Logically I would say that "ctx, fd" should be the two first arguments, as we usually have the object the call relates to/on as the first argument, prefixed by th ctx. https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/d5e0682b_122c0ff0 PS3, Line 358: unsigned int priv_nr given that there's only one known legacy user of the priv_nr (libosmo-abis), maybe we remove this from the function prototype fore new API. Those few callers that actually care can still set it in the io_fd that is returned from this function? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Gerrit-Change-Number: 30934 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 11:15:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Let each app allocate its ms obj and start layer2 when needed

by osmith

Attention is currently required from: neels, pespin, msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30979 ) Change subject: layer23: Let each app allocate its ms obj and start layer2 when needed ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I32f99df76a5513eff9df5489d28d60aedf96dec3 Gerrit-Change-Number: 30979 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 11:08:56 +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 layer2-socket VTY command to common/

by osmith

Attention is currently required from: neels, pespin, msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30978 ) Change subject: layer23: Move layer2-socket VTY command to common/ ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/host/layer23/src/common/vty.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30978/comment/532b44ca_cbdc8276 PS3, Line 55: l23_vty_restart maybe: l23_vty_restart_msg? because this function doesn't restart it, it just prints a message to remind the user. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If7419f8fc54a54eed68a076968d93dba5ac977b7 Gerrit-Change-Number: 30978 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 10:56:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Move '(no) shutdown' VTY code to common/vty.c

by osmith

Attention is currently required from: neels, pespin, msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30972 ) Change subject: layer23: Move '(no) shutdown' VTY code to common/vty.c ...................................................................... Patch Set 4: Code-Review+1 (3 comments) Patchset: PS4: LGTM besides the unresolved comment File doc/examples/modem/modem.cfg: https://gerrit.osmocom.org/c/osmocom-bb/+/30972/comment/f3ebaeca_94c48be2 PS2, Line 1: ! > It's not unrelated. […] Done File src/host/layer23/include/osmocom/bb/common/osmocom_data.h: https://gerrit.osmocom.org/c/osmocom-bb/+/30972/comment/b0832ece_228e519d PS2, Line 37: struct osmobb_l23_vty_sig_data { > because more commands will probably be added later. […] still unresolved, the union wasn't added yet -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib5c9b6f3efa255d67980945db9f98dd8a112af0e Gerrit-Change-Number: 30972 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 10:49:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Move script_lua_close() call outside of settings.c

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30977 ) Change subject: layer23: Move script_lua_close() call outside of settings.c ...................................................................... layer23: Move script_lua_close() call outside of settings.c The only caller of gsm_settings_exit() is in app_mobile so far, which is the only app supporting/using lua scripting so far. Change-Id: I634a4514ead9d064e7509c3fbbb3a2c89c7f3a56 --- M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/settings.c 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index b4466de..a161fc3 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -417,6 +417,7 @@ if (ms->deleting) { gsm_settings_exit(ms); + script_lua_close(ms); llist_del(&ms->entity); talloc_free(ms); work = 1; diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index b6e251b..3d4d712 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -160,9 +160,6 @@ llist_del(&abbrev->list); talloc_free(abbrev); } - - script_lua_close(ms); - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I634a4514ead9d064e7509c3fbbb3a2c89c7f3a56 Gerrit-Change-Number: 30977 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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 submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30975 ) Change subject: layer23: Move settings.{c,h} under common/ ...................................................................... layer23: Move settings.{c,h} under common/ Some of those can be reused by other apps (like modem). Change-Id: I0a741b2384195d512fdc49eda6762241f385b1f1 --- 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/settings.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/settings.c M src/host/layer23/src/mobile/Makefile.am M src/host/layer23/src/mobile/gsm322.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/mnccms.c 10 files changed, 8 insertions(+), 8 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 f09353b..270f079 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -12,6 +12,7 @@ sap_proto.h \ sap_fsm.h \ sap_interface.h \ + settings.h \ sim.h \ subscriber.h \ support.h \ diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index db6b276..9fd4c7a 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -5,9 +5,8 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/core/write_queue.h> -/* FIXME no 'mobile' specific stuff should be here */ -#include <osmocom/bb/mobile/settings.h> #include <osmocom/gsm/lapdm.h> +#include <osmocom/bb/common/settings.h> #include <osmocom/bb/common/subscriber.h> #include <osmocom/bb/common/support.h> #include <osmocom/bb/common/sap_interface.h> diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h similarity index 100% rename from src/host/layer23/include/osmocom/bb/mobile/settings.h rename to src/host/layer23/include/osmocom/bb/common/settings.h diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index 6d9950b..14694bb 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 \ + gsm48_rr.h mncc.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 4dfa1f3..9abc802 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -23,6 +23,7 @@ sap_fsm.c \ sap_proto.c \ sap_interface.c \ + settings.c \ sim.c \ subscriber.c \ support.c \ diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/common/settings.c similarity index 98% rename from src/host/layer23/src/mobile/settings.c rename to src/host/layer23/src/common/settings.c index 3d4d712..d607aff 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -21,7 +21,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/bb/mobile/app_mobile.h> -#include <osmocom/bb/mobile/settings.h> +#include <osmocom/bb/common/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/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index dedee5f..b87063b 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -27,7 +27,6 @@ mnccms.c \ mncc_sock.c \ primitives.c \ - settings.c \ transaction.c \ vty_interface.c \ voice.c \ diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 4b73594..df26e82 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -35,11 +35,11 @@ #include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/utils.h> +#include <osmocom/bb/common/settings.h> #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/app_mobile.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/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 87a0dcd..5d5e003 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -76,11 +76,11 @@ #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/utils.h> +#include <osmocom/bb/common/settings.h> #include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/vty.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 16cabc1..bfc95e4 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -26,10 +26,10 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/ms.h> +#include <osmocom/bb/common/settings.h> #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); -- 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-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: settings.h: Add missing type forward declaration

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30976 ) Change subject: mobile: settings.h: Add missing type forward declaration ...................................................................... mobile: settings.h: Add missing type forward declaration Change-Id: Ibdfa905e2bd24f03d23ce114e969647b07a2009f --- M src/host/layer23/include/osmocom/bb/mobile/settings.h 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h index 7b64e40..c9a3622 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/settings.h +++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h @@ -4,6 +4,8 @@ #include <osmocom/core/utils.h> #include <osmocom/core/linuxlist.h> +struct osmocom_ms; + #define MOB_C7_DEFLT_ANY_TIMEOUT 30 /* CC (Call Control) message handling entity */ 1 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/+/30976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibdfa905e2bd24f03d23ce114e969647b07a2009f Gerrit-Change-Number: 30976 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Initialize osmocom_ms further in common code

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30971 ) Change subject: layer23: Initialize osmocom_ms further in common code ...................................................................... layer23: Initialize osmocom_ms further in common code Change-Id: Ic629cf229167ddd4c533a2abf1b82ad78d1144a9 --- M src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/src/common/main.c M src/host/layer23/src/common/ms.c M src/host/layer23/src/mobile/app_mobile.c 4 files changed, 14 insertions(+), 14 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/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index b9c9276..bbb5491 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -99,4 +99,4 @@ char *lua_script; }; -struct osmocom_ms *osmocom_ms_alloc(void *ctx); +struct osmocom_ms *osmocom_ms_alloc(void *ctx, const char *name); diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 61a8604..8017898 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -268,9 +268,8 @@ print_copyright(); - ms = osmocom_ms_alloc(l23_ctx); + ms = osmocom_ms_alloc(l23_ctx, "1"); OSMO_ASSERT(ms); - llist_add_tail(&ms->entity, &ms_list); rc = l23_app_init(ms); if (rc < 0) { diff --git a/src/host/layer23/src/common/ms.c b/src/host/layer23/src/common/ms.c index 0b1ccb8..74dabc2 100644 --- a/src/host/layer23/src/common/ms.c +++ b/src/host/layer23/src/common/ms.c @@ -19,15 +19,18 @@ #include <osmocom/bb/common/ms.h> -struct osmocom_ms *osmocom_ms_alloc(void *ctx) +extern struct llist_head ms_list; + +struct osmocom_ms *osmocom_ms_alloc(void *ctx, const char *name) { struct osmocom_ms *ms; ms = talloc_zero(ctx, struct osmocom_ms); if (!ms) return NULL; + talloc_set_name(ms, "ms_%s", name); - ms->name = talloc_strdup(ms, "1"); + ms->name = talloc_strdup(ms, name); ms->test_arfcn = 871; ms->lapdm_channel.lapdm_dcch.l1_ctx = ms; ms->lapdm_channel.lapdm_dcch.l3_ctx = ms; @@ -36,5 +39,11 @@ lapdm_channel_init(&ms->lapdm_channel, LAPDM_MODE_MS); lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); + ms->l2_wq.bfd.fd = -1; + ms->sap_wq.bfd.fd = -1; + + /* Register a new MS */ + llist_add_tail(&ms->entity, &ms_list); + return ms; } diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 5bf765a..b2133f7 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -335,20 +335,12 @@ { static struct osmocom_ms *ms; - ms = talloc_zero(l23_ctx, struct osmocom_ms); + ms = osmocom_ms_alloc(l23_ctx, name); if (!ms) { LOGP(DMOB, LOGL_ERROR, "Failed to allocate MS: %s\n", name); return NULL; } - talloc_set_name(ms, "ms_%s", name); - ms->name = talloc_strdup(ms, name); - ms->l2_wq.bfd.fd = -1; - ms->sap_wq.bfd.fd = -1; - - /* Register a new MS */ - llist_add_tail(&ms->entity, &ms_list); - gsm_support_init(ms); gsm_settings_init(ms); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic629cf229167ddd4c533a2abf1b82ad78d1144a9 Gerrit-Change-Number: 30971 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: neels <nhofmeyr(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-MessageType: merged

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023