March 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-hnbgw[master]: rename hnbgw_peek_l3 to hnbgw_peek_l3_ul as it's uplink only

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36207?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: rename hnbgw_peek_l3 to hnbgw_peek_l3_ul as it's uplink only ...................................................................... rename hnbgw_peek_l3 to hnbgw_peek_l3_ul as it's uplink only Let's not make the functions appear more generic than they are: They all explicitly only support uplink so far. Change-Id: I7db0d933a8f17f8c410141f43dab12b8c19fc8ae --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw_l3.c M src/osmo-hnbgw/hnbgw_rua.c 3 files changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/07/36207/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7db0d933a8f17f8c410141f43dab12b8c19fc8ae Gerrit-Change-Number: 36207 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36206?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul ...................................................................... cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul Those functions have always been handling only unit-data in uplink direction, so let's reflect that in the function name to prevent anyone assuming they process connection-oriented RANAP and/or the downlink direction. Change-Id: I29e8176ac19b2e7390e5950b8d0944c8961e491f --- M include/osmocom/hnbgw/hnbgw_ranap.h M src/osmo-hnbgw/hnbgw_ranap.c M src/osmo-hnbgw/hnbgw_rua.c 3 files changed, 31 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/06/36206/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36206?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I29e8176ac19b2e7390e5950b8d0944c8961e491f Gerrit-Change-Number: 36206 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: don't forward paging requests to HNB's not yet registered

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36208?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: don't forward paging requests to HNB's not yet registered ...................................................................... don't forward paging requests to HNB's not yet registered Change-Id: I22ddfea1c6e13e91acecaf731b446e2de0976892 --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/08/36208/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36208?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I22ddfea1c6e13e91acecaf731b446e2de0976892 Gerrit-Change-Number: 36208 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: cosmetic: align downlink RANAP unitdata function names with uplink

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36210?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: cosmetic: align downlink RANAP unitdata function names with uplink ...................................................................... cosmetic: align downlink RANAP unitdata function names with uplink In uplink we use *ranap_rx_udt_ul*, so let's use the same naming pattern for processing dowlink unit-data messages to make things more consistent. Also, make sure udt is always part of functions that only handle unitdata - not to be confused with connection-oriented messages. Change-Id: I1792e4c2cdce145ae906c181898163bcda36328d --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/10/36210/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36210?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1792e4c2cdce145ae906c181898163bcda36328d Gerrit-Change-Number: 36210 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: stats: Introduce CNLINK counter macros

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36211?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: stats: Introduce CNLINK counter macros ...................................................................... stats: Introduce CNLINK counter macros Ever since the ancient days of OpenBSC, we've always had macros to abbreviate the cumbersome 'rate_ctr_inc(rate_ctr_group_get_ctr(...))' construct. Somehow this was missed here. Also, since 2018 (libosmocore.git 175a4ae93aaf1068b61041dca12962059d65ed55) we have rate_ctr_inc2() to make it even simpler... Change-Id: I2754d7aa9d6c3e333bd729bc6e924c502b40cdad --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw_cn.c 2 files changed, 25 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/11/36211/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36211?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2754d7aa9d6c3e333bd729bc6e924c502b40cdad Gerrit-Change-Number: 36211 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: stats: Introduce CNPOOL counter macro

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36212?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: stats: Introduce CNPOOL counter macro ...................................................................... stats: Introduce CNPOOL counter macro Ever since the ancient days of OpenBSC, we've always had macros to abbreviate the cumbersome 'rate_ctr_inc(rate_ctr_group_get_ctr(...))' construct. Somehow this was missed here. Also, since 2018 (libosmocore.git 175a4ae93aaf1068b61041dca12962059d65ed55) we have rate_ctr_inc2() to make it even simpler... Change-Id: I5b9e6b2069eed533c472cea8483a370f7fcc8e74 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw_cn.c 2 files changed, 22 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/12/36212/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36212?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5b9e6b2069eed533c472cea8483a370f7fcc8e74 Gerrit-Change-Number: 36212 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: cosmetic: Fix comment in mgw_fsm.c: One RAB per context_map, not hnb!

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36215?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: cosmetic: Fix comment in mgw_fsm.c: One RAB per context_map, not hnb! ...................................................................... cosmetic: Fix comment in mgw_fsm.c: One RAB per context_map, not hnb! Change-Id: I0cecccd94ba9c1b14de083265a394a210b758b92 --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/15/36215/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36215?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0cecccd94ba9c1b14de083265a394a210b758b92 Gerrit-Change-Number: 36215 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: cosmetic: talk about cs_rab_ass_* when working in CS domain

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36216?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: cosmetic: talk about cs_rab_ass_* when working in CS domain ...................................................................... cosmetic: talk about cs_rab_ass_* when working in CS domain There's RAB assignment for CS and PS, let's not name functions too generic to avoid confusion. Change-Id: Id49ef931e11958315d612d764bbc488ef43f4290 --- M include/osmocom/hnbgw/mgw_fsm.h M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/mgw_fsm.c 4 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/16/36216/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36216?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id49ef931e11958315d612d764bbc488ef43f4290 Gerrit-Change-Number: 36216 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnodeb[master]: llsk: Add APIs to interact with llsk->link

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/36246?usp=email ) Change subject: llsk: Add APIs to interact with llsk->link ...................................................................... llsk: Add APIs to interact with llsk->link This also clarifies the type of available uses/features. Change-Id: I7723467d34670f89710f55c0c6731e2e38560f35 --- M include/osmocom/hnodeb/llsk.h M src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/llsk.c M src/osmo-hnodeb/main.c 4 files changed, 27 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/46/36246/1 diff --git a/include/osmocom/hnodeb/llsk.h b/include/osmocom/hnodeb/llsk.h index bde531a..6a2686a 100644 --- a/include/osmocom/hnodeb/llsk.h +++ b/include/osmocom/hnodeb/llsk.h @@ -30,6 +30,8 @@ struct rtp_conn; int hnb_llsk_alloc(struct hnb *hnb); +void hnb_llsk_free(struct hnb *hnb); +int hnb_llsk_start_listen(struct hnb *hnb); bool hnb_llsk_connected(const struct hnb *hnb); bool hnb_llsk_can_be_configured(struct hnb *hnb); diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index 1d03826..ad56dcc 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -88,9 +88,7 @@ } hnb_iuh_free(hnb); - osmo_timer_del(&hnb->llsk.defer_configure_ind_timer); - osmo_prim_srv_link_free(hnb->llsk.link); - hnb->llsk.link = NULL; + hnb_llsk_free(hnb); hnb_gtp_unbind(hnb); diff --git a/src/osmo-hnodeb/llsk.c b/src/osmo-hnodeb/llsk.c index b76b595..7e25176 100644 --- a/src/osmo-hnodeb/llsk.c +++ b/src/osmo-hnodeb/llsk.c @@ -219,3 +219,15 @@ osmo_timer_setup(&hnb->llsk.defer_configure_ind_timer, llsk_defer_configure_ind_timer_cb, hnb); return 0; } + +void hnb_llsk_free(struct hnb *hnb) +{ + osmo_timer_del(&hnb->llsk.defer_configure_ind_timer); + osmo_prim_srv_link_free(hnb->llsk.link); + hnb->llsk.link = NULL; +} + +int hnb_llsk_start_listen(struct hnb *hnb) +{ + return osmo_prim_srv_link_open(g_hnb->llsk.link); +} diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index e724791..d542c06 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -275,7 +275,7 @@ } /* Start listening on lower layer unix domain socket: */ - rc = osmo_prim_srv_link_open(g_hnb->llsk.link); + rc = hnb_llsk_start_listen(g_hnb); if (rc < 0) { perror("Error opening lower layer socket"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/36246?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I7723467d34670f89710f55c0c6731e2e38560f35 Gerrit-Change-Number: 36246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmo-hnodeb[master]: Close LLSK during shutdown procedure

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/36248?usp=email ) Change subject: Close LLSK during shutdown procedure ...................................................................... Close LLSK during shutdown procedure This way we notify the lower layers that state must be reset, eg. when Iuh conn drops. Related: OS#6826 Change-Id: I282f3e75d31b3e481136aade34b30074300ab631 --- M include/osmocom/hnodeb/hnb_shutdown_fsm.h M include/osmocom/hnodeb/llsk.h M src/osmo-hnodeb/hnb_shutdown_fsm.c M src/osmo-hnodeb/llsk.c 4 files changed, 57 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/48/36248/1 diff --git a/include/osmocom/hnodeb/hnb_shutdown_fsm.h b/include/osmocom/hnodeb/hnb_shutdown_fsm.h index 69f9f4b..5b40551 100644 --- a/include/osmocom/hnodeb/hnb_shutdown_fsm.h +++ b/include/osmocom/hnodeb/hnb_shutdown_fsm.h @@ -28,6 +28,7 @@ enum hnb_shutdown_fsm_states { HNB_SHUTDOWN_ST_NONE, + HNB_SHUTDOWN_ST_IN_PROGRESS, HNB_SHUTDOWN_ST_EXIT, }; diff --git a/include/osmocom/hnodeb/llsk.h b/include/osmocom/hnodeb/llsk.h index 6a2686a..2c06f3e 100644 --- a/include/osmocom/hnodeb/llsk.h +++ b/include/osmocom/hnodeb/llsk.h @@ -34,6 +34,7 @@ int hnb_llsk_start_listen(struct hnb *hnb); bool hnb_llsk_connected(const struct hnb *hnb); bool hnb_llsk_can_be_configured(struct hnb *hnb); +void hnb_llsk_close_conn(const struct hnb *hnb); int ll_addr_type2af(enum u_addr_type t); int ll_addr2osa(enum u_addr_type t, const union u_addr *uaddr, uint16_t port, struct osmo_sockaddr *osa); diff --git a/src/osmo-hnodeb/hnb_shutdown_fsm.c b/src/osmo-hnodeb/hnb_shutdown_fsm.c index c97a124..7b04c6b 100644 --- a/src/osmo-hnodeb/hnb_shutdown_fsm.c +++ b/src/osmo-hnodeb/hnb_shutdown_fsm.c @@ -44,25 +44,33 @@ static void st_none(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + switch (event) { + case HNB_SHUTDOWN_EV_START: + hnb_shutdown_fsm_state_chg(fi, HNB_SHUTDOWN_ST_IN_PROGRESS); + break; + } +} + +static void st_in_progress_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ struct hnb *hnb = (struct hnb *)fi->priv; struct hnb_ue *ue, *ue_tmp; - switch (event) { - case HNB_SHUTDOWN_EV_START: - /* TODO: here we may want to communicate to lower layers over UDsocket that we are shutting down... - * TODO: Also, if Iuh link is still up, maybe send a Hnb deregister req towards HNBGW - */ + /* TODO: Also, if Iuh link is still up, maybe send a Hnb deregister req towards HNBGW */ - /* Drop active UE contexts, together with their GTP/AUDIO sessions: */ - llist_for_each_entry_safe(ue, ue_tmp, &hnb->ue_list, list) - hnb_ue_free(ue); + /* Drop active UE contexts, together with their GTP/AUDIO sessions: */ + llist_for_each_entry_safe(ue, ue_tmp, &hnb->ue_list, list) + hnb_ue_free(ue); - if (osmo_stream_cli_is_connected(hnb->iuh.client)) - osmo_stream_cli_close(hnb->iuh.client); + if (osmo_stream_cli_is_connected(hnb->iuh.client)) + osmo_stream_cli_close(hnb->iuh.client); - hnb_shutdown_fsm_state_chg(fi, HNB_SHUTDOWN_ST_EXIT); - break; - } + /* Close LLSK to notify lower layers that we are shutting down + * even if we are not exiting the process. */ + if (hnb_llsk_connected(hnb)) + hnb_llsk_close_conn(hnb); + + hnb_shutdown_fsm_state_chg(fi, HNB_SHUTDOWN_ST_EXIT); } static void st_exit_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) @@ -82,11 +90,17 @@ .in_event_mask = X(HNB_SHUTDOWN_EV_START), .out_state_mask = - X(HNB_SHUTDOWN_ST_EXIT), + X(HNB_SHUTDOWN_ST_IN_PROGRESS), .name = "NONE", .onenter = st_none_on_enter, .action = st_none, }, + [HNB_SHUTDOWN_ST_IN_PROGRESS] = { + .out_state_mask = + X(HNB_SHUTDOWN_ST_EXIT), + .name = "IN_PROGRESS", + .onenter = st_in_progress_on_enter, + }, [HNB_SHUTDOWN_ST_EXIT] = { .name = "EXIT", .out_state_mask = diff --git a/src/osmo-hnodeb/llsk.c b/src/osmo-hnodeb/llsk.c index 7e25176..1a1b3c7 100644 --- a/src/osmo-hnodeb/llsk.c +++ b/src/osmo-hnodeb/llsk.c @@ -113,7 +113,12 @@ hnb->llsk.srv = NULL; hnb->llsk.valid_sapi_mask = 0x0; osmo_timer_del(&hnb->llsk.defer_configure_ind_timer); - hnb_shutdown(hnb, "LLSK conn dropped", false); + + /* We actively close the llsk conn during hnb_shutdown, no need to + * re-enter shutdown procedure thin that case: */ + if (!hnb_shutdown_in_progress(hnb)) + hnb_shutdown(hnb, "LLSK conn dropped", false); + return 0; } @@ -136,6 +141,14 @@ return false; } +void hnb_llsk_close_conn(const struct hnb *hnb) +{ + if (!hnb_llsk_connected(hnb)) + return; + osmo_prim_srv_close(hnb->llsk.srv); + /* pointer NULLed in llsk_closed_cb() */ +} + static void llsk_defer_configure_ind_timer_cb(void *data) { struct hnb *hnb = (struct hnb *)data; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/36248?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I282f3e75d31b3e481136aade34b30074300ab631 Gerrit-Change-Number: 36248 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024