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

[M] Change in osmo-ttcn3-hacks[master]: remsim: Add initial testenv

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39078?usp=email ) Change subject: remsim: Add initial testenv ...................................................................... remsim: Add initial testenv "server" testsuite is working as goos as in docker-playground.git "bankd" testsuite is currently failing due to bankd exiting early after starting. "client" is not currently working/running in docker-playground, initial config copied here for completeness. This commit hence allows already quickly running "server" testsuite. Change-Id: Ic69a04342a4cdfced90cf8ffbe7e5cdede8d4b8e --- A remsim/bankd/REMSIM_Tests.cfg A remsim/bankd/bankd_pcsc_slots.csv A remsim/client/REMSIM_Tests.cfg R remsim/server/REMSIM_Tests.cfg A remsim/testenv_bankd.cfg A remsim/testenv_client.cfg A remsim/testenv_server.cfg 7 files changed, 73 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/remsim/bankd/REMSIM_Tests.cfg b/remsim/bankd/REMSIM_Tests.cfg new file mode 100644 index 0000000..357e6a6 --- /dev/null +++ b/remsim/bankd/REMSIM_Tests.cfg @@ -0,0 +1,20 @@ +[ORDERED_INCLUDE] +"../../Common.cfg" +"../REMSIM_Tests.default" + +[LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-bankd" + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +# IP address on which the simulated server binds +REMSIM_Tests.mp_server_ip := "127.0.0.10" +# IP address of the IUT (bankd) to which simulated client connects +REMSIM_Tests.mp_bankd_ip := "127.0.0.30" +VPCD_Adapter.mp_vpcd_host := "127.0.0.30" + +[MAIN_CONTROLLER] + +[EXECUTE] +RemsimBankd_Tests.control diff --git a/remsim/bankd/bankd_pcsc_slots.csv b/remsim/bankd/bankd_pcsc_slots.csv new file mode 100644 index 0000000..0e8d529 --- /dev/null +++ b/remsim/bankd/bankd_pcsc_slots.csv @@ -0,0 +1,2 @@ +"1","0","Virtual PCD 00 00" +"1","1","Virtual PCD 00 01" diff --git a/remsim/client/REMSIM_Tests.cfg b/remsim/client/REMSIM_Tests.cfg new file mode 100644 index 0000000..b249087 --- /dev/null +++ b/remsim/client/REMSIM_Tests.cfg @@ -0,0 +1,19 @@ +[ORDERED_INCLUDE] +"../../Common.cfg" +"../REMSIM_Tests.default" + +[LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-client" + +[TESTPORT_PARAMETERS] +# IP address to which ATS binds emulated remsim-server +REMSIM_Tests.mp_server_ip := "127.0.0.10" +# IP address to which ATS binds emulated remsim-bankd +REMSIM_Tests.mp_bankd_ip := "127.0.0.10" + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +RemsimClient_Tests.control diff --git a/remsim/REMSIM_Tests.cfg b/remsim/server/REMSIM_Tests.cfg similarity index 86% rename from remsim/REMSIM_Tests.cfg rename to remsim/server/REMSIM_Tests.cfg index e3bb900..8a2b3fc 100644 --- a/remsim/REMSIM_Tests.cfg +++ b/remsim/server/REMSIM_Tests.cfg @@ -1,8 +1,8 @@ [ORDERED_INCLUDE] # Common configuration, shared between test suites -"../Common.cfg" +"../../Common.cfg" # testsuite specific configuration, not expected to change -"./REMSIM_Tests.default" +"../REMSIM_Tests.default" [MODULE_PARAMETERS] RemsimClient_Tests.mp_have_local_client := true diff --git a/remsim/testenv_bankd.cfg b/remsim/testenv_bankd.cfg new file mode 100644 index 0000000..04baeaf --- /dev/null +++ b/remsim/testenv_bankd.cfg @@ -0,0 +1,14 @@ +[testsuite] +program=REMSIM_Tests +config=bankd/REMSIM_Tests.cfg + +[pcscd] +program=pcscd -f -d +make=no +package=pcscd + +[bankd] +program=osmo-remsim-bankd -d DMAIN:1 -i 127.0.0.10 -I 127.0.0.30 +make=osmo-remsim +package=osmo-remsim-bankd +copy=bankd/bankd_pcsc_slots.csv diff --git a/remsim/testenv_client.cfg b/remsim/testenv_client.cfg new file mode 100644 index 0000000..c7d525b --- /dev/null +++ b/remsim/testenv_client.cfg @@ -0,0 +1,8 @@ +[testsuite] +program=REMSIM_Tests +config=client/REMSIM_Tests.cfg + +[client] +program=osmo-remsim-client-shell +make=osmo-remsim +package=osmo-remsim-client-shell diff --git a/remsim/testenv_server.cfg b/remsim/testenv_server.cfg new file mode 100644 index 0000000..f28296a --- /dev/null +++ b/remsim/testenv_server.cfg @@ -0,0 +1,8 @@ +[testsuite] +program=REMSIM_Tests +config=server/REMSIM_Tests.cfg + +[server] +program=osmo-remsim-server +make=osmo-remsim +package=osmo-remsim-server -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39078?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic69a04342a4cdfced90cf8ffbe7e5cdede8d4b8e Gerrit-Change-Number: 39078 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: make copy= more intuitive

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39080?usp=email ) Change subject: testenv: make copy= more intuitive ...................................................................... testenv: make copy= more intuitive Currently copy= in testenv.cfg creates copies of files under the full source file name under the target directory: copy=dir/file.cfg creates dir/file.cfg (like "cp -a --parents"). This is not very intuitive, change it to create a "file.cfg" instead without subdirectory. With this change, it behaves the same as "cp -a". Suggested-by: Pau Espin Pedrol <pespin(a)sysmocom.de> Change-Id: Id9e4ea066d0a0e72ccd83e4f6f887f382bf61e46 --- M _testenv/README.md M _testenv/testenv/testdir.py M ggsn_tests/open5gs/open5gs-smf.yaml M ggsn_tests/testenv_open5gs.cfg 4 files changed, 7 insertions(+), 18 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/README.md b/_testenv/README.md index bd102a8..2a08e7d 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -89,7 +89,7 @@ * `copy=`: optionally copy a space separated list of files or directories from the testsuite directory to the test directory, like `.cfg` and `.confmerge` - files. + files. Testenv runs `cp -a <SOURCES> <TEST DIR>` internally. * `make=`: osmo-dev make target for building from source, if running without `--binary-repo`. This is usually the name of the git repository, but could diff --git a/_testenv/testenv/testdir.py b/_testenv/testenv/testdir.py index b18efd1..2f21d23 100644 --- a/_testenv/testenv/testdir.py +++ b/_testenv/testenv/testdir.py @@ -85,19 +85,8 @@ testenv.cmd.run(["install", "-Dm644", path, path_dest]) if "copy" in section_data: - for copy_entry in section_data["copy"].split(" "): - path = os.path.join(testsuite_dir, copy_entry) - if os.path.isdir(path): - pattern = os.path.join(path, "**") - paths = glob.glob(pattern, recursive=True) - else: - paths = [path] - for path in paths: - if os.path.isdir(path): - continue - path_dest = os.path.join(section_dir, os.path.relpath(path, testsuite_dir)) - mode = 755 if os.access(path, os.X_OK) else 644 - testenv.cmd.run(["install", f"-Dm{mode}", path, path_dest]) + sources = section_data["copy"].split(" ") + testenv.cmd.run(["cp", "-a"] + sources + [section_dir], no_podman=True, cwd=testsuite_dir) # Referenced in testsuite cfgs: *.default pattern = os.path.join(testsuite_dir, "*.default") diff --git a/ggsn_tests/open5gs/open5gs-smf.yaml b/ggsn_tests/open5gs/open5gs-smf.yaml index 0e26550..2532665 100644 --- a/ggsn_tests/open5gs/open5gs-smf.yaml +++ b/ggsn_tests/open5gs/open5gs-smf.yaml @@ -46,7 +46,7 @@ mtu: 1400 ctf: enabled: auto - freeDiameter: open5gs/freediameter.conf + freeDiameter: freediameter.conf parameter: diff --git a/ggsn_tests/testenv_open5gs.cfg b/ggsn_tests/testenv_open5gs.cfg index 2d107a8..6d951f2 100644 --- a/ggsn_tests/testenv_open5gs.cfg +++ b/ggsn_tests/testenv_open5gs.cfg @@ -3,14 +3,14 @@ config=GGSN_Tests.cfg [smf] -program=open5gs-smfd -c open5gs/open5gs-smf.yaml +program=open5gs-smfd -c open5gs-smf.yaml make=open5gs package=open5gs-smf copy=open5gs/open5gs-smf.yaml open5gs/freediameter.conf [upf] -program=open5gs-upfd -c open5gs/open5gs-upf.yaml +program=open5gs-upfd -c open5gs-upf.yaml make=open5gs package=open5gs-upf copy=open5gs/open5gs-upf.yaml open5gs/testenv.sh -clean=open5gs/testenv.sh +clean=./testenv.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39080?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id9e4ea066d0a0e72ccd83e4f6f887f382bf61e46 Gerrit-Change-Number: 39080 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: make copy= more intuitive

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39080?usp=email ) Change subject: testenv: make copy= more intuitive ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39080?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id9e4ea066d0a0e72ccd83e4f6f887f382bf61e46 Gerrit-Change-Number: 39080 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 14:56:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[M] Change in libosmo-abis[master]: tests/Makefile.am: Fix missing LIBOSMONETIF_LIBS/CFLAGS

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39081?usp=email ) Change subject: tests/Makefile.am: Fix missing LIBOSMONETIF_LIBS/CFLAGS ...................................................................... tests/Makefile.am: Fix missing LIBOSMONETIF_LIBS/CFLAGS Change-Id: I5b62e17deb9a6d769ddf98a5751e84d69132fecc --- M tests/Makefile.am 1 file changed, 26 insertions(+), 26 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index fd264d0..4614b58 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS) +AM_CFLAGS=-Wall -g $(LIBOSMONETIF_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) -no-install check_PROGRAMS = e1inp_ipa_bsc_test \ @@ -17,52 +17,52 @@ check_PROGRAMS += rtp_test/rtp_test endif +ABIS_LA_LIBS = \ + $(top_builddir)/src/libosmoabis.la \ + $(LIBOSMONETIF_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOCORE_LIBS) \ + $(NULL) + +TRAU_LA_LIBS = \ + $(top_builddir)/src/libosmotrau.la \ + $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMOCORE_LIBS) \ + $(NULL) + e1inp_ipa_bsc_test_SOURCES = e1inp_ipa_bsc_test.c -e1inp_ipa_bsc_test_LDADD = $(top_builddir)/src/libosmoabis.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +e1inp_ipa_bsc_test_LDADD = $(ABIS_LA_LIBS) e1inp_ipa_bts_test_SOURCES = e1inp_ipa_bts_test.c -e1inp_ipa_bts_test_LDADD = $(top_builddir)/src/libosmoabis.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +e1inp_ipa_bts_test_LDADD = $(ABIS_LA_LIBS) ipa_proxy_test_SOURCES = ipa_proxy_test.c -ipa_proxy_test_LDADD = $(top_builddir)/src/libosmoabis.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) +ipa_proxy_test_LDADD = $(ABIS_LA_LIBS) subchan_demux_subchan_demux_test_SOURCES = subchan_demux/subchan_demux_test.c -subchan_demux_subchan_demux_test_LDADD = $(top_builddir)/src/libosmoabis.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) +subchan_demux_subchan_demux_test_LDADD = $(ABIS_LA_LIBS) ipa_recv_ipa_recv_test_SOURCES = ipa_recv/ipa_recv_test.c -ipa_recv_ipa_recv_test_LDADD = $(top_builddir)/src/libosmoabis.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) +ipa_recv_ipa_recv_test_LDADD = $(ABIS_LA_LIBS) raa_prime_test_dec_SOURCES = raa_prime/test_dec.c -raa_prime_test_dec_LDADD = $(top_builddir)/src/libosmotrau.la \ - $(LIBOSMOCORE_LIBS) +raa_prime_test_dec_LDADD = $(TRAU_LA_LIBS) raa_prime_test_enc_SOURCES = raa_prime/test_enc.c -raa_prime_test_enc_LDADD = $(top_builddir)/src/libosmotrau.la \ - $(LIBOSMOCORE_LIBS) +raa_prime_test_enc_LDADD = $(TRAU_LA_LIBS) rtp_test_rtp_test_SOURCES = rtp_test/rtp_test.c -rtp_test_rtp_test_LDADD = $(top_builddir)/src/libosmotrau.la \ - $(LIBOSMOCORE_LIBS) +rtp_test_rtp_test_LDADD = $(TRAU_LA_LIBS) trau_conv_trau16_to_rtp_SOURCES = trau_conv/trau16_to_rtp.c -trau_conv_trau16_to_rtp_LDADD = $(top_builddir)/src/libosmotrau.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) +trau_conv_trau16_to_rtp_LDADD = $(TRAU_LA_LIBS) trau_sync_trau_sync_test_SOURCES = trau_sync/trau_sync_test.c -trau_sync_trau_sync_test_LDADD = $(top_builddir)/src/libosmotrau.la \ - $(LIBOSMOCORE_LIBS) +trau_sync_trau_sync_test_LDADD = $(TRAU_LA_LIBS) trau_pcu_ericsson_trau_pcu_ericsson_test_SOURCES = trau_pcu_ericsson/trau_pcu_ericsson_test.c -trau_pcu_ericsson_trau_pcu_ericsson_test_LDADD = $(top_builddir)/src/libosmotrau.la \ - $(LIBOSMOCORE_LIBS) +trau_pcu_ericsson_trau_pcu_ericsson_test_LDADD = $(TRAU_LA_LIBS) # boilerplate for the tests # The `:;' works around a Bash 3.2 bug when the output is not writeable. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39081?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I5b62e17deb9a6d769ddf98a5751e84d69132fecc Gerrit-Change-Number: 39081 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[M] Change in libosmo-abis[master]: ipaccess: Use new osmo_ipa_ka_fsm_inst APIs from libosmo-netif

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39042?usp=email ) Change subject: ipaccess: Use new osmo_ipa_ka_fsm_inst APIs from libosmo-netif ...................................................................... ipaccess: Use new osmo_ipa_ka_fsm_inst APIs from libosmo-netif Change-Id: I6164a44847fcd88d08c77f977d928c2fdf657719 Related: OS#5896 Depends: libosmo-netif.git Change-Id I5c36e06e0dc29ec4679b20ad6c426f051b659acd --- M TODO-RELEASE M include/osmocom/abis/e1_input.h M src/input/ipaccess.c 3 files changed, 43 insertions(+), 32 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index bcd3c56..4cf9cea 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -12,3 +12,4 @@ libosmo-netif >1.5.0 use osmo_stream_cli_set_priority(), osmo_stream_cli_set_ip_dscp() libosmocore >1.10.0 bigger iofd tx_queue.max_length default value libosmo-abis API break Remove ipaccess_fd_cb() +libosmo-netif >1.5.1 osmo_ipa_ka_fsm_inst APIs diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 13008f8..c3f7da9 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -9,6 +9,7 @@ #include <osmocom/core/timer.h> #include <osmocom/core/msgb.h> #include <osmocom/core/select.h> +#include <osmocom/netif/ipa.h> #include <osmocom/gsm/i460_mux.h> #include <osmocom/abis/subchan_demux.h> #include <osmocom/abis/lapd.h> @@ -130,7 +131,7 @@ /* ip.access driver has one fd for each ts */ struct osmo_fd fd; /* ipa keep-alive */ - struct osmo_fsm_inst *ka_fsm; + struct osmo_ipa_ka_fsm_inst *ka_fsm; } ipaccess; struct { /* DAHDI driver has one fd for each ts */ diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index c47c6fb..8960647 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -80,52 +80,58 @@ static inline void ipaccess_keepalive_fsm_cleanup(struct e1inp_ts *e1i_ts) { - struct osmo_fsm_inst *ka_fsm; + struct osmo_ipa_ka_fsm_inst *ka_fsm; ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; if (ka_fsm) { - osmo_fsm_inst_term(ka_fsm, OSMO_FSM_TERM_REQUEST, NULL); e1i_ts->driver.ipaccess.ka_fsm = NULL; + osmo_ipa_ka_fsm_stop(ka_fsm); + osmo_ipa_ka_fsm_free(ka_fsm); } } -static void ipa_bsc_keepalive_write_server_cb(struct osmo_fsm_inst *fi, void *conn, struct msgb *msg) +static int ipa_bsc_keepalive_send_cb(struct osmo_ipa_ka_fsm_inst *ka_fi, struct msgb *msg, void *data) { - struct osmo_stream_srv *srv = (struct osmo_stream_srv *)conn; + struct osmo_stream_srv *srv = data; osmo_stream_srv_send(srv, msg); + return 0; } -static int ipa_bsc_keepalive_timeout_cb(struct osmo_fsm_inst *fi, void *data) +static int ipa_bsc_keepalive_timeout_cb(struct osmo_ipa_ka_fsm_inst *ka_fi, void *data) { - struct osmo_stream_srv *srv = (struct osmo_stream_srv *)data; + struct osmo_stream_srv *srv = data; osmo_stream_srv_destroy(srv); - return 1; + return 0; } static void ipaccess_bsc_keepalive_fsm_alloc(struct e1inp_ts *e1i_ts, struct osmo_stream_srv *conn, const char *id) { struct e1inp_line *line = e1i_ts->line; - struct osmo_fsm_inst *ka_fsm; + struct osmo_ipa_ka_fsm_inst *ka_fsm; ipaccess_keepalive_fsm_cleanup(e1i_ts); if (!line->ipa_kap) return; - ka_fsm = ipa_generic_conn_alloc_keepalive_fsm(conn, conn, line->ipa_kap, id); + ka_fsm = osmo_ipa_ka_fsm_alloc(conn, id); e1i_ts->driver.ipaccess.ka_fsm = ka_fsm; if (!ka_fsm) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Failed to allocate IPA keepalive FSM\n"); return; } - - ipa_keepalive_fsm_set_timeout_cb(ka_fsm, ipa_bsc_keepalive_timeout_cb); - ipa_keepalive_fsm_set_send_cb(ka_fsm, ipa_bsc_keepalive_write_server_cb); - ipa_keepalive_fsm_start(ka_fsm); + osmo_ipa_ka_fsm_set_ping_interval(ka_fsm, line->ipa_kap->interval); + osmo_ipa_ka_fsm_set_pong_timeout(ka_fsm, line->ipa_kap->wait_for_resp); + osmo_ipa_ka_fsm_set_data(ka_fsm, conn); + osmo_ipa_ka_fsm_set_send_cb(ka_fsm, ipa_bsc_keepalive_send_cb); + osmo_ipa_ka_fsm_set_timeout_cb(ka_fsm, ipa_bsc_keepalive_timeout_cb); + osmo_ipa_ka_fsm_start(ka_fsm); } -static void ipa_bts_keepalive_write_client_cb(struct osmo_fsm_inst *fi, void *conn, struct msgb *msg) { - struct osmo_stream_cli *cli = (struct osmo_stream_cli *)conn; +static int ipa_bts_keepalive_send_cb(struct osmo_ipa_ka_fsm_inst *ka_fi, struct msgb *msg, void *data) +{ + struct osmo_stream_cli *cli = data; osmo_stream_cli_send(cli, msg); + return 0; } static void _ipaccess_bts_down_cb(struct osmo_stream_cli *cli) @@ -138,30 +144,33 @@ line->ops->sign_link_down(line); } -static int ipa_bts_keepalive_timeout_cb(struct osmo_fsm_inst *fi, void *conn) { - struct osmo_stream_cli *cli = (struct osmo_stream_cli *)conn; +static int ipa_bts_keepalive_timeout_cb(struct osmo_ipa_ka_fsm_inst *ka_fi, void *data) +{ + struct osmo_stream_cli *cli = data; _ipaccess_bts_down_cb(cli); - return 1; + return 0; } static void ipaccess_bts_keepalive_fsm_alloc(struct e1inp_ts *e1i_ts, struct osmo_stream_cli *client, const char *id) { struct e1inp_line *line = e1i_ts->line; - struct osmo_fsm_inst *ka_fsm; + struct osmo_ipa_ka_fsm_inst *ka_fsm; OSMO_ASSERT(e1i_ts->driver.ipaccess.ka_fsm == NULL); if (!line->ipa_kap) return; - ka_fsm = ipa_generic_conn_alloc_keepalive_fsm(client, client, line->ipa_kap, id); + ka_fsm = osmo_ipa_ka_fsm_alloc(client, id); e1i_ts->driver.ipaccess.ka_fsm = ka_fsm; if (!ka_fsm) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Failed to allocate IPA keepalive FSM\n"); return; } - - ipa_keepalive_fsm_set_timeout_cb(ka_fsm, ipa_bts_keepalive_timeout_cb); - ipa_keepalive_fsm_set_send_cb(ka_fsm, ipa_bts_keepalive_write_client_cb); + osmo_ipa_ka_fsm_set_ping_interval(ka_fsm, line->ipa_kap->interval); + osmo_ipa_ka_fsm_set_pong_timeout(ka_fsm, line->ipa_kap->wait_for_resp); + osmo_ipa_ka_fsm_set_data(ka_fsm, client); + osmo_ipa_ka_fsm_set_send_cb(ka_fsm, ipa_bts_keepalive_send_cb); + osmo_ipa_ka_fsm_set_timeout_cb(ka_fsm, ipa_bts_keepalive_timeout_cb); } /* See how ts->num is assigned in e1inp_line_create: line->ts[i].num = i+1; @@ -224,12 +233,12 @@ struct e1inp_sign_link *sign_link; char *unitid; int len, ret; - struct osmo_fsm_inst *ka_fsm; + struct osmo_ipa_ka_fsm_inst *ka_fsm; /* peek the pong for our keepalive fsm */ ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; if (ka_fsm && msg_type == IPAC_MSGT_PONG) - ipa_keepalive_fsm_pong_received(ka_fsm); + osmo_ipa_ka_fsm_pong_received(ka_fsm); /* Handle IPA PING, PONG and ID_ACK messages. */ ret = ipa_ccm_rcvmsg_base(msg, bfd); @@ -364,13 +373,13 @@ struct e1inp_ts *e1i_ts = sign_link->ts; struct osmo_fd *bfd = &e1i_ts->driver.ipaccess.fd; struct e1inp_line *line = e1i_ts->line; - struct osmo_fsm_inst *ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; + struct osmo_ipa_ka_fsm_inst *ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; struct osmo_stream_cli *cli; struct osmo_stream_srv *conn; /* depending on caller the fsm might be dead */ if (ka_fsm) - ipa_keepalive_fsm_stop(ka_fsm); + osmo_ipa_ka_fsm_stop(ka_fsm); e1inp_int_snd_event(e1i_ts, sign_link, S_L_INP_TEI_DN); /* the first e1inp_sign_link_destroy call closes the socket. */ @@ -804,8 +813,8 @@ /* peek the pong for our keepalive fsm */ if (line && msg_type == IPAC_MSGT_PONG) { - struct osmo_fsm_inst *ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; - ipa_keepalive_fsm_pong_received(ka_fsm); + struct osmo_ipa_ka_fsm_inst *ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; + osmo_ipa_ka_fsm_pong_received(ka_fsm); } /* ping, pong and acknowledgment cases. */ @@ -922,11 +931,11 @@ { struct e1inp_ts *e1i_ts = osmo_stream_cli_get_data(cli); struct e1inp_line *line = e1i_ts->line; - struct osmo_fsm_inst *ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; + struct osmo_ipa_ka_fsm_inst *ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; update_fd_settings(line, osmo_stream_cli_get_fd(cli)); if (ka_fsm && line->ipa_kap) - ipa_keepalive_fsm_start(ka_fsm); + osmo_ipa_ka_fsm_start(ka_fsm); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39042?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I6164a44847fcd88d08c77f977d928c2fdf657719 Gerrit-Change-Number: 39042 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email ) Change subject: input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4efb11ae44c28c4f56f71f5797966f6106493f2b Gerrit-Change-Number: 39043 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 14:53:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[M] Change in libosmo-abis[master]: tests/Makefile.am: Fix missing LIBOSMONETIF_LIBS/CFLAGS

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39081?usp=email ) Change subject: tests/Makefile.am: Fix missing LIBOSMONETIF_LIBS/CFLAGS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39081?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I5b62e17deb9a6d769ddf98a5751e84d69132fecc Gerrit-Change-Number: 39081 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 14:51:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c

by pespin

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c ...................................................................... input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c abis/ipa.h will eventually be deprecated. The only current use of abis/ipa.h in libosmo-abis itself is in helper code such as: * tests/ipa_recv/ipa_recv_test.c * src/ipa_proxy.c ipaccess e1_input driver is also using struct ipa_keepalive_params, which is only exported publicly in e1_input.h as a pointer and is only really used internally, hence move a copy of the struct to internal.h and use it internally (e1_input_vty.c) from there. Leave a copy of the struct in its original abis/ipa.h (which as mentioned contains code to be deprecated) for old users. Change-Id: I4efb11ae44c28c4f56f71f5797966f6106493f2b --- M include/internal.h M include/osmocom/abis/e1_input.h M src/e1_input_vty.c M src/input/ipa.c M src/input/ipaccess.c M src/ipa_proxy.c 6 files changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/43/39043/6 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4efb11ae44c28c4f56f71f5797966f6106493f2b Gerrit-Change-Number: 39043 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-sgsn[master]: sgsn_vty: Drop unneeded use of abis/ipa.h header

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39083?usp=email ) Change subject: sgsn_vty: Drop unneeded use of abis/ipa.h header ...................................................................... sgsn_vty: Drop unneeded use of abis/ipa.h header The header is not needed and will eventually be deprecated. Change-Id: I48a513b8ea63dadbc6d6d571380980f55ff04a06 --- M src/sgsn/sgsn_vty.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 2cb8819..1a104b3 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -54,7 +54,6 @@ #include <osmocom/vty/misc.h> #include <osmocom/crypt/gprs_cipher.h> #include <osmocom/crypt/utran_cipher.h> -#include <osmocom/abis/ipa.h> #include <osmocom/gprs/gprs_bssgp.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39083?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I48a513b8ea63dadbc6d6d571380980f55ff04a06 Gerrit-Change-Number: 39083 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email ) Change subject: input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c ...................................................................... Patch Set 5: Code-Review+1 (1 comment) File include/internal.h: https://gerrit.osmocom.org/c/libosmo-abis/+/39043/comment/d42586d1_515da4e3… : PS5, Line 16: interval Is it in seconds? Please clarify at least in comments. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4efb11ae44c28c4f56f71f5797966f6106493f2b Gerrit-Change-Number: 39043 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 14:22:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024