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

[M] Change in osmo-smlc[master]: vty: Create smlc_vty.c
by pespin 14 Jul '25

14 Jul '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/40678?usp=email ) Change subject: vty: Create smlc_vty.c ...................................................................... vty: Create smlc_vty.c We already have a smlc_vty.h file, but no usual smlc_vty.c file where we put commands or init functions existed yet. Change-Id: I6899602c3a6e22ee6ff93540466f839b2bf5ccc1 --- M include/osmocom/smlc/smlc_vty.h M src/osmo-smlc/Makefile.am M src/osmo-smlc/smlc_main.c A src/osmo-smlc/smlc_vty.c 4 files changed, 52 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/78/40678/1 diff --git a/include/osmocom/smlc/smlc_vty.h b/include/osmocom/smlc/smlc_vty.h index d5d82f8..1c53a25 100644 --- a/include/osmocom/smlc/smlc_vty.h +++ b/include/osmocom/smlc/smlc_vty.h @@ -5,3 +5,5 @@ enum smlc_vty_node { CELLS_NODE = _LAST_OSMOVTY_NODE + 1, }; + +void smlc_vty_init(struct vty_app_info *vty_app_info); diff --git a/src/osmo-smlc/Makefile.am b/src/osmo-smlc/Makefile.am index 585d1de..185a8d9 100644 --- a/src/osmo-smlc/Makefile.am +++ b/src/osmo-smlc/Makefile.am @@ -32,6 +32,7 @@ smlc_loc_req.c \ smlc_main.c \ smlc_subscr.c \ + smlc_vty.c \ $(NULL) osmo_smlc_LDADD = \ diff --git a/src/osmo-smlc/smlc_main.c b/src/osmo-smlc/smlc_main.c index f72ec4b..a521745 100644 --- a/src/osmo-smlc/smlc_main.c +++ b/src/osmo-smlc/smlc_main.c @@ -40,7 +40,7 @@ #include <osmocom/smlc/debug.h> #include <osmocom/smlc/smlc_data.h> #include <osmocom/smlc/sccp_lb_inst.h> -#include <osmocom/smlc/cell_locations.h> +#include <osmocom/smlc/smlc_vty.h> #define _GNU_SOURCE #include <getopt.h> @@ -241,17 +241,11 @@ g_smlc = smlc_state_alloc(tall_smlc_ctx); - /* This needs to precede handle_options() */ - vty_init(&vty_info); - logging_vty_add_cmds(); - osmo_talloc_vty_add_cmds(); - ctrl_vty_init(tall_smlc_ctx); - cell_locations_vty_init(); - /* Initialize SS7 */ OSMO_ASSERT(osmo_ss7_init() == 0); - osmo_ss7_vty_init_asp(tall_smlc_ctx); - osmo_sccp_vty_init(); + + /* This needs to precede handle_options() */ + smlc_vty_init(&vty_info); /* parse options */ handle_options(argc, argv); diff --git a/src/osmo-smlc/smlc_vty.c b/src/osmo-smlc/smlc_vty.c new file mode 100644 index 0000000..36ca47e --- /dev/null +++ b/src/osmo-smlc/smlc_vty.c @@ -0,0 +1,45 @@ +/* + * (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * Author: Pau Espin Pedrol + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <osmocom/ctrl/control_vty.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/misc.h> + +#include <osmocom/sigtran/osmo_ss7.h> +#include <osmocom/sigtran/sccp_sap.h> + +#include <osmocom/smlc/cell_locations.h> + +void smlc_vty_init(struct vty_app_info *vty_app_info) +{ + vty_init(vty_app_info); + + logging_vty_add_cmds(); + osmo_talloc_vty_add_cmds(); + ctrl_vty_init(vty_app_info->tall_ctx); + osmo_fsm_vty_add_cmds(); + + osmo_ss7_vty_init_asp(vty_app_info->tall_ctx); + osmo_sccp_vty_init(); + + cell_locations_vty_init(); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/40678?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I6899602c3a6e22ee6ff93540466f839b2bf5ccc1 Gerrit-Change-Number: 40678 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-smlc[master]: Introduce stats msc.ran_peers.{total,active}
by pespin 14 Jul '25

14 Jul '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/40679?usp=email ) Change subject: Introduce stats msc.ran_peers.{total,active} ...................................................................... Introduce stats msc.ran_peers.{total,active} osmo_stats_init() was already being called despite no stats were being used. Change-Id: Ib01576036f34ac7f21c5bce0155b50932eb9b72a --- M include/osmocom/smlc/smlc_data.h M src/osmo-smlc/lb_peer.c M src/osmo-smlc/smlc_data.c M src/osmo-smlc/smlc_vty.c 4 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/79/40679/1 diff --git a/include/osmocom/smlc/smlc_data.h b/include/osmocom/smlc/smlc_data.h index dc77507..2e17dd0 100644 --- a/include/osmocom/smlc/smlc_data.h +++ b/include/osmocom/smlc/smlc_data.h @@ -37,6 +37,7 @@ _LAST_CTRL_NODE_SMLC }; +/* rate_ctr */ enum { SMLC_CTR_BSSMAP_LE_RX_UDT_RESET, SMLC_CTR_BSSMAP_LE_RX_UDT_RESET_ACK, @@ -58,3 +59,9 @@ SMLC_CTR_BSSMAP_LE_TX_DT1_PERFORM_LOCATION_RESPONSE, SMLC_CTR_BSSMAP_LE_TX_DT1_BSSLAP_TA_REQUEST, }; + +/* osmo_stat */ +enum { + SMLC_STAT_LB_PEERS_TOTAL, + SMLC_STAT_LB_PEERS_ACTIVE, +}; diff --git a/src/osmo-smlc/lb_peer.c b/src/osmo-smlc/lb_peer.c index ce323c4..3f4c23e 100644 --- a/src/osmo-smlc/lb_peer.c +++ b/src/osmo-smlc/lb_peer.c @@ -23,6 +23,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/logging.h> #include <osmocom/core/fsm.h> +#include <osmocom/core/stat_item.h> #include <osmocom/gsm/bssmap_le.h> #include <osmocom/sigtran/sccp_helpers.h> @@ -57,6 +58,7 @@ fi->priv = lbp; llist_add(&lbp->entry, &sli->lb_peers); + osmo_stat_item_inc(osmo_stat_item_group_get_item(g_smlc->statg, SMLC_STAT_LB_PEERS_TOTAL), 1); return lbp; } @@ -294,6 +296,12 @@ } } +static void lb_peer_st_ready_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + if (prev_state != LB_PEER_ST_READY) + osmo_stat_item_inc(osmo_stat_item_group_get_item(g_smlc->statg, SMLC_STAT_LB_PEERS_ACTIVE), 1); +} + static void lb_peer_st_ready(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct lb_peer *lbp = fi->priv; @@ -368,6 +376,12 @@ } } +static void lb_peer_st_ready_onleave(struct osmo_fsm_inst *fi, uint32_t next_state) +{ + if (next_state != LB_PEER_ST_READY) + osmo_stat_item_dec(osmo_stat_item_group_get_item(g_smlc->statg, SMLC_STAT_LB_PEERS_ACTIVE), 1); +} + static int lb_peer_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct lb_peer *lbp = fi->priv; @@ -375,10 +389,17 @@ return 0; } +/* struct lb_peer destructor: */ static void lb_peer_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct lb_peer *lbp = fi->priv; + lb_peer_discard_all_conns(lbp); + + if (lbp->fi->state == LB_PEER_ST_READY) + osmo_stat_item_dec(osmo_stat_item_group_get_item(g_smlc->statg, SMLC_STAT_LB_PEERS_ACTIVE), 1); + osmo_stat_item_dec(osmo_stat_item_group_get_item(g_smlc->statg, SMLC_STAT_LB_PEERS_TOTAL), 1); + llist_del(&lbp->entry); } @@ -437,6 +458,8 @@ [LB_PEER_ST_READY] = { .name = "READY", .action = lb_peer_st_ready, + .onenter = lb_peer_st_ready_onenter, + .onleave = lb_peer_st_ready_onleave, .in_event_mask = 0 | S(LB_PEER_EV_RX_RESET) | S(LB_PEER_EV_MSG_UP_CO_INITIAL) diff --git a/src/osmo-smlc/smlc_data.c b/src/osmo-smlc/smlc_data.c index d51bceb..10609a5 100644 --- a/src/osmo-smlc/smlc_data.c +++ b/src/osmo-smlc/smlc_data.c @@ -54,6 +54,19 @@ smlc_ctr_description, }; +static const struct osmo_stat_item_desc smlc_stat_item_description[] = { + [SMLC_STAT_LB_PEERS_TOTAL] = { "smlc.lb_peers.total", "Total Lb peers seen since startup", OSMO_STAT_ITEM_NO_UNIT, 4, 0}, + [SMLC_STAT_LB_PEERS_ACTIVE] = { "smlc.lb_peers.active", "Currently active Lb peers", OSMO_STAT_ITEM_NO_UNIT, 4, 0}, +}; + +static const struct osmo_stat_item_group_desc smlc_statg_desc = { + "smlc", + "serving mobile location center", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(smlc_stat_item_description), + smlc_stat_item_description, +}; + struct smlc_state *smlc_state_alloc(void *ctx) { struct smlc_state *smlc = talloc_zero(ctx, struct smlc_state); @@ -61,5 +74,14 @@ INIT_LLIST_HEAD(&smlc->subscribers); INIT_LLIST_HEAD(&smlc->cell_locations); smlc->ctrs = rate_ctr_group_alloc(smlc, &smlc_ctrg_desc, 0); + + smlc->statg = osmo_stat_item_group_alloc(smlc, &smlc_statg_desc, 0); + if (!smlc->statg) + goto ret_free; return smlc; + +ret_free: + rate_ctr_group_free(smlc->ctrs); + talloc_free(smlc); + return NULL; } diff --git a/src/osmo-smlc/smlc_vty.c b/src/osmo-smlc/smlc_vty.c index 36ca47e..c6ae83a 100644 --- a/src/osmo-smlc/smlc_vty.c +++ b/src/osmo-smlc/smlc_vty.c @@ -23,6 +23,8 @@ #include <osmocom/ctrl/control_vty.h> #include <osmocom/vty/logging.h> #include <osmocom/vty/misc.h> +#include <osmocom/vty/stats.h> +#include <osmocom/vty/vty.h> #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/sccp_sap.h> @@ -37,6 +39,7 @@ osmo_talloc_vty_add_cmds(); ctrl_vty_init(vty_app_info->tall_ctx); osmo_fsm_vty_add_cmds(); + osmo_stats_vty_add_cmds(); osmo_ss7_vty_init_asp(vty_app_info->tall_ctx); osmo_sccp_vty_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/40679?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ib01576036f34ac7f21c5bce0155b50932eb9b72a Gerrit-Change-Number: 40679 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: smlc: Use static sigtran config between osmo-msc and osmo-stp
by pespin 14 Jul '25

14 Jul '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40676?usp=email ) Change subject: smlc: Use static sigtran config between osmo-msc and osmo-stp ...................................................................... smlc: Use static sigtran config between osmo-msc and osmo-stp This allows referencing/accessing the specific ASP in osmo-stp, which will be needed in a follow-up commit to test IUT behavior when the SCTP conn is dropped. Change-Id: I008dba252da29f445c52151c7b65428ca7054ed0 Related: OS#5917 --- M smlc/osmo-smlc.cfg M smlc/osmo-stp.cfg 2 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/40676/1 diff --git a/smlc/osmo-smlc.cfg b/smlc/osmo-smlc.cfg index ffc5a4f..d25c873 100644 --- a/smlc/osmo-smlc.cfg +++ b/smlc/osmo-smlc.cfg @@ -16,11 +16,16 @@ bind 0.0.0.0 cs7 instance 0 - asp asp-clnt-msc-0 2905 2905 m3ua + point-code 0.23.6 + asp asp-clnt-Lb-0 2905 2905 m3ua local-ip 127.0.0.20 remote-ip 127.0.0.200 role asp sctp-role client + as as-clnt-Lb m3ua + asp asp-clnt-Lb-0 + routing-key 6 0.23.6 + cells lac-ci 23 42 lat 23.23 lon 42.42 cgi 001 02 3 4 lat 5.678 lon 6.789 diff --git a/smlc/osmo-stp.cfg b/smlc/osmo-stp.cfg index f1491a7..2dfe1a1 100644 --- a/smlc/osmo-stp.cfg +++ b/smlc/osmo-stp.cfg @@ -25,6 +25,14 @@ ! cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted + asp smlc0-0 2905 2905 m3ua + local-ip 127.0.0.200 + remote-ip 127.0.0.20 + role sg + sctp-role server + as smlc0 m3ua + asp smlc0-0 + routing-key 6 0.23.6 asp virt-bsc0-0 23905 2905 m3ua local-ip 127.0.0.200 remote-ip 127.0.0.203 @@ -36,6 +44,7 @@ route-table system update route 0.23.3 7.255.7 linkset virt-bsc0 + update route 0.23.6 7.255.7 linkset smlc0 listen m3ua 2905 - accept-asp-connections dynamic-permitted + accept-asp-connections pre-configured local-ip 127.0.0.200 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40676?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I008dba252da29f445c52151c7b65428ca7054ed0 Gerrit-Change-Number: 40676 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: xua_asp_fsm: Log rx ASPAC with unknown rctx
by pespin 14 Jul '25

14 Jul '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40675?usp=email ) Change subject: xua_asp_fsm: Log rx ASPAC with unknown rctx ...................................................................... xua_asp_fsm: Log rx ASPAC with unknown rctx This is useful to quickly spot misconfigurations when setting up 2 peers to communicate. Change-Id: Id00a8b970320f545b361357d162c26aa9db70209 --- M src/xua_asp_fsm.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/75/40675/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 70fb0b3..b7c6947 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -632,6 +632,9 @@ uint32_t rctx = osmo_load32be(&part->dat[i * sizeof(uint32_t)]); as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); if (!as) { + LOGPFSML(fi, LOGL_NOTICE, + "ASPAC: Couldn't find any AS with rctx=%u. Check your config!\n", + rctx); peer_send_error(fi, M3UA_ERR_INVAL_ROUT_CTX); return; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40675?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Id00a8b970320f545b361357d162c26aa9db70209 Gerrit-Change-Number: 40675 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: ran_peer: Introduce stats msc.ran_peers.{total,active}
by pespin 14 Jul '25

14 Jul '25

Attention is currently required from: fixeria, laforge, neels. Hello Jenkins Builder, fixeria, laforge, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/40633?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ran_peer: Introduce stats msc.ran_peers.{total,active} ...................................................................... ran_peer: Introduce stats msc.ran_peers.{total,active} Change-Id: I36e40510c9a95f0c9cf5f32d2a7baab840aa8660 --- M include/osmocom/msc/gsm_data.h M src/libmsc/ran_peer.c 2 files changed, 34 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/40633/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/40633?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I36e40510c9a95f0c9cf5f32d2a7baab840aa8660 Gerrit-Change-Number: 40633 Gerrit-PatchSet: 6 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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-smlc[master]: smlc: Initial implementation of N-PCSTATE.ind
by pespin 14 Jul '25

14 Jul '25

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-smlc/+/40665?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: smlc: Initial implementation of N-PCSTATE.ind ...................................................................... smlc: Initial implementation of N-PCSTATE.ind Related: OS#5917 Change-Id: Id034a0c4d8bff0647a64658480dfa9b4cea563de --- M include/osmocom/smlc/lb_peer.h M src/osmo-smlc/lb_peer.c M src/osmo-smlc/sccp_lb_inst.c 3 files changed, 155 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/65/40665/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/40665?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Id034a0c4d8bff0647a64658480dfa9b4cea563de Gerrit-Change-Number: 40665 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[XS] Change in osmo-smlc[master]: lb_peer: Drop unused events CONNECTION_{SUCCESS,TIMEOUT}
by pespin 14 Jul '25

14 Jul '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/40674?usp=email ) Change subject: lb_peer: Drop unused events CONNECTION_{SUCCESS,TIMEOUT} ...................................................................... lb_peer: Drop unused events CONNECTION_{SUCCESS,TIMEOUT} Change-Id: If5d838e3c0cfdb08ea8a96330ea1de4fa73e091a --- M include/osmocom/smlc/lb_peer.h M src/osmo-smlc/lb_peer.c 2 files changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/74/40674/1 diff --git a/include/osmocom/smlc/lb_peer.h b/include/osmocom/smlc/lb_peer.h index dc226fa..5851a95 100644 --- a/include/osmocom/smlc/lb_peer.h +++ b/include/osmocom/smlc/lb_peer.h @@ -49,8 +49,6 @@ LB_PEER_EV_MSG_DOWN_CO, LB_PEER_EV_RX_RESET, LB_PEER_EV_RX_RESET_ACK, - LB_PEER_EV_CONNECTION_SUCCESS, - LB_PEER_EV_CONNECTION_TIMEOUT, }; struct lb_peer_ev_ctx { diff --git a/src/osmo-smlc/lb_peer.c b/src/osmo-smlc/lb_peer.c index 84d48fc..54e0ad2 100644 --- a/src/osmo-smlc/lb_peer.c +++ b/src/osmo-smlc/lb_peer.c @@ -363,8 +363,6 @@ OSMO_VALUE_STRING(LB_PEER_EV_MSG_DOWN_CO), OSMO_VALUE_STRING(LB_PEER_EV_RX_RESET), OSMO_VALUE_STRING(LB_PEER_EV_RX_RESET_ACK), - OSMO_VALUE_STRING(LB_PEER_EV_CONNECTION_SUCCESS), - OSMO_VALUE_STRING(LB_PEER_EV_CONNECTION_TIMEOUT), {} }; @@ -378,7 +376,6 @@ | S(LB_PEER_EV_RX_RESET) | S(LB_PEER_EV_MSG_UP_CO_INITIAL) | S(LB_PEER_EV_MSG_UP_CO) - | S(LB_PEER_EV_CONNECTION_TIMEOUT) , .out_state_mask = 0 | S(LB_PEER_ST_WAIT_RX_RESET) @@ -395,7 +392,6 @@ | S(LB_PEER_EV_RX_RESET_ACK) | S(LB_PEER_EV_MSG_UP_CO_INITIAL) | S(LB_PEER_EV_MSG_UP_CO) - | S(LB_PEER_EV_CONNECTION_TIMEOUT) , .out_state_mask = 0 | S(LB_PEER_ST_WAIT_RX_RESET) -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/40674?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: If5d838e3c0cfdb08ea8a96330ea1de4fa73e091a Gerrit-Change-Number: 40674 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-smlc[master]: lb_peer: Mark multiple funcs as static
by pespin 14 Jul '25

14 Jul '25

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-smlc/+/40673?usp=email ) Change subject: lb_peer: Mark multiple funcs as static ...................................................................... lb_peer: Mark multiple funcs as static Change-Id: I7178608444f72bfb93b816a0bedee336a5b4cafe --- M include/osmocom/smlc/lb_peer.h M src/osmo-smlc/lb_peer.c 2 files changed, 18 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/73/40673/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/40673?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I7178608444f72bfb93b816a0bedee336a5b4cafe Gerrit-Change-Number: 40673 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-smlc[master]: lb_peer: Mark multiple funcs as stati
by pespin 14 Jul '25

14 Jul '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/40673?usp=email ) Change subject: lb_peer: Mark multiple funcs as stati ...................................................................... lb_peer: Mark multiple funcs as stati Change-Id: I7178608444f72bfb93b816a0bedee336a5b4cafe --- M include/osmocom/smlc/lb_peer.h M src/osmo-smlc/lb_peer.c 2 files changed, 18 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/73/40673/1 diff --git a/include/osmocom/smlc/lb_peer.h b/include/osmocom/smlc/lb_peer.h index 7eabe4d..dc226fa 100644 --- a/include/osmocom/smlc/lb_peer.h +++ b/include/osmocom/smlc/lb_peer.h @@ -64,4 +64,3 @@ int lb_peer_up_l2(struct sccp_lb_inst *sli, const struct osmo_sccp_addr *calling_addr, bool co, uint32_t conn_id, struct msgb *l2); -void lb_peer_disconnect(struct sccp_lb_inst *sli, uint32_t conn_id); diff --git a/src/osmo-smlc/lb_peer.c b/src/osmo-smlc/lb_peer.c index f2dc715..84d48fc 100644 --- a/src/osmo-smlc/lb_peer.c +++ b/src/osmo-smlc/lb_peer.c @@ -88,7 +88,7 @@ #define lb_peer_state_chg(LB_PEER, NEXT_STATE) \ osmo_tdef_fsm_inst_state_chg((LB_PEER)->fi, NEXT_STATE, lb_peer_fsm_timeouts, g_smlc_tdefs, 5) -void lb_peer_discard_all_conns(struct lb_peer *lbp) +static void lb_peer_discard_all_conns(struct lb_peer *lbp) { struct lb_conn *lb_conn, *next; @@ -137,7 +137,7 @@ lb_peer_state_chg(lbp, LB_PEER_ST_READY); } -void lb_peer_reset(struct lb_peer *lbp) +static void lb_peer_reset(struct lb_peer *lbp) { struct bssap_le_pdu reset = { .discr = BSSAP_LE_MSG_DISCR_BSSMAP_LE, @@ -167,7 +167,18 @@ } } -void lb_peer_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) +static void lb_peer_disconnect(struct sccp_lb_inst *sli, uint32_t conn_id) +{ + struct lb_conn *lb_conn; + llist_for_each_entry(lb_conn, &sli->lb_conns, entry) { + if (lb_conn->sccp_conn_id == conn_id) { + lb_conn_discard(lb_conn); + return; + } + } +} + +static void lb_peer_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct lb_peer *lbp = fi->priv; struct lb_peer_ev_ctx *ctx = data; @@ -196,7 +207,7 @@ } } -void lb_peer_st_wait_rx_reset(struct osmo_fsm_inst *fi, uint32_t event, void *data) +static void lb_peer_st_wait_rx_reset(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct lb_peer *lbp = fi->priv; struct lb_peer_ev_ctx *ctx; @@ -230,7 +241,7 @@ } } -void lb_peer_st_wait_rx_reset_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +static void lb_peer_st_wait_rx_reset_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct lb_peer *lbp = fi->priv; struct lb_peer_ev_ctx *ctx; @@ -265,7 +276,7 @@ } } -void lb_peer_st_ready(struct osmo_fsm_inst *fi, uint32_t event, void *data) +static void lb_peer_st_ready(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct lb_peer *lbp = fi->priv; struct lb_peer_ev_ctx *ctx; @@ -336,7 +347,7 @@ return 0; } -void lb_peer_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +static void lb_peer_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct lb_peer *lbp = fi->priv; lb_peer_discard_all_conns(lbp); @@ -482,14 +493,3 @@ return osmo_fsm_inst_dispatch(lb_peer->fi, event, &ctx); } - -void lb_peer_disconnect(struct sccp_lb_inst *sli, uint32_t conn_id) -{ - struct lb_conn *lb_conn; - llist_for_each_entry(lb_conn, &sli->lb_conns, entry) { - if (lb_conn->sccp_conn_id == conn_id) { - lb_conn_discard(lb_conn); - return; - } - } -} -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/40673?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I7178608444f72bfb93b816a0bedee336a5b4cafe Gerrit-Change-Number: 40673 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-smlc[master]: lb_peer: Constify ptr arg in lb_peer_find()
by pespin 14 Jul '25

14 Jul '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/40672?usp=email ) Change subject: lb_peer: Constify ptr arg in lb_peer_find() ...................................................................... lb_peer: Constify ptr arg in lb_peer_find() Change-Id: Ia1da7ad3f6410a47c3e8d4e4f7f534073f2e0116 --- M include/osmocom/smlc/lb_peer.h M src/osmo-smlc/lb_peer.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/72/40672/1 diff --git a/include/osmocom/smlc/lb_peer.h b/include/osmocom/smlc/lb_peer.h index b5ac6d6..7eabe4d 100644 --- a/include/osmocom/smlc/lb_peer.h +++ b/include/osmocom/smlc/lb_peer.h @@ -60,7 +60,7 @@ }; struct lb_peer *lb_peer_find_or_create(struct sccp_lb_inst *sli, const struct osmo_sccp_addr *peer_addr); -struct lb_peer *lb_peer_find(struct sccp_lb_inst *sli, const struct osmo_sccp_addr *peer_addr); +struct lb_peer *lb_peer_find(const struct sccp_lb_inst *sli, const struct osmo_sccp_addr *peer_addr); int lb_peer_up_l2(struct sccp_lb_inst *sli, const struct osmo_sccp_addr *calling_addr, bool co, uint32_t conn_id, struct msgb *l2); diff --git a/src/osmo-smlc/lb_peer.c b/src/osmo-smlc/lb_peer.c index 5206628..f2dc715 100644 --- a/src/osmo-smlc/lb_peer.c +++ b/src/osmo-smlc/lb_peer.c @@ -69,7 +69,7 @@ return lb_peer_alloc(sli, peer_addr); } -struct lb_peer *lb_peer_find(struct sccp_lb_inst *sli, const struct osmo_sccp_addr *peer_addr) +struct lb_peer *lb_peer_find(const struct sccp_lb_inst *sli, const struct osmo_sccp_addr *peer_addr) { struct lb_peer *lbp; llist_for_each_entry(lbp, &sli->lb_peers, entry) { -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/40672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ia1da7ad3f6410a47c3e8d4e4f7f534073f2e0116 Gerrit-Change-Number: 40672 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0