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

[L] Change in libosmo-sigtran[master]: Split ss7_hmrt.c into mtp3_hm{dc,dt,rt}.c
by laforge 02 Dec '25

02 Dec '25

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41521?usp=email ) Change subject: Split ss7_hmrt.c into mtp3_hm{dc,dt,rt}.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41521?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I1b94c1474722b49ce29796681cfbcfce65c95388 Gerrit-Change-Number: 41521 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Dec 2025 09:25:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: config/sys.config: document available sockopts
by fixeria 02 Dec '25

02 Dec '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41532?usp=email ) Change subject: config/sys.config: document available sockopts ...................................................................... config/sys.config: document available sockopts Change-Id: Ie6b62839ec1634078b292cdd7e0f2a481ebd83fc Related: SYS#7653 --- M config/sys.config 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved jolly: Looks good to me, but someone else must approve diff --git a/config/sys.config b/config/sys.config index f17dd13..3c8f0f3 100644 --- a/config/sys.config +++ b/config/sys.config @@ -10,8 +10,9 @@ laddr => "127.0.1.1", %% local (bind) port for incoming eNB connections lport => 36412, - %% socket options (recbuf, sndbuf, nodelay) - %% if omitted or left empty, defaults apply + %% socket options (if omitted or left empty, defaults apply) + %% * recbuf/sndbuf - Rx/Rx buffer size (default: 65536) + %% * nodelay - enable (false) / disable (true) the Naggle (default: true) sockopts => #{ } }}, %% SCTP client configuration @@ -22,8 +23,7 @@ raddr => "127.0.2.10", %% remote port for outgoing connections to the MME rport => 36412, - %% socket options (recbuf, sndbuf, nodelay) - %% if omitted or left empty, defaults apply + %% socket options (if omitted or left empty, defaults apply) - see above sockopts => #{ } }}, {pfcp_loc_addr, "127.0.1.1"}, %% local address for incoming PFCP PDUs from the UPF -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41532?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie6b62839ec1634078b292cdd7e0f2a481ebd83fc Gerrit-Change-Number: 41532 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: config/sys.config: group sctp_{client,server} params into maps
by fixeria 02 Dec '25

02 Dec '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41530?usp=email ) Change subject: config/sys.config: group sctp_{client,server} params into maps ...................................................................... config/sys.config: group sctp_{client,server} params into maps A follow-up patch brings even more SCTP SockOpts related params. Let's prepare for this by grouping the existing sctp_{client,server} related variables into distinct maps and moving the socket options into their own sub-map. Keep support for legacy options, for the sake of backwards compatibility. This helps to avoid having two instances of each new parameter (s1gw_ and mme_) and generally improves readability/editability of the config file. Change-Id: Ib573915fdeb3ce73a1f6110c19fd6b1d46e68a03 Related: SYS#7653 --- M config/sys.config M src/osmo_s1gw_sup.erl M src/sctp_common.erl 3 files changed, 67 insertions(+), 26 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/config/sys.config b/config/sys.config index 9ad1ca2..f17dd13 100644 --- a/config/sys.config +++ b/config/sys.config @@ -2,18 +2,30 @@ [%% ================================================================================ %% application config - %% - %% eNB S1GW - %% +-----+ +----------------+ - %% | ... | --> | s1gw_bind_addr | MME - %% +-----+ +----------------+ +-----------------+ - %% | mme_loc_addr | --> | mme_rem_addr | - %% +----------------+ +-----------------+ %% ================================================================================ - {osmo_s1gw, - [{s1gw_bind_addr, "127.0.1.1"}, %% S1GW bind address for incoming eNB connections - {mme_loc_addr, "127.0.2.1"}, %% local address for outgoing connections to the MME - {mme_rem_addr, "127.0.2.10"}, %% remote address for outgoing connections to the MME + {osmo_s1gw, [ + %% SCTP server configuration + {sctp_server, #{ + %% local (bind) address for incoming eNB connections + laddr => "127.0.1.1", + %% local (bind) port for incoming eNB connections + lport => 36412, + %% socket options (recbuf, sndbuf, nodelay) + %% if omitted or left empty, defaults apply + sockopts => #{ } + }}, + %% SCTP client configuration + {sctp_client, #{ + %% local (bind) address for outgoing connections to the MME + laddr => "127.0.2.1", + %% remote address for outgoing connections to the MME + raddr => "127.0.2.10", + %% remote port for outgoing connections to the MME + rport => 36412, + %% socket options (recbuf, sndbuf, nodelay) + %% if omitted or left empty, defaults apply + sockopts => #{ } + }}, {pfcp_loc_addr, "127.0.1.1"}, %% local address for incoming PFCP PDUs from the UPF {pfcp_rem_addr, "127.0.1.2"} %% remote address for outgoing PFCP PDUs to the UPF %% Optional PFCP Network Instance IEs (omitted if not configured) diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 1616fe5..bde7b54 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -41,8 +41,6 @@ -include("s1ap.hrl"). -define(SERVER, ?MODULE). --define(ENV_DEFAULT_SCTP_BUFSZ, 65536). --define(ENV_DEFAULT_SCTP_NODELAY, true). -define(ENV_DEFAULT_S1GW_BIND_ADDR, "127.0.1.1"). -define(ENV_DEFAULT_S1GW_BIND_PORT, ?S1AP_PORT). -define(ENV_DEFAULT_MME_LOC_ADDR, "127.0.2.1"). @@ -103,26 +101,44 @@ %% private API %% ------------------------------------------------------------------ +-spec parse_env_map(map()) -> map(). +parse_env_map(M0) -> + M1 = maps:map(fun(_, P) -> osmo_s1gw:get_env(P, undefined) end, M0), + maps:filter(fun(_, V) -> V =/= undefined end, M1). + -spec client_cfg() -> sctp_client:cfg(). client_cfg() -> - SockOpts = #{sctp_nodelay => osmo_s1gw:get_env(mme_nodelay, ?ENV_DEFAULT_SCTP_NODELAY), - recbuf => osmo_s1gw:get_env(mme_recbuf, ?ENV_DEFAULT_SCTP_BUFSZ), - sndbuf => osmo_s1gw:get_env(mme_sndbuf, ?ENV_DEFAULT_SCTP_BUFSZ)}, - #{laddr => osmo_s1gw:get_env(mme_loc_addr, ?ENV_DEFAULT_MME_LOC_ADDR), - raddr => osmo_s1gw:get_env(mme_rem_addr, ?ENV_DEFAULT_MME_REM_ADDR), - rport => osmo_s1gw:get_env(mme_rem_port, ?ENV_DEFAULT_MME_REM_PORT), - sockopts => maps:to_list(SockOpts)}. + %% parse old/legacy environment options, if any + OldCfg = parse_env_map(#{laddr => mme_loc_addr, + raddr => mme_rem_addr, + rport => mme_rem_port}), + OldSockOpts = parse_env_map(#{nodelay => mme_nodelay, + recbuf => mme_recbuf, + sndbuf => mme_sndbuf}), + %% parse the new sctp_client configuration block + Cfg = maps:merge(OldCfg, osmo_s1gw:get_env(sctp_client, #{ })), + SockOpts = maps:merge(OldSockOpts, maps:get(sockopts, Cfg, #{ })), + #{laddr => maps:get(laddr, Cfg, ?ENV_DEFAULT_MME_LOC_ADDR), + raddr => maps:get(raddr, Cfg, ?ENV_DEFAULT_MME_REM_ADDR), + rport => maps:get(rport, Cfg, ?ENV_DEFAULT_MME_REM_PORT), + sockopts => sctp_common:gen_sockopts(SockOpts)}. -spec server_cfg() -> sctp_server:cfg(). server_cfg() -> - SockOpts = #{sctp_nodelay => osmo_s1gw:get_env(s1gw_nodelay, ?ENV_DEFAULT_SCTP_NODELAY), - recbuf => osmo_s1gw:get_env(s1gw_recbuf, ?ENV_DEFAULT_SCTP_BUFSZ), - sndbuf => osmo_s1gw:get_env(s1gw_sndbuf, ?ENV_DEFAULT_SCTP_BUFSZ)}, - #{laddr => osmo_s1gw:get_env(s1gw_bind_addr, ?ENV_DEFAULT_S1GW_BIND_ADDR), - lport => osmo_s1gw:get_env(s1gw_bind_port, ?ENV_DEFAULT_S1GW_BIND_PORT), - sockopts => maps:to_list(SockOpts), + %% parse old/legacy environment options, if any + DefCfg = parse_env_map(#{laddr => s1gw_bind_addr, + lport => s1gw_bind_port}), + DefSockOpts = parse_env_map(#{nodelay => s1gw_nodelay, + recbuf => s1gw_recbuf, + sndbuf => s1gw_sndbuf}), + %% parse the new sctp_server configuration block + Cfg = maps:merge(DefCfg, osmo_s1gw:get_env(sctp_server, #{ })), + SockOpts = maps:merge(DefSockOpts, maps:get(sockopts, Cfg, #{ })), + #{laddr => maps:get(laddr, Cfg, ?ENV_DEFAULT_S1GW_BIND_ADDR), + lport => maps:get(lport, Cfg, ?ENV_DEFAULT_S1GW_BIND_PORT), + sockopts => sctp_common:gen_sockopts(SockOpts), handler => sctp_proxy, priv => client_cfg()}. diff --git a/src/sctp_common.erl b/src/sctp_common.erl index 9b86b50..9a57798 100644 --- a/src/sctp_common.erl +++ b/src/sctp_common.erl @@ -36,6 +36,7 @@ -export([parse_addr/1, report_error/1, + gen_sockopts/1, send_data/2, shutdown/1]). @@ -46,6 +47,10 @@ -include("s1ap.hrl"). +-define(SOCKOPTS_DEFAULT_BUFSZ, 65536). +-define(SOCKOPTS_DEFAULT_NODELAY, true). + + -type sock_aid() :: {gen_sctp:sctp_socket(), gen_sctp:assoc_id()}. @@ -84,6 +89,14 @@ end. +-spec gen_sockopts(map()) -> [gen_sctp:option()]. +gen_sockopts(SockOptsCfg) -> + SockOpts = #{recbuf => maps:get(recbuf, SockOptsCfg, ?SOCKOPTS_DEFAULT_BUFSZ), + sndbuf => maps:get(sndbuf, SockOptsCfg, ?SOCKOPTS_DEFAULT_BUFSZ), + sctp_nodelay => maps:get(nodelay, SockOptsCfg, ?SOCKOPTS_DEFAULT_NODELAY)}, + maps:to_list(SockOpts). + + -spec send_data(sock_aid(), binary()) -> ok | {error, term()}. send_data({Sock, Aid}, Data) -> gen_sctp:send(Sock, #sctp_sndrcvinfo{stream = ?S1AP_SCTP_STREAM, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41530?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ib573915fdeb3ce73a1f6110c19fd6b1d46e68a03 Gerrit-Change-Number: 41530 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: config/sys.config: document available sockopts
by laforge 02 Dec '25

02 Dec '25

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41532?usp=email ) Change subject: config/sys.config: document available sockopts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41532?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie6b62839ec1634078b292cdd7e0f2a481ebd83fc Gerrit-Change-Number: 41532 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Dec 2025 09:21:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in ...osmo-s1gw[master]: config/sys.config: group sctp_{client,server} params into maps
by laforge 02 Dec '25

02 Dec '25

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41530?usp=email ) Change subject: config/sys.config: group sctp_{client,server} params into maps ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41530?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ib573915fdeb3ce73a1f6110c19fd6b1d46e68a03 Gerrit-Change-Number: 41530 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Dec 2025 09:21:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: Use DLTCAP for TCAP log messages
by pespin 02 Dec '25

02 Dec '25

Attention is currently required from: daniel, fixeria. pespin has posted comments on this change by daniel. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41523?usp=email ) Change subject: Use DLTCAP for TCAP log messages ...................................................................... Patch Set 6: Code-Review-1 (1 comment) Patchset: PS6: Please @dwillmann@sysmocom.de add entry to TODO-RELEASE file: libosmocore >1.9.3 DLTCAP -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41523?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic2fba30208a11d562fc67bb6f5c4586451a275df Gerrit-Change-Number: 41523 Gerrit-PatchSet: 6 Gerrit-Owner: daniel <dwillmann(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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Dec 2025 09:15:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: jobs: libosmo-sigtran: add support for TCAP loadsharing
by osmith 02 Dec '25

02 Dec '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/41388?usp=email ) Change subject: jobs: libosmo-sigtran: add support for TCAP loadsharing ...................................................................... jobs: libosmo-sigtran: add support for TCAP loadsharing TCAP loadsharing requires an additional library libosmo-asn1-tcap. ./contrib/jenkins.sh is using the env TCAP={0,1} to select this feature. Unclear if we should also put it into our default build. Change-Id: I47c193d8f5ce695fdc6c368eee94d21c5a4b2c6e --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmocom.sh M jobs/gerrit-verifications.yml M jobs/master-builds.yml 4 files changed, 31 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 4e2b8db..e6005cd 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -75,9 +75,11 @@ build_libusrp build_default libosmo-netif build_default libosmo-abis +build_default libosmo-asn1-tcap build_default libosmo-gprs build_default libosmo-pfcp -build_default libosmo-sigtran +build_default libosmo-sigtran \ + "--enable-tcap-loadsharing" build_default libsmpp34 build_default libgtpnl build_default osmo-ggsn \ diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh index 78f6691..51da337 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -13,6 +13,7 @@ PROJECTS=" libasn1c libosmo-abis + libosmo-asn1-tcap libosmocore libosmo-dsp libosmo-gprs diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 72d75bc..09714fa 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -156,7 +156,19 @@ pipeline_binpkgs: "centos:7 debian:11 debian:13" # centos7: SYS#6760 (osmo-pcap dep) - libosmo-pfcp - - libosmo-sigtran + - libosmo-sigtran: + a1_name: WITH_TCAP + a1: !!python/tuple ["1", "0"] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] + combination_filter: > + (WITH_TCAP == "1" && WITH_MANUALS == "1") || + (WITH_TCAP == "0" && WITH_MANUALS == "0") + cmd: | + {docker_run_ccache} \ + -e WITH_TCAP="$WITH_TCAP" \ + -e WITH_MANUALS="$WITH_MANUALS" \ + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - libosmocore: slave_axis: !!python/tuple [io_uring] # OS#6405 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 43ae3e8..19123d9 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -146,7 +146,8 @@ master-osmo-mgw, master-osmo-sgsn - - libosmo-asn1-tcap + - libosmo-asn1-tcap: + trigger: master-libosmo-sigtran - libosmo-dsp: repos_url: '{gitea_url}/sdr/{repos}' @@ -192,6 +193,18 @@ master-osmo-hnbgw - libosmo-sigtran: + a1_name: WITH_TCAP + a1: !!python/tuple ["1", "0"] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] + combination_filter: > + (WITH_TCAP == "1" && WITH_MANUALS == "1") || + (WITH_TCAP == "0" && WITH_MANUALS == "0") + cmd: | + {docker_run_ccache} \ + -e WITH_TCAP="$WITH_TCAP" \ + -e WITH_MANUALS="$WITH_MANUALS" \ + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh # Full triggers would be: # trigger: > # master-osmo-bsc, master-osmo-iuh, master-osmo-msc, -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41388?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I47c193d8f5ce695fdc6c368eee94d21c5a4b2c6e Gerrit-Change-Number: 41388 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ci[master]: jobs: libosmo-sigtran: add support for TCAP loadsharing
by osmith 02 Dec '25

02 Dec '25

Attention is currently required from: lynxis lazus. osmith has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ci/+/41388?usp=email ) Change subject: jobs: libosmo-sigtran: add support for TCAP loadsharing ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: The changes had been rolled out, but will be reverted next time the master-builds and gerrit-verifications jobs are deployed from master if this is not merged. So I'm merging this now. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41388?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I47c193d8f5ce695fdc6c368eee94d21c5a4b2c6e Gerrit-Change-Number: 41388 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 02 Dec 2025 08:46:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-bsc[master]: ASCI: Fix removal of call notification when lchan fails
by jolly 02 Dec '25

02 Dec '25

jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41503?usp=email ) Change subject: ASCI: Fix removal of call notification when lchan fails ...................................................................... ASCI: Fix removal of call notification when lchan fails When ASCI resource setup fails, due to channel assignment failure, the lchan will be removed from gsm_subscriber_connection structure. Adding a 'bts' pointer to gsm_subscriber_connection structure allows the ASCI resource FSM destructor to remove call notification from that BTS. Change-Id: Ib5f7fdf8c3b3606002151f86d2bdfaeb33904364 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/vgcs_fsm.c 2 files changed, 8 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified jolly: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 59d22d7..63cc8e2 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -472,6 +472,8 @@ struct gsm_subscriber_connection *call; /* Cell (BTS) FSM */ struct osmo_fsm_inst *fi; + /* BTS to notify about ongoing call */ + struct gsm_bts *notify_bts; /* lchan to be assigned */ struct gsm_lchan *new_lchan; /* MGW peer */ diff --git a/src/osmo-bsc/vgcs_fsm.c b/src/osmo-bsc/vgcs_fsm.c index 1f2bbef..70390f8 100644 --- a/src/osmo-bsc/vgcs_fsm.c +++ b/src/osmo-bsc/vgcs_fsm.c @@ -602,10 +602,7 @@ if (conn->vgcs_chan.fi->state != VGCS_CHAN_ST_WAIT_EST) { /* Remove call from notification channel. */ - if (conn->lchan) - rsl_notification_cmd(conn->lchan->ts->trx->bts, NULL, &conn->vgcs_chan.gc_ie, NULL); - else - LOG_CHAN(conn, LOGL_ERROR, "Unable to remove notification, lchan is already gone.\n"); + rsl_notification_cmd(conn->vgcs_chan.notify_bts, NULL, &conn->vgcs_chan.gc_ie, NULL); } /* Detach from call, if not already. */ @@ -731,7 +728,7 @@ osmo_fsm_inst_state_chg(fi, VGCS_CHAN_ST_ACTIVE_BLOCKED, 0, 0); if (conn->vgcs_chan.call) { /* Add call to notification channel. */ - rsl_notification_cmd(conn->lchan->ts->trx->bts, conn->lchan, &conn->vgcs_chan.gc_ie, NULL); + rsl_notification_cmd(conn->vgcs_chan.notify_bts, conn->lchan, &conn->vgcs_chan.gc_ie, NULL); /* Add/update SI10. */ si10_update(conn->vgcs_chan.call); } @@ -798,7 +795,7 @@ if (conn->vgcs_chan.call) osmo_fsm_inst_dispatch(conn->vgcs_chan.call->vgcs_call.fi, VGCS_EV_CALLING_ASSIGNED, conn); /* Repeat notification for the MS that has been assigned. */ - rsl_notification_cmd(conn->lchan->ts->trx->bts, conn->lchan, &conn->vgcs_chan.gc_ie, NULL); + rsl_notification_cmd(conn->vgcs_chan.notify_bts, conn->lchan, &conn->vgcs_chan.gc_ie, NULL); break; case VGCS_EV_CLEANUP: LOG_CHAN(conn, LOGL_DEBUG, "SCCP connection clearing.\n"); @@ -1248,6 +1245,9 @@ } conn->vgcs_chan.new_lchan = lchan; + /* Set BTS that receives notification. */ + conn->vgcs_chan.notify_bts = bts; + /* Create VGCS FSM. */ conn->vgcs_chan.fi = osmo_fsm_inst_alloc(&vgcs_chan_fsm, conn->network, conn, LOGL_DEBUG, NULL); if (!conn->vgcs_chan.fi) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41503?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5f7fdf8c3b3606002151f86d2bdfaeb33904364 Gerrit-Change-Number: 41503 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bsc[master]: ASCI: Fix removal of call notification when lchan fails
by jolly 02 Dec '25

02 Dec '25

Attention is currently required from: fixeria, neels. jolly has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41503?usp=email ) Change subject: ASCI: Fix removal of call notification when lchan fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41503?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5f7fdf8c3b3606002151f86d2bdfaeb33904364 Gerrit-Change-Number: 41503 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Dec 2025 08:31:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2025

2024

2023

2022

gerrit-log December 2025