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

[S] Change in osmo-bts[master]: rtp continuous-streaming: fix BFI in the quality-suppressed case

by falconia

Attention is currently required from: pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32128 ) Change subject: rtp continuous-streaming: fix BFI in the quality-suppressed case ...................................................................... Patch Set 2: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/32128/comment/bd1f4032_f0bf924a PS1, Line 1661: send_ul_rtp_packet(lchan, fn, bfi, 0); > well if len = 0, then it makes no sense to access to buffer, so it shouldn't expect it to be non-nul […] I just double-checked to be absolutely sure: when OsMux is used, the call boils down to osmo_rtp_build() in libosmo-netif, and in the non-OsMux case it boils down to rtp_session_create_packet() in the external-dependency ortp library. Both functions are explicitly OK with zero-length RTP payloads (length argument to the function equals 0), and in both functions the memcpy() call for payload bytes is explicitly skipped in the zero-length case, thus the data pointer argument is never used. So we all good. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icee0f57be289a0592a0197469432a012d15f224c Gerrit-Change-Number: 32128 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 19:43:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-smlc[master]: tests: execute osmotest{vty,config}.py against osmo-smlc

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/32137 ) Change subject: tests: execute osmotest{vty,config}.py against osmo-smlc ...................................................................... tests: execute osmotest{vty,config}.py against osmo-smlc Change-Id: I61d970563a1902cce704d5c1a6adea9d8be438e4 --- M tests/Makefile.am 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/37/32137/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index d046d49..b2e1bee 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -37,9 +37,11 @@ $(NULL) if ENABLE_EXT_TESTS -python-tests: +python-tests: $(top_builddir)/src/osmo-smlc/osmo-smlc $(MAKE) vty-test $(MAKE) ctrl-test + osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v else python-tests: echo "Not running python-based tests (determined at configure-time)" -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/32137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I61d970563a1902cce704d5c1a6adea9d8be438e4 Gerrit-Change-Number: 32137 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in libosmo-sccp[master]: osmoappdesc.py: also test doc/examples/osmo-stp-multihome.cfg

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32136 ) Change subject: osmoappdesc.py: also test doc/examples/osmo-stp-multihome.cfg ...................................................................... osmoappdesc.py: also test doc/examples/osmo-stp-multihome.cfg Change-Id: Ib6d0b0cdcfad165ad34d304069843c71f6eb06de --- M osmoappdesc.py 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/36/32136/1 diff --git a/osmoappdesc.py b/osmoappdesc.py index 6c1bafa..2fdce25 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 app_configs = { - "osmo-stp": ["doc/examples/osmo-stp.cfg"], + "osmo-stp": ["doc/examples/osmo-stp.cfg", + "doc/examples/osmo-stp-multihome.cfg"], } apps = [(4239, "stp/osmo-stp", "OsmoSTP", "osmo-stp"), -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ib6d0b0cdcfad165ad34d304069843c71f6eb06de Gerrit-Change-Number: 32136 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in libosmo-sccp[master]: tests: execute osmotest{vty,config}.py against osmo-stp

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32135 ) Change subject: tests: execute osmotest{vty,config}.py against osmo-stp ...................................................................... tests: execute osmotest{vty,config}.py against osmo-stp Change-Id: Idd57757f251dd1c4d1c74d275b4c5d8beff304e5 --- M tests/vty/Makefile.am 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/35/32135/1 diff --git a/tests/vty/Makefile.am b/tests/vty/Makefile.am index df5a64c..7f67d75 100644 --- a/tests/vty/Makefile.am +++ b/tests/vty/Makefile.am @@ -15,8 +15,10 @@ ss7_asp_vty_test_SOURCES = ss7_asp_vty_test.c if ENABLE_EXT_TESTS -ext-tests: +ext-tests: $(top_builddir)/stp/osmo-stp $(MAKE) vty-test + osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v else ext-tests: echo "Not running python-based external tests (determined at configure-time)" -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idd57757f251dd1c4d1c74d275b4c5d8beff304e5 Gerrit-Change-Number: 32135 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in libosmocore[master]: tests: make VTY tests depend on the respective binaries

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32134 ) Change subject: tests: make VTY tests depend on the respective binaries ...................................................................... tests: make VTY tests depend on the respective binaries Change-Id: I784fe3b5737b804f7b55da01d8beb619c57bafd6 --- M tests/Makefile.am 1 file changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/32134/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index cd0fed9..6876df3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -717,7 +717,7 @@ # make vty-test U=-u if ENABLE_GB -vty-test-ns2: +vty-test-ns2: $(top_builddir)/utils/osmo-ns-dummy $(MAKE) -C $(top_builddir)/utils osmo-ns-dummy osmo_verify_transcript_vty.py -v \ -p 42042 \ @@ -730,19 +730,21 @@ echo "Not running vty-test-ns2 because osmo-ns-dummy is not built (--disable-gb)" endif -vty-test-logging: +vty-test-logging: $(top_builddir)/tests/logging/logging_vty_test osmo_verify_transcript_vty.py -v \ -p 42042 \ -r "$(top_builddir)/tests/logging/logging_vty_test" \ $(U) $(srcdir)/logging/*.vty -vty-test-vty: +vty-test-vty: $(top_builddir)/tests/vty/vty_transcript_test osmo_verify_transcript_vty.py -v \ -p 42042 \ -r "$(top_builddir)/tests/vty/vty_transcript_test" \ $(U) $(srcdir)/vty/*.vty -vty-test-tdef: +vty-test-tdef: $(top_builddir)/tests/tdef/tdef_vty_config_root_test \ + $(top_builddir)/tests/tdef/tdef_vty_config_subnode_test \ + $(top_builddir)/tests/tdef/tdef_vty_dynamic_test osmo_verify_transcript_vty.py -v \ -p 42042 \ -r "$(top_builddir)/tests/tdef/tdef_vty_config_root_test" \ @@ -756,7 +758,7 @@ -r "$(top_builddir)/tests/tdef/tdef_vty_dynamic_test" \ $(U) $(srcdir)/tdef/tdef_vty_dynamic_test.vty -vty-test-stats: +vty-test-stats: $(top_builddir)/tests/stats/stats_vty_test osmo_verify_transcript_vty.py -v \ -p 42042 \ -r "$(top_builddir)/tests/stats/stats_vty_test" \ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I784fe3b5737b804f7b55da01d8beb619c57bafd6 Gerrit-Change-Number: 32134 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-smlc[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-smlc

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/32133 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-smlc ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on osmo-smlc Change-Id: I75a038b2730c7e0d4637db6dfb780839a49abc2e --- M tests/Makefile.am 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/33/32133/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 9487d3a..d046d49 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -37,11 +37,11 @@ $(NULL) if ENABLE_EXT_TESTS -python-tests: $(BUILT_SOURCES) +python-tests: $(MAKE) vty-test $(MAKE) ctrl-test else -python-tests: $(BUILT_SOURCES) +python-tests: echo "Not running python-based tests (determined at configure-time)" endif @@ -51,7 +51,7 @@ # To update the VTY script from current application behavior, # pass -u to vty_script_runner.py by doing: # make vty-test U=-u -vty-test: +vty-test: $(top_builddir)/src/osmo-smlc/osmo-smlc osmo_verify_transcript_vty.py -v \ -n OsmoSMLC -p 4271 \ -r "$(top_builddir)/src/osmo-smlc/osmo-smlc -c $(top_srcdir)/tests/osmo-smlc.cfg" \ @@ -60,7 +60,7 @@ # To update the CTRL script from current application behavior, # pass -u to ctrl_script_runner.py by doing: # make ctrl-test U=-u -ctrl-test: +ctrl-test: $(top_builddir)/src/osmo-smlc/osmo-smlc -rm -f $(CTRL_TEST_DB) osmo_verify_transcript_ctrl.py -v \ -p 4272 \ -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/32133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I75a038b2730c7e0d4637db6dfb780839a49abc2e Gerrit-Change-Number: 32133 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: osmoappdesc.py: add more config files for testing

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32132 ) Change subject: osmoappdesc.py: add more config files for testing ...................................................................... osmoappdesc.py: add more config files for testing Change-Id: I9199f3e39c677dfd6e3936b9cf4897a070156b03 --- M osmoappdesc.py 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/32/32132/1 diff --git a/osmoappdesc.py b/osmoappdesc.py index 08c3252..4565a22 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -15,7 +15,10 @@ # along with this program. If not, see <http://www.gnu.org/licenses/> app_configs = { + # TODO: doc/examples/osmo-bsc/{ericsson,nokia,siemens} "osmo-bsc": ["doc/examples/osmo-bsc/osmo-bsc.cfg", + "doc/examples/osmo-bsc/osmo-bsc-minimal.cfg", + "doc/examples/osmo-bsc/osmo-bsc-4trx.cfg", "doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg"] } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9199f3e39c677dfd6e3936b9cf4897a070156b03 Gerrit-Change-Number: 32132 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-sip-connector[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-sip-connector

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/32131 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-sip-connector ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on osmo-sip-connector Change-Id: I3aeaace814a209dade5323f30a5a91e4a9d73595 --- M tests/Makefile.am 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/31/32131/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index a8e6738..c438469 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,9 +1,9 @@ if ENABLE_EXT_TESTS -python-tests: $(BUILT_SOURCES) +python-tests: $(top_builddir)/src/osmo-sip-connector osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v else -python-tests: $(BUILT_SOURCES) +python-tests: echo "Not running python-based tests (determined at configure-time)" endif -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/32131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3aeaace814a209dade5323f30a5a91e4a9d73595 Gerrit-Change-Number: 32131 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-pcu[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-pcu

by fixeria

fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/32129 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-pcu ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on osmo-pcu Change-Id: I6620a524b393a0db6201930a1e2795a439785824 --- M tests/Makefile.am 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/29/32129/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6620a524b393a0db6201930a1e2795a439785824 Gerrit-Change-Number: 32129 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[S] Change in osmo-sgsn[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-sgsn

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/32130 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-sgsn ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on osmo-sgsn Change-Id: I4f9e99ed3673bb51fa5f7d374c35c3c92735eacb --- M tests/Makefile.am 1 file changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/30/32130/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index c3dc695..2c07ac9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,15 +42,15 @@ $(NULL) if ENABLE_EXT_TESTS -python-tests: $(BUILT_SOURCES) +python-tests: $(MAKE) vty-test $(MAKE) ctrl-python-test else -python-tests: $(BUILT_SOURCES) +python-tests: echo "Not running python-based tests (determined at configure-time)" endif -vty-python-test: $(BUILT_SOURCES) +vty-python-test: $(top_builddir)/src/sgsn/osmo-sgsn osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v @@ -59,7 +59,7 @@ # To update the VTY script from current application behavior, # pass -u to vty_script_runner.py by doing: # make vty-transcript-test U=-u -vty-transcript-test: +vty-transcript-test: $(top_builddir)/src/sgsn/osmo-sgsn osmo_verify_transcript_vty.py -v \ -n OsmoSGSN -p 4245 \ -r "$(top_builddir)/src/sgsn/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \ @@ -71,7 +71,7 @@ $(MAKE) vty-python-test $(MAKE) vty-transcript-test -ctrl-python-test: $(BUILT_SOURCES) +ctrl-python-test: $(top_builddir)/src/sgsn/osmo-sgsn $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v rm -f $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/32130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4f9e99ed3673bb51fa5f7d374c35c3c92735eacb Gerrit-Change-Number: 32130 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-pcu[master]: tests: $(BUILT_SOURCES) is not defined, depend on src/osmo-pcu

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32129 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on src/osmo-pcu ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on src/osmo-pcu Change-Id: I6620a524b393a0db6201930a1e2795a439785824 --- M tests/Makefile.am 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/29/32129/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 1c7b072..00dc595 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -247,12 +247,12 @@ # Python testing if ENABLE_VTY_TESTS -python-tests: $(BUILT_SOURCES) +python-tests: $(top_builddir)/src/osmo-pcu osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v else -python-tests: $(BUILT_SOURCES) +python-tests: @echo "Not running python-based tests (determined at configure-time)" endif -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6620a524b393a0db6201930a1e2795a439785824 Gerrit-Change-Number: 32129 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-pcap[master]: tests: $(BUILT_SOURCES) is not defined

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/32121 ) Change subject: tests: $(BUILT_SOURCES) is not defined ...................................................................... Patch Set 1: (1 comment) File tests/Makefile.am: https://gerrit.osmocom.org/c/osmo-pcap/+/32121/comment/14083d0e_aa0a562a PS1, Line 24: python-tests: > you are missing the binary path here? It's actually a good question what binary. There are both -client and -server, perhaps both? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/32121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I81dc30f6d6e3b25723f00d945c87b9c01c648cbf Gerrit-Change-Number: 32121 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 19:03:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bts-virtual

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32117 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bts-virtual ...................................................................... Patch Set 1: (1 comment) File tests/Makefile.am: https://gerrit.osmocom.org/c/osmo-bts/+/32117/comment/526fbd30_03156739 PS1, Line 35: python-tests: > $(top_builddir)/src/osmo-bts-virtual/osmo-bts-virtual I am intentionally not adding dependencies if they're not used directly. This dependency is added to the `vty-test` target, where it's used explicityly. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4ace06e115a2689bde9afd9f99ecee99d796360b Gerrit-Change-Number: 32117 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 19:02:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: rtp continuous-streaming: fix BFI in the quality-suppressed case

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32128 ) Change subject: rtp continuous-streaming: fix BFI in the quality-suppressed case ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icee0f57be289a0592a0197469432a012d15f224c Gerrit-Change-Number: 32128 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 29 Mar 2023 18:36:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: rtp continuous-streaming: fix BFI in the quality-suppressed case

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32128 ) Change subject: rtp continuous-streaming: fix BFI in the quality-suppressed case ...................................................................... Patch Set 2: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/32128/comment/43b3024e_795e31e3 PS1, Line 1661: send_ul_rtp_packet(lchan, fn, bfi, 0); > I did not realize that passing a NULL pointer was allowed, for some reason I thought it had to be a […] well if len = 0, then it makes no sense to access to buffer, so it shouldn't expect it to be non-null in that case. The question is more whether it's fine to have len=0 on that path, but I think it ws the case before right? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icee0f57be289a0592a0197469432a012d15f224c Gerrit-Change-Number: 32128 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 29 Mar 2023 18:36:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: rtp continuous-streaming: fix BFI in the quality-suppressed case

by falconia

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/32128 to look at the new patch set (#2). Change subject: rtp continuous-streaming: fix BFI in the quality-suppressed case ...................................................................... rtp continuous-streaming: fix BFI in the quality-suppressed case The check for (tch_ind->lqual_cb >= bts->min_qual_norm) in l1sap_tch_ind() has the intent of suppressing valid-seeming speech frame output from lower layers when the link quality is too low; this check is particularly important for FR1 codec where the intrinsic validity check is only a 3-bit CRC which has 1/8 probability of indicating "correct" when decoding radio noise during DTXu silence. However, this check is effectively defeated in the current implementation of rtp continuous-streaming, at least when themyscira-bfi extension is not used or when it doesn't apply because the codec is not FR or EFR: the RTP packet being output is the presumed-bogus speech frame from lower layers, rather than the intended zero-length payload. Fix this bug. Related: OS#5975 Change-Id: Icee0f57be289a0592a0197469432a012d15f224c --- M src/common/l1sap.c 1 file changed, 27 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/28/32128/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icee0f57be289a0592a0197469432a012d15f224c Gerrit-Change-Number: 32128 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: rtp continuous-streaming: fix BFI in the quality-suppressed case

by falconia

Attention is currently required from: pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32128 ) Change subject: rtp continuous-streaming: fix BFI in the quality-suppressed case ...................................................................... Patch Set 1: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/32128/comment/21db46c9_17b5bd58 PS1, Line 1661: send_ul_rtp_packet(lchan, fn, bfi, 0); > bfi is actually not used here (len=0), so better pass NULL to make it clear. I did not realize that passing a NULL pointer was allowed, for some reason I thought it had to be a pointer to some "real" memory location, like what happens with msg->data when msg->len equals 0. But if you say that NULL is acceptable, then of course it is philosophically more correct - I'll spin a revised patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icee0f57be289a0592a0197469432a012d15f224c Gerrit-Change-Number: 32128 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 18:19:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: common+trx: add rtp ecu-downstream vty option

by falconia

Attention is currently required from: pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32110 ) Change subject: common+trx: add rtp ecu-downstream vty option ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > So AFAIU you are saying that your ECU is located somewhere in the CN after osmo-msc, as in some sort of PBX/sip-connector. Correct. > So, you are actually tweaking the *uplink* RTP path of that BTS here, not the *downlink*. So not sure the "downstream" concept really fits here. I think I see the source of confusion: the two words "downlink" and "downstream" both begin with the prefix "down", but they are two different English words, and in the present case have completely unrelated meanings. Think of upstream and downstream as in software developers, maintainers and distributors: the original developer's git repository is the ultimate upstream, tarball releases are downstream from that original repo, distro packages are further downstream, and so on. In the present case, I meant "downstream" as in "down the flow of this BTS-originated RTP stream", with the stream flowing through forwarders (OsmoMGW) and translators (themwi-mgw). > Maybe "rtp uplink-external-eecu" or alike? I am agnostic on most naming questions, including this one. Harald, you already gave us the name for "rtp continuous-streaming" - maybe you could name this one for us too? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0acca9c6d7da966a623287563e0789db9e0fae8e Gerrit-Change-Number: 32110 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 18:06:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: rtp continuous-streaming: fix BFI in the quality-suppressed case

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32128 ) Change subject: rtp continuous-streaming: fix BFI in the quality-suppressed case ...................................................................... Patch Set 1: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/32128/comment/a2c3b65a_bc44115a PS1, Line 1661: send_ul_rtp_packet(lchan, fn, bfi, 0); bfi is actually not used here (len=0), so better pass NULL to make it clear. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icee0f57be289a0592a0197469432a012d15f224c Gerrit-Change-Number: 32128 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-CC: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 29 Mar 2023 18:00:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: rtp continuous-streaming: fix BFI in the quality-suppressed case

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32128 ) Change subject: rtp continuous-streaming: fix BFI in the quality-suppressed case ...................................................................... rtp continuous-streaming: fix BFI in the quality-suppressed case The check for (tch_ind->lqual_cb >= bts->min_qual_norm) in l1sap_tch_ind() has the intent of suppressing valid-seeming speech frame output from lower layers when the link quality is too low; this check is particularly important for FR1 codec where the intrinsic validity check is only a 3-bit CRC which has 1/8 probability of indicating "correct" when decoding radio noise during DTXu silence. However, this check is effectively defeated in the current implementation of rtp continuous-streaming, at least when themyscira-bfi extension is not used or when it doesn't apply because the codec is not FR or EFR: the RTP packet being output is the presumed-bogus speech frame from lower layers, rather than the intended zero-length payload. Fix this bug. Related: OS#5975 Change-Id: Icee0f57be289a0592a0197469432a012d15f224c --- M src/common/l1sap.c 1 file changed, 27 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/28/32128/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index bb19524..0664816 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1645,7 +1645,7 @@ return 1; } } else { - /* Are we in rtp continuous-stream special mode? If so, send + /* Are we in rtp continuous-streaming special mode? If so, send * out a BFI packet as zero-length RTP payload, or in Themyscira * BFI format if that option is also enabled and the codec is * FR or EFR. */ @@ -1658,7 +1658,7 @@ bfi[1] = (fn % 104 == 52); /* TAF */ send_ul_rtp_packet(lchan, fn, bfi, 2); } else - send_ul_rtp_packet(lchan, fn, msg->data, msg->len); + send_ul_rtp_packet(lchan, fn, bfi, 0); } else { DEBUGPGT(DRTP, &g_time, "Skipping RTP frame with lost payload (chan_nr=0x%02x)\n", chan_nr); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icee0f57be289a0592a0197469432a012d15f224c Gerrit-Change-Number: 32128 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: common+trx: add rtp ecu-downstream vty option

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32110 ) Change subject: common+trx: add rtp ecu-downstream vty option ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > No, "downstream" here means down the RTP stream from the BTS: after the RTP stream is emitted from t […] Ok as I expected I am still confused with the naming then. So AFAIU you are saying that your ECU is located somewhere in the CN after osmo-msc, as in some sort of PBX/sip-connector. So, you are actually tweaking the *uplink* RTP path of that BTS here, not the *downlink*. So not sure the "downstream" concept really fits here. Maybe "rtp uplink-external-eecu" or alike? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0acca9c6d7da966a623287563e0789db9e0fae8e Gerrit-Change-Number: 32110 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 29 Mar 2023 17:37:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-pcap[master]: contrib/jenkins.sh: build with --enable-external-tests

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/32127 ) Change subject: contrib/jenkins.sh: build with --enable-external-tests ...................................................................... contrib/jenkins.sh: build with --enable-external-tests We already have this flag in file contrib/travis.sh, but on Jenkins we're actually executing contrib/jenkins.sh, not the former one. Change-Id: Ic9d37b231510e592198a9de707dfe8f5f2703dce --- M contrib/jenkins.sh 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/27/32127/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 683fb9d..2e0634e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -44,12 +44,13 @@ autoreconf --install --force PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure \ --with-pcap-config=/bin/true \ + --enable-external-tests \ --enable-sanitize \ --enable-werror \ $CONFIG $MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh -DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true $CONFIG" \ +DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true --enable-external-tests $CONFIG" \ PCAP_LIBS="-lpcap" PCAP_CFLAGS="" \ $MAKE distcheck || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/32127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ic9d37b231510e592198a9de707dfe8f5f2703dce Gerrit-Change-Number: 32127 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: llc: Free allocated LLMEs when freeing main context

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32126 ) Change subject: llc: Free allocated LLMEs when freeing main context ...................................................................... llc: Free allocated LLMEs when freeing main context Change-Id: Ifb51a956d5a41f01184db4d453c64128db439f7c --- M src/llc/llc.c 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/26/32126/1 diff --git a/src/llc/llc.c b/src/llc/llc.c index 1c572d6..2ad0228 100644 --- a/src/llc/llc.c +++ b/src/llc/llc.c @@ -121,6 +121,16 @@ }, }; +static void gprs_llc_ctx_free(void) +{ + struct gprs_llc_llme *llme; + + while ((llme = llist_first_entry_or_null(&g_ctx->llme_list, struct gprs_llc_llme, list))) + gprs_llc_llme_free(llme); + + talloc_free(g_ctx); +} + int osmo_gprs_llc_init(enum osmo_gprs_llc_location location, const char *cipher_plugin_path) { int rc; @@ -132,7 +142,7 @@ } if (g_ctx) - talloc_free(g_ctx); + gprs_llc_ctx_free(); g_ctx = talloc_zero(NULL, struct gprs_llc_ctx); g_ctx->location = location; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ifb51a956d5a41f01184db4d453c64128db439f7c Gerrit-Change-Number: 32126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Free allocated GMMEs when freeing main context

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32125 ) Change subject: gmm: Free allocated GMMEs when freeing main context ...................................................................... gmm: Free allocated GMMEs when freeing main context Change-Id: I092b2d133467d1c2dcb8dfe5def99d49807b6273 --- M src/gmm/gmm.c 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/25/32125/1 diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 163bbe8..a8b8362 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -78,6 +78,16 @@ { 0 } /* empty item at the end */ }; +static void gprs_gmm_ctx_free(void) +{ + struct gprs_gmm_entity *gmme; + + while ((gmme = llist_first_entry_or_null(&g_ctx->gmme_list, struct gprs_gmm_entity, list))) + gprs_gmm_gmme_free(gmme); + + talloc_free(g_ctx); +} + int osmo_gprs_gmm_init(enum osmo_gprs_gmm_location location) { bool first_init = true; @@ -86,7 +96,7 @@ if (g_ctx) { first_init = false; - talloc_free(g_ctx); + gprs_gmm_ctx_free(); } g_ctx = talloc_zero(NULL, struct gprs_gmm_ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I092b2d133467d1c2dcb8dfe5def99d49807b6273 Gerrit-Change-Number: 32125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Free ms_fsm when freeing gmme

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32124 ) Change subject: gmm: Free ms_fsm when freeing gmme ...................................................................... gmm: Free ms_fsm when freeing gmme Change-Id: I0f2dd55bf0241a37a06e2ea438ca6ac2418eb7b8 --- M include/osmocom/gprs/gmm/gmm_ms_fsm.h M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c 3 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/24/32124/1 diff --git a/include/osmocom/gprs/gmm/gmm_ms_fsm.h b/include/osmocom/gprs/gmm/gmm_ms_fsm.h index 7aff7ab..dd22a32 100644 --- a/include/osmocom/gprs/gmm/gmm_ms_fsm.h +++ b/include/osmocom/gprs/gmm/gmm_ms_fsm.h @@ -53,3 +53,4 @@ void gprs_gmm_ms_fsm_set_log_cat(int logcat); int gprs_gmm_ms_fsm_ctx_init(struct gprs_gmm_ms_fsm_ctx *ctx, struct gprs_gmm_entity *gmme); +void gprs_gmm_ms_fsm_ctx_release(struct gprs_gmm_ms_fsm_ctx *ctx); diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 2ac6e97..163bbe8 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -150,6 +150,7 @@ return; LOGGMME(gmme, LOGL_DEBUG, "free()\n"); + gprs_gmm_ms_fsm_ctx_release(&gmme->ms_fsm); llist_del(&gmme->list); talloc_free(gmme); } diff --git a/src/gmm/gmm_ms_fsm.c b/src/gmm/gmm_ms_fsm.c index 72c6d15..423d1d0 100644 --- a/src/gmm/gmm_ms_fsm.c +++ b/src/gmm/gmm_ms_fsm.c @@ -289,3 +289,8 @@ return 0; } + +void gprs_gmm_ms_fsm_ctx_release(struct gprs_gmm_ms_fsm_ctx *ctx) +{ + osmo_fsm_inst_free(ctx->fi); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I0f2dd55bf0241a37a06e2ea438ca6ac2418eb7b8 Gerrit-Change-Number: 32124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Release UL_TBF L1CTL resources upon free

by pespin

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32123 to look at the new patch set (#2). Change subject: rlcmac: Release UL_TBF L1CTL resources upon free ...................................................................... rlcmac: Release UL_TBF L1CTL resources upon free Change-Id: I4c98d5431a8409a6d428e96f9bfbb442bd75b24f --- M src/rlcmac/tbf_ul_fsm.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 3 files changed, 71 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/23/32123/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4c98d5431a8409a6d428e96f9bfbb442bd75b24f Gerrit-Change-Number: 32123 Gerrit-PatchSet: 2 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-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Release UL_TBF L1CTL resources upon free

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32123 ) Change subject: rlcmac: Release UL_TBF L1CTL resources upon free ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: @fixeria, after this we still need to somehow signal to L1CTL that this MS should return to idle mode camping in BCCH. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4c98d5431a8409a6d428e96f9bfbb442bd75b24f Gerrit-Change-Number: 32123 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 15:35:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Release UL_TBF L1CTL resources upon free

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32123 ) Change subject: rlcmac: Release UL_TBF L1CTL resources upon free ...................................................................... rlcmac: Release UL_TBF L1CTL resources upon free Change-Id: I4c98d5431a8409a6d428e96f9bfbb442bd75b24f --- M src/rlcmac/tbf_ul_fsm.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 3 files changed, 67 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/23/32123/1 diff --git a/src/rlcmac/tbf_ul_fsm.c b/src/rlcmac/tbf_ul_fsm.c index e49e6dc..6691734 100644 --- a/src/rlcmac/tbf_ul_fsm.c +++ b/src/rlcmac/tbf_ul_fsm.c @@ -69,12 +69,15 @@ return ul_slotmask; } -static int configure_ul_tbf(struct gprs_rlcmac_tbf_ul_fsm_ctx *ctx) +static int configure_ul_tbf(struct gprs_rlcmac_tbf_ul_fsm_ctx *ctx, bool release) { struct osmo_gprs_rlcmac_prim *rlcmac_prim; - uint8_t ul_slotmask = ul_tbf_ul_slotmask(ctx->ul_tbf); + uint8_t ul_slotmask; - LOGPFSML(ctx->fi, LOGL_INFO, "Send L1CTL-CF_UL_TBF.req ul_slotmask=0x%02x\n", ul_slotmask); + ul_slotmask = release ? 0 : ul_tbf_ul_slotmask(ctx->ul_tbf); + + LOGPFSML(ctx->fi, LOGL_INFO, "Send L1CTL-CF_UL_TBF.req ul_tbf_nr=%u ul_slotmask=0x%02x %s\n", + ctx->tbf->nr, ul_slotmask, release ? "(release)" : "(reconf)"); rlcmac_prim = gprs_rlcmac_prim_alloc_l1ctl_cfg_ul_tbf_req(ctx->tbf->nr, ul_slotmask); return gprs_rlcmac_prim_call_down_cb(rlcmac_prim); } @@ -124,7 +127,7 @@ /* Mark everything we transmitted so far as NACKed: */ gprs_rlcmac_rlc_ul_window_mark_for_resend(ctx->ul_tbf->ulw); /* Make sure the lower layers realize this tbf_nr has no longer any assigned resource: */ - configure_ul_tbf(ctx); + configure_ul_tbf(ctx, false); } static void st_new(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -145,7 +148,7 @@ switch (event) { case GPRS_RLCMAC_TBF_UL_EV_UL_ASS_COMPL: /* Configure UL TBF on the lower MAC side: */ - configure_ul_tbf(ctx); + configure_ul_tbf(ctx, false); tbf_ul_fsm_state_chg(fi, GPRS_RLCMAC_TBF_UL_ST_FLOW); break; default: @@ -243,6 +246,7 @@ } } +/* Waiting for scheduler to transmit PKT CTRL ACK for the already received UL ACK/NACK FinalAck=1 */ static void st_releasing(struct osmo_fsm_inst *fi, uint32_t event, void *data) { //struct gprs_rlcmac_tbf_ul_fsm_ctx *ctx = (struct gprs_rlcmac_tbf_ul_fsm_ctx *)fi->priv; @@ -379,6 +383,12 @@ void gprs_rlcmac_tbf_ul_fsm_destructor(struct gprs_rlcmac_ul_tbf *ul_tbf) { struct gprs_rlcmac_tbf_ul_fsm_ctx *ctx = &ul_tbf->state_fsm; + + if (ctx->fi->state != GPRS_RLCMAC_TBF_UL_ST_RELEASING) { + /* If FSM state is not in RELEASING, it didnt't release resources for + * this tbf_nr yet, do it now before freeing. */ + configure_ul_tbf(ctx, true); + } osmo_fsm_inst_free(ctx->fi); ctx->fi = NULL; } diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err index e7edbca..ca86bda 100644 --- a/tests/rlcmac/rlcmac_prim_test.err +++ b/tests/rlcmac/rlcmac_prim_test.err @@ -15,7 +15,7 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -83,14 +83,14 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE DLGLOBAL INFO UL_TBF{FLOW}: Timeout of T3164 DLGLOBAL INFO UL_TBF{FLOW}: T3164 timeout attempts=1 DLGLOBAL INFO UL_TBF{FLOW}: state_chg to NEW -DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x00 +DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START @@ -104,14 +104,14 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE DLGLOBAL INFO UL_TBF{FLOW}: Timeout of T3164 DLGLOBAL INFO UL_TBF{FLOW}: T3164 timeout attempts=2 DLGLOBAL INFO UL_TBF{FLOW}: state_chg to NEW -DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x00 +DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START @@ -125,14 +125,14 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE DLGLOBAL INFO UL_TBF{FLOW}: Timeout of T3164 DLGLOBAL INFO UL_TBF{FLOW}: T3164 timeout attempts=3 DLGLOBAL INFO UL_TBF{FLOW}: state_chg to NEW -DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x00 +DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START @@ -146,7 +146,7 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -154,6 +154,8 @@ DLGLOBAL INFO UL_TBF{FLOW}: T3164 timeout attempts=4 DLGLOBAL NOTICE UL_TBF{FLOW}: TBF establishment failure (T3164 timeout attempts=4) DLGLOBAL INFO UL_TBF_ASS{IDLE}: Deallocated +DLGLOBAL INFO UL_TBF{FLOW}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (release) +DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{FLOW}: Deallocated DLGLOBAL INFO DL_TBF_ASS{IDLE}: Deallocated DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request @@ -173,7 +175,7 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -194,7 +196,7 @@ DLGLOBAL INFO UL_TBF{FLOW}: Timeout of T3166 DLGLOBAL INFO UL_TBF{FLOW}: T3166 timeout attempts=1 DLGLOBAL INFO UL_TBF{FLOW}: state_chg to NEW -DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x00 +DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START @@ -208,7 +210,7 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -226,7 +228,7 @@ DLGLOBAL INFO UL_TBF{FLOW}: Timeout of T3166 DLGLOBAL INFO UL_TBF{FLOW}: T3166 timeout attempts=2 DLGLOBAL INFO UL_TBF{FLOW}: state_chg to NEW -DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x00 +DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START @@ -240,7 +242,7 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -258,7 +260,7 @@ DLGLOBAL INFO UL_TBF{FLOW}: Timeout of T3166 DLGLOBAL INFO UL_TBF{FLOW}: T3166 timeout attempts=3 DLGLOBAL INFO UL_TBF{FLOW}: state_chg to NEW -DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x00 +DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START @@ -272,7 +274,7 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -291,6 +293,8 @@ DLGLOBAL INFO UL_TBF{FLOW}: T3166 timeout attempts=4 DLGLOBAL NOTICE UL_TBF{FLOW}: TBF establishment failure (T3166 timeout attempts=4) DLGLOBAL INFO UL_TBF_ASS{IDLE}: Deallocated +DLGLOBAL INFO UL_TBF{FLOW}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (release) +DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{FLOW}: Deallocated DLGLOBAL INFO DL_TBF_ASS{IDLE}: Deallocated DLGLOBAL DEBUG Rx from lower layers: L1CTL-CCCH_DATA.indication @@ -312,7 +316,7 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -411,7 +415,7 @@ DLGLOBAL NOTICE TBF(UL:NR-0:TLLI-00002342) N3104_MAX (9) reached DLGLOBAL INFO UL_TBF{FINISHED}: Received Event N3104_MAX DLGLOBAL INFO UL_TBF{FINISHED}: state_chg to NEW -DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x00 +DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START @@ -426,12 +430,14 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE DLGLOBAL INFO DL_TBF_ASS{IDLE}: Deallocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Deallocated +DLGLOBAL INFO UL_TBF{FLOW}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (release) +DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{FLOW}: Deallocated DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly @@ -450,7 +456,7 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -492,6 +498,8 @@ DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request DLGLOBAL INFO UL_TBF{FINISHED}: Timeout of T3182 DLGLOBAL INFO UL_TBF_ASS{IDLE}: Deallocated +DLGLOBAL INFO UL_TBF{FINISHED}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (release) +DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{FINISHED}: Deallocated DLGLOBAL INFO DL_TBF_ASS{IDLE}: Deallocated DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request @@ -511,7 +519,7 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -596,6 +604,8 @@ DLGLOBAL INFO UL_TBF{FINISHED}: Last UL block sent (CV=0), start T3182 DLGLOBAL NOTICE UL_TBF{FINISHED}: TBF establishment failure (Data block with CV=0 retransmit attempts=4) DLGLOBAL INFO UL_TBF_ASS{IDLE}: Deallocated +DLGLOBAL INFO UL_TBF{FINISHED}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (release) +DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{FINISHED}: Deallocated DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request DLGLOBAL INFO DL_TBF_ASS{IDLE}: Deallocated @@ -616,7 +626,7 @@ DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x80 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -665,6 +675,8 @@ DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request DLGLOBAL INFO DL_TBF_ASS{IDLE}: Deallocated DLGLOBAL INFO UL_TBF_ASS{WAIT_PKT_UL_ASS}: Deallocated +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=1 ul_slotmask=0x00 (release) +DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: Deallocated DLGLOBAL INFO Rx from upper layers: GMMRR-ASSIGN.request DLGLOBAL INFO GMMRR-ASSIGN.req: creating new entity TLLI=0x00000001 @@ -749,7 +761,7 @@ DLGLOBAL DEBUG Register POLL (TS=7 FN=43, reason=UL_ASS) DLGLOBAL INFO UL_TBF_ASS{WAIT_PKT_UL_ASS}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL -DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0xc0 +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0xc0 (reconf) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE @@ -777,4 +789,6 @@ DLGLOBAL INFO DL_TBF_ASS{IDLE}: Deallocated DLGLOBAL INFO DL_TBF{FINISHED}: Deallocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Deallocated +DLGLOBAL INFO UL_TBF{FINISHED}: Send L1CTL-CF_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0x00 (release) +DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{FINISHED}: Deallocated diff --git a/tests/rlcmac/rlcmac_prim_test.ok b/tests/rlcmac/rlcmac_prim_test.ok index 7028547..fd532f3 100644 --- a/tests/rlcmac/rlcmac_prim_test.ok +++ b/tests/rlcmac/rlcmac_prim_test.ok @@ -27,6 +27,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 sys={20.000000}, mono={20.000000}: clock_override_add sys={20.000000}, mono={20.000000}: Expect T3164 timeout +test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 === test_ul_tbf_t3164_timeout end === === test_ul_tbf_t3166_timeout start === sys={0.000000}, mono={0.000000}: clock_override_set @@ -53,6 +54,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=4 ts=7 data_len=34 data=[3c 01 01 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 00 ] sys={20.000000}, mono={20.000000}: clock_override_add sys={20.000000}, mono={20.000000}: Expect T3166 timeout +test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 === test_ul_tbf_t3166_timeout end === === test_ul_tbf_n3104_timeout start === sys={0.000000}, mono={0.000000}: clock_override_set @@ -80,6 +82,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=43 ts=7 data_len=34 data=[3c 01 01 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 00 ] test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 === test_ul_tbf_n3104_timeout end === +test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 === test_ul_tbf_t3182_timeout start === sys={0.000000}, mono={0.000000}: clock_override_set test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7a @@ -88,6 +91,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=8 ts=7 data_len=34 data=[00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] sys={5.000000}, mono={5.000000}: clock_override_add sys={5.000000}, mono={5.000000}: Expect T3182 timeout +test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 === test_ul_tbf_t3182_timeout end === === test_ul_tbf_last_data_cv0_retrans_max start === sys={0.000000}, mono={0.000000}: clock_override_set @@ -102,6 +106,7 @@ RTS 2: FN=21 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=21 ts=7 data_len=34 data=[00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] RTS 3: FN=26 +test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=26 ts=7 data_len=34 data=[00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] === test_ul_tbf_last_data_cv0_retrans_max end === === test_ul_tbf_request_another_ul_tbf start === @@ -111,6 +116,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=4 ts=7 data_len=34 data=[00 01 00 39 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=17 ts=7 data_len=23 data=[40 16 40 00 08 d0 a0 bc 00 00 00 00 00 00 70 00 38 00 00 2b 2b 2b 2b ] === test_ul_tbf_request_another_ul_tbf end === +test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=1 ul_slotmask=0x00 === test_dl_tbf_ccch_assign start === sys={0.000000}, mono={0.000000}: clock_override_set test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_DL_TBF.request dl_tbf_nr=0 dl_slotmask=0x80 dl_tfi=0 @@ -126,3 +132,4 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=43 ts=7 data_len=23 data=[40 04 00 00 00 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b ] test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=47 ts=6 data_len=34 data=[00 06 00 39 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] === test_dl_tbf_ccch_assign_requests_ul_tbf_pacch end === +test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4c98d5431a8409a6d428e96f9bfbb442bd75b24f Gerrit-Change-Number: 32123 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: lc15: fix compiler warning about unused variable cell_size

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32105 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: lc15: fix compiler warning about unused variable cell_size ...................................................................... lc15: fix compiler warning about unused variable cell_size oml.c: In function ‘bts_model_apply_oml’: oml.c:1814:17: error: variable ‘cell_size’ set but not used [-Werror=unused-but-set-variable] 1814 | uint8_t cell_size; | ^~~~~~~~~ Change-Id: I0bf1542f613f613d03609d50836137ff440401af --- M src/osmo-bts-lc15/oml.c 1 file changed, 18 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index 4847c17..3709d8c 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1844,7 +1844,6 @@ int rc; struct gsm_bts_trx *trx; struct lc15l1_hdl *fl1h; - uint8_t cell_size; /* TODO: NM Object without FSM: */ switch (foh->obj_class) { @@ -1858,10 +1857,11 @@ case NM_MT_SET_RADIO_ATTR: trx = obj; fl1h = trx_lc15l1_hdl(trx); - /* convert max TA to max cell size in qbits */ - cell_size = bts->max_ta << 2; #if LITECELL15_API_VERSION >= LITECELL15_API(2,1,7) + { + /* convert max TA to max cell size in qbits */ + uint8_t cell_size = bts->max_ta << 2; /* We do not need to check for L1 handle * because the max cell size parameter can receive before MphInit */ if (fl1h->phy_inst->u.lc15.max_cell_size != cell_size) { @@ -1870,6 +1870,7 @@ /* update current max cell size */ fl1h->phy_inst->u.lc15.max_cell_size = cell_size; } + } #endif /* Did we go through MphInit yet? If yes fire and forget */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0bf1542f613f613d03609d50836137ff440401af Gerrit-Change-Number: 32105 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: gprs_rlcmac_tbf_free():Call proper free function for DL TBF

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32122 ) Change subject: rlcmac: gprs_rlcmac_tbf_free():Call proper free function for DL TBF ...................................................................... rlcmac: gprs_rlcmac_tbf_free():Call proper free function for DL TBF Change-Id: I65c37dd4ea20f039680e0927722b332d1140e62e --- M src/rlcmac/tbf.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/22/32122/1 diff --git a/src/rlcmac/tbf.c b/src/rlcmac/tbf.c index c82f0ea..a88e924 100644 --- a/src/rlcmac/tbf.c +++ b/src/rlcmac/tbf.c @@ -21,6 +21,7 @@ #include <osmocom/gprs/rlcmac/tbf.h> #include <osmocom/gprs/rlcmac/tbf_ul.h> +#include <osmocom/gprs/rlcmac/tbf_dl.h> #include <osmocom/gprs/rlcmac/gre.h> #include <osmocom/gprs/rlcmac/pdch_ul_controller.h> @@ -43,5 +44,6 @@ { if (tbf->direction == GPRS_RLCMAC_TBF_DIR_UL) gprs_rlcmac_ul_tbf_free(tbf_as_ul_tbf(tbf)); - /* else: TODO dl_tbf not yet implemented */ + else + gprs_rlcmac_dl_tbf_free(tbf_as_dl_tbf(tbf)); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I65c37dd4ea20f039680e0927722b332d1140e62e Gerrit-Change-Number: 32122 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Support cpu-sched vty node from libosmocore

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32113 ) Change subject: layer23: Support cpu-sched vty node from libosmocore ...................................................................... layer23: Support cpu-sched vty node from libosmocore Change-Id: I1affb401bf355360fe306568c9b5c005dbd0746c --- M src/host/layer23/src/common/vty.c 1 file changed, 14 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index fd63918..5985fb1 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -29,6 +29,10 @@ #include <osmocom/core/gsmtap.h> #include <osmocom/core/gsmtap_util.h> #include <osmocom/crypt/auth.h> +#include <osmocom/vty/cpu_sched_vty.h> +#include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/stats.h> +#include <osmocom/vty/misc.h> #include <osmocom/bb/common/vty.h> #include <osmocom/bb/common/l23_app.h> @@ -43,9 +47,6 @@ #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/gsm480_ss.h> #include <osmocom/bb/mobile/gsm411_sms.h> -#include <osmocom/vty/telnet_interface.h> -#include <osmocom/vty/stats.h> -#include <osmocom/vty/misc.h> bool l23_vty_reading = false; @@ -575,6 +576,7 @@ /* Register the talloc context introspection command */ osmo_talloc_vty_add_cmds(); + osmo_cpu_sched_vty_init(l23_ctx); if (l23_vty_signal_cb) rc = osmo_signal_register_handler(SS_L23_VTY, l23_vty_signal_cb, NULL); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1affb401bf355360fe306568c9b5c005dbd0746c Gerrit-Change-Number: 32113 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: fill imsi & imei in vty 'test gmm attach'

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32081 ) Change subject: layer23: modem: fill imsi & imei in vty 'test gmm attach' ...................................................................... layer23: modem: fill imsi & imei in vty 'test gmm attach' Related: OS#5501 Change-Id: If93f7e2cbb421d0aa2702b8e130c8602fbc18a97 --- M src/host/layer23/src/modem/vty.c 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/layer23/src/modem/vty.c b/src/host/layer23/src/modem/vty.c index 69848df..68a46b8 100644 --- a/src/host/layer23/src/modem/vty.c +++ b/src/host/layer23/src/modem/vty.c @@ -162,14 +162,21 @@ { struct osmo_gprs_gmm_prim *gmm_prim; const uint32_t tlli = 0xe1c5d364; + const char *imsi = "1234567890"; + const char *imei = "42342342342342"; + const char *imeisv = "4234234234234275"; struct osmocom_ms *ms; if ((ms = l23_vty_get_ms(argv[0], vty)) == NULL) return CMD_WARNING; gmm_prim = osmo_gprs_gmm_prim_alloc_gmmreg_attach_req(); - gmm_prim->gmmreg.attach_req.ptmsi = tlli; gmm_prim->gmmreg.attach_req.attach_type = OSMO_GPRS_GMM_ATTACH_TYPE_GPRS; + gmm_prim->gmmreg.attach_req.ptmsi = tlli; + OSMO_STRLCPY_ARRAY(gmm_prim->gmmreg.attach_req.imsi, imsi); + OSMO_STRLCPY_ARRAY(gmm_prim->gmmreg.attach_req.imei, imei); + OSMO_STRLCPY_ARRAY(gmm_prim->gmmreg.attach_req.imeisv, imeisv); + if (osmo_gprs_gmm_prim_upper_down(gmm_prim) != 0) { vty_out(vty, "Failed to enqueue a GMM PDU%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If93f7e2cbb421d0aa2702b8e130c8602fbc18a97 Gerrit-Change-Number: 32081 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: Forward GMMRR primitives between GMM and RLCMAC layers

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32080 ) Change subject: layer23: modem: Forward GMMRR primitives between GMM and RLCMAC layers ...................................................................... layer23: modem: Forward GMMRR primitives between GMM and RLCMAC layers Related: OS#5501 Change-Id: I7603d8bbda0cdd437eb7557267efb7bbc3552565 --- M src/host/layer23/src/modem/gmm.c M src/host/layer23/src/modem/rlcmac.c 2 files changed, 42 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index f88226e..9472e32 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -35,6 +35,7 @@ #include <osmocom/gprs/llc/llc_prim.h> #include <osmocom/gprs/gmm/gmm_prim.h> #include <osmocom/gprs/gmm/gmm.h> +#include <osmocom/gprs/rlcmac/rlcmac_prim.h> #include <osmocom/bb/common/settings.h> #include <osmocom/bb/common/logging.h> @@ -42,7 +43,6 @@ #include <osmocom/bb/common/ms.h> #include <osmocom/bb/modem/gmm.h> - static int modem_gmm_prim_up_cb(struct osmo_gprs_gmm_prim *gmm_prim, void *user_data) { const char *pdu_name = osmo_gprs_gmm_prim_name(gmm_prim); @@ -72,7 +72,22 @@ const char *pdu_name = osmo_gprs_gmm_prim_name(gmm_prim); int rc = 0; + osmo_static_assert(sizeof(struct osmo_gprs_gmm_gmmrr_prim) == sizeof(struct osmo_gprs_rlcmac_gmmrr_prim), + _gmmrr_prim_size); + switch (gmm_prim->oph.sap) { + case OSMO_GPRS_GMM_SAP_GMMRR: + /* Forward it to lower layers, pass ownership over to RLCMAC: */ + /* Optimization: GMM-GMMRR-ASSIGN-REQ is 1-to-1 ABI compatible with + RLCMAC-GMMRR-ASSIGN-REQ, we just need to adapt the header. + See osmo_static_assert(_gmmrr_prim_size) above. + */ + OSMO_ASSERT(gmm_prim->oph.primitive == OSMO_GPRS_GMM_GMMRR_ASSIGN); + gmm_prim->oph.sap = OSMO_GPRS_RLCMAC_SAP_GMMRR; + gmm_prim->oph.primitive = OSMO_GPRS_RLCMAC_GMMRR_ASSIGN; + osmo_gprs_rlcmac_prim_upper_down((struct osmo_gprs_rlcmac_prim *)gmm_prim); + rc = 1; /* Tell GMM that we take ownership of the prim. */ + break; case OSMO_GPRS_GMM_SAP_GMMREG: default: LOGP(DGMM, LOGL_ERROR, "%s(): Unexpected Rx %s\n", __func__, pdu_name); diff --git a/src/host/layer23/src/modem/rlcmac.c b/src/host/layer23/src/modem/rlcmac.c index 8327620..deb366a 100644 --- a/src/host/layer23/src/modem/rlcmac.c +++ b/src/host/layer23/src/modem/rlcmac.c @@ -35,6 +35,7 @@ #include <osmocom/gprs/rlcmac/rlcmac_prim.h> #include <osmocom/gprs/rlcmac/rlcmac.h> #include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/gmm/gmm_prim.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/l1ctl.h> @@ -75,12 +76,24 @@ static int modem_rlcmac_handle_gmmrr(struct osmo_gprs_rlcmac_prim *rlcmac_prim) { + struct osmo_gprs_gmm_prim *gmm_prim; int rc; + + osmo_static_assert(sizeof(struct osmo_gprs_rlcmac_gmmrr_prim) == sizeof(struct osmo_gprs_gmm_gmmrr_prim), + _gmmrr_prim_size); + switch (rlcmac_prim->oph.primitive) { case OSMO_GPRS_RLCMAC_GMMRR_PAGE: - LOGP(DRLCMAC, LOGL_ERROR, "%s(): TODO: implement answering to paging indication TLLI=0x%08x\n", - __func__, rlcmac_prim->gmmrr.page_ind.tlli); - rc = 0; + /* Forward it to upper layers, pass ownership over to GMM: */ + /* Optimization: RLCMAC-GMMRR-ASSIGN-REQ is 1-to-1 ABI compatible with + GMM-GMMRR-ASSIGN-REQ, we just need to adapt the header. + See osmo_static_assert(_gmmrr_prim_size) above. + */ + gmm_prim = (struct osmo_gprs_gmm_prim *)rlcmac_prim; + gmm_prim->oph.sap = OSMO_GPRS_GMM_SAP_GMMRR; + gmm_prim->oph.primitive = OSMO_GPRS_RLCMAC_GMMRR_PAGE; + osmo_gprs_gmm_prim_lower_up(gmm_prim); + rc = 1; /* Tell RLCMAC that we take ownership of the prim. */ break; default: LOGP(DRLCMAC, LOGL_NOTICE, "%s(): Unexpected Rx RLCMAC GMMRR prim %u\n", -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7603d8bbda0cdd437eb7557267efb7bbc3552565 Gerrit-Change-Number: 32080 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-pcap[master]: tests: $(BUILT_SOURCES) is not defined

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/32121 ) Change subject: tests: $(BUILT_SOURCES) is not defined ...................................................................... Patch Set 1: (1 comment) File tests/Makefile.am: https://gerrit.osmocom.org/c/osmo-pcap/+/32121/comment/b7d267f3_30d53457 PS1, Line 24: python-tests: you are missing the binary path here? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/32121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I81dc30f6d6e3b25723f00d945c87b9c01c648cbf Gerrit-Change-Number: 32121 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 13:50:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-pcap[master]: tests: $(BUILT_SOURCES) is not defined

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/32121 ) Change subject: tests: $(BUILT_SOURCES) is not defined ...................................................................... tests: $(BUILT_SOURCES) is not defined Change-Id: I81dc30f6d6e3b25723f00d945c87b9c01c648cbf --- M tests/Makefile.am 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/21/32121/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 720d631..61dffad 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,11 +21,11 @@ TESTSUITE = $(srcdir)/testsuite if ENABLE_EXT_TESTS -python-tests: $(BUILT_SOURCES) +python-tests: osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v else -python-tests: $(BUILT_SOURCES) +python-tests: echo "Not running python-based tests (determined at configure-time)" endif -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/32121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I81dc30f6d6e3b25723f00d945c87b9c01c648cbf Gerrit-Change-Number: 32121 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-mgw[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-mgw

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32119 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-mgw ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I951ce2410614993a855336e6bb408cae1823ef9a Gerrit-Change-Number: 32119 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 12:45:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bts-virtual

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32117 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bts-virtual ...................................................................... Patch Set 1: (1 comment) File tests/Makefile.am: https://gerrit.osmocom.org/c/osmo-bts/+/32117/comment/cb843508_295fd2b4 PS1, Line 35: python-tests: $(top_builddir)/src/osmo-bts-virtual/osmo-bts-virtual -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4ace06e115a2689bde9afd9f99ecee99d796360b Gerrit-Change-Number: 32117 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 12:44:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bsc

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32116 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bsc ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I640dd2cd599707ad6bc661e7bea08372d85b47df Gerrit-Change-Number: 32116 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 12:44:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-msc[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-msc

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/32120 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-msc ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on osmo-msc Change-Id: I3676a744bbe13d5d17caa94e9bd9e21c5c53de87 --- M tests/Makefile.am 1 file changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/32120/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index d25fe16..5b77250 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -48,7 +48,7 @@ if ENABLE_EXT_TESTS # don't run multiple tests concurrently so that the ports don't conflict -python-tests: $(BUILT_SOURCES) +python-tests: $(MAKE) vty-test $(MAKE) ctrl-test if BUILD_SMPP @@ -56,11 +56,11 @@ endif else -python-tests: $(BUILT_SOURCES) +python-tests: echo "Not running python-based tests (determined at configure-time)" endif -vty-python-test: $(BUILT_SOURCES) +vty-python-test: $(top_builddir)/src/osmo-msc/osmo-msc if BUILD_IU IU=1 osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v IU=1 osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v @@ -77,7 +77,7 @@ # To update the VTY script from current application behavior, # pass -u to vty_script_runner.py by doing: # make vty-transcript-test U=-u -vty-transcript-test: +vty-transcript-test: $(top_builddir)/src/osmo-msc/osmo-msc osmo_verify_transcript_vty.py -v \ -n OsmoMSC -p 4254 \ -r "$(top_builddir)/src/osmo-msc/osmo-msc -c $(top_srcdir)/doc/examples/osmo-msc/osmo-msc.cfg" \ @@ -89,7 +89,7 @@ $(MAKE) vty-python-test $(MAKE) vty-transcript-test -ctrl-python-test: $(BUILT_SOURCES) +ctrl-python-test: $(top_builddir)/src/osmo-msc/osmo-msc $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v rm -f $(top_builddir)/sms.db* @@ -104,7 +104,7 @@ $(MAKE) ctrl-python-test $(MAKE) ctrl-transcript-test -smpp-test: +smpp-test:$(top_builddir)/src/osmo-msc/osmo-msc $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v rm -f $(top_builddir)/sms.db* -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3676a744bbe13d5d17caa94e9bd9e21c5c53de87 Gerrit-Change-Number: 32120 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bts-virtual

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32117 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bts-virtual ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4ace06e115a2689bde9afd9f99ecee99d796360b Gerrit-Change-Number: 32117 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 12:43:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in libosmo-sccp[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-stp

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32115 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-stp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4864f4d78095187f566bcde772b71665fa6e4729 Gerrit-Change-Number: 32115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 12:41:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in libosmocore[master]: gsm: Add missing TS 24.008 SM layer IEs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32109 ) Change subject: gsm: Add missing TS 24.008 SM layer IEs ...................................................................... gsm: Add missing TS 24.008 SM layer IEs Change-Id: Iec0dbf617c8d0f2c8c44156d936244cedda9b303 --- M include/osmocom/gsm/protocol/gsm_04_08_gprs.h 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h index 40c8413..39f3b3e 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h +++ b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h @@ -101,15 +101,24 @@ }; enum gsm48_gprs_ie_sm { + GSM48_IE_GSM_RADIO_PRIO = 0x08, /* 10.5.7.2 */ + GSM48_IE_GSM_DEV_PROP = 0x0C, /* 10.5.7.8 */ GSM48_IE_GSM_APN = 0x28, /* 10.5.6.1 */ GSM48_IE_GSM_PROTO_CONF_OPT = 0x27, /* 10.5.6.3 */ GSM48_IE_GSM_PDP_ADDR = 0x2b, /* 10.5.6.4 */ GSM48_IE_GSM_AA_TMR = 0x29, /* 10.5.7.3 */ + GSM48_IE_GSM_QOS = 0x30, /* 10.5.6.5 */ + GSM48_IE_GSM_TFT = 0x31, /* 10.5.6.12 */ + GSM48_IE_GSM_LLC_SAPI = 0x32, /* 10.5.6.9 */ + GSM48_IE_GSM_MBIFOM_CONT = 0x33, /* 10.5.6.21 */ + GSM48_IE_GSM_PFI = 0x34, /* 10.5.6.11 */ GSM48_IE_GSM_NAME_FULL = 0x43, /* 10.5.3.5a */ GSM48_IE_GSM_NAME_SHORT = 0x45, /* 10.5.3.5a */ GSM48_IE_GSM_TIMEZONE = 0x46, /* 10.5.3.8 */ GSM48_IE_GSM_UTC_AND_TZ = 0x47, /* 10.5.3.9 */ GSM48_IE_GSM_LSA_ID = 0x48, /* 10.5.3.11 */ + GSM48_IE_GSM_EXT_QOS = 0x5C, /* 10.5.6.5B */ + GSM48_IE_GSM_EXT_PROTO_CONF_OPT = 0x7B, /* 10.5.6.3a */ /* Fake IEs that are not present on the Layer3 air interface, * but which we use to simplify internal APIs */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec0dbf617c8d0f2c8c44156d936244cedda9b303 Gerrit-Change-Number: 32109 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-mgw[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-mgw

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32119 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-mgw ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on osmo-mgw Change-Id: I951ce2410614993a855336e6bb408cae1823ef9a --- M tests/Makefile.am 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/32119/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 49a659f..745afd6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,11 +34,11 @@ $(NULL) if ENABLE_EXT_TESTS -python-tests: $(BUILT_SOURCES) +python-tests: $(top_builddir)/src/osmo-mgw/osmo-mgw osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v else -python-tests: $(BUILT_SOURCES) +python-tests: echo "Not running python-based tests (determined at configure-time)" endif -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I951ce2410614993a855336e6bb408cae1823ef9a Gerrit-Change-Number: 32119 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Fix DL_ASS polls removed when UL TBF released

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32118 ) Change subject: rlcmac: Fix DL_ASS polls removed when UL TBF released ...................................................................... rlcmac: Fix DL_ASS polls removed when UL TBF released The DL_TBF for the assignment is not created until later on when the DL_TBF is first used, only the DL_ASS request is stored as part of the gpre->tbf_dl_ass_fsm. Since no DL_TBF existed, the POLL was being stored if the DL_ASS referred the UL_TBF by means of GlobalTFI->ULTBF. Instead, let's not require an UL_TBF to be present and simply pass the GRE along which can be used to send the PKT_CTRL_ACK later on when the scheduling the poll triggers. Change-Id: Icdaa30e9ff942fb53cc4bbd801e4542b8885b32a --- M include/osmocom/gprs/rlcmac/gre.h M include/osmocom/gprs/rlcmac/pdch_ul_controller.h M include/osmocom/gprs/rlcmac/tbf.h M src/rlcmac/gre.c M src/rlcmac/pdch_ul_controller.c M src/rlcmac/rlcmac.c M src/rlcmac/sched.c M src/rlcmac/tbf.c M tests/rlcmac/rlcmac_prim_test.err 9 files changed, 79 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/18/32118/1 diff --git a/include/osmocom/gprs/rlcmac/gre.h b/include/osmocom/gprs/rlcmac/gre.h index 8322cf7..358d0aa 100644 --- a/include/osmocom/gprs/rlcmac/gre.h +++ b/include/osmocom/gprs/rlcmac/gre.h @@ -31,5 +31,7 @@ int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, uint8_t *ll_pdu, unsigned int ll_pdu_len, enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio); +struct msgb *gprs_rlcmac_gre_create_pkt_ctrl_ack(const struct gprs_rlcmac_entity *gre); + #define LOGGRE(gre, level, fmt, args...) \ LOGRLCMAC(level, "GRE(%08x) " fmt, (gre)->tlli, ## args) diff --git a/include/osmocom/gprs/rlcmac/pdch_ul_controller.h b/include/osmocom/gprs/rlcmac/pdch_ul_controller.h index 52970c4..1dcc1db 100644 --- a/include/osmocom/gprs/rlcmac/pdch_ul_controller.h +++ b/include/osmocom/gprs/rlcmac/pdch_ul_controller.h @@ -21,7 +21,8 @@ #include <osmocom/core/linuxrbtree.h> #include <osmocom/core/utils.h> -struct gprs_rlcmac_dl_tbf; +struct gprs_rlcmac_gre; +struct gprs_rlcmac_tbf; struct gprs_rlcmac_pdch_ulc { uint8_t ts_nr; @@ -43,12 +44,16 @@ struct rb_node node; /*! entry in gprs_rlcmac_pdch_ulc->tree_root */ uint32_t fn; enum gprs_rlcmac_pdch_ulc_poll_reason reason; - struct gprs_rlcmac_tbf *tbf; + union { + struct gprs_rlcmac_tbf *tbf; + struct gprs_rlcmac_entity *gre; + void *data; + }; }; struct gprs_rlcmac_pdch_ulc *gprs_rlcmac_pdch_ulc_alloc(void *ctx, uint8_t ts_nr); -int gprs_rlcmac_pdch_ulc_reserve(struct gprs_rlcmac_pdch_ulc *ulc, uint32_t fn, enum gprs_rlcmac_pdch_ulc_poll_reason reason, struct gprs_rlcmac_tbf *tbf); +int gprs_rlcmac_pdch_ulc_reserve(struct gprs_rlcmac_pdch_ulc *ulc, uint32_t fn, enum gprs_rlcmac_pdch_ulc_poll_reason reason, void *data); struct gprs_rlcmac_pdch_ulc_node *gprs_rlcmac_pdch_ulc_get_node(struct gprs_rlcmac_pdch_ulc *ulc, uint32_t fn); struct gprs_rlcmac_pdch_ulc_node *gprs_rlcmac_pdch_ulc_pop_node(struct gprs_rlcmac_pdch_ulc *ulc, uint32_t fn); diff --git a/include/osmocom/gprs/rlcmac/tbf.h b/include/osmocom/gprs/rlcmac/tbf.h index 83a887d..9130237 100644 --- a/include/osmocom/gprs/rlcmac/tbf.h +++ b/include/osmocom/gprs/rlcmac/tbf.h @@ -28,8 +28,6 @@ void gprs_rlcmac_tbf_free(struct gprs_rlcmac_tbf *tbf); -struct msgb *gprs_rlcmac_tbf_create_pkt_ctrl_ack(const struct gprs_rlcmac_tbf *tbf); - #define LOGPTBF(tbf, lvl, fmt, args...) \ LOGP(g_rlcmac_log_cat[tbf->direction == GPRS_RLCMAC_TBF_DIR_DL ? \ OSMO_GPRS_RLCMAC_LOGC_TBFDL : \ diff --git a/src/rlcmac/gre.c b/src/rlcmac/gre.c index 87953c1..2bab3c1 100644 --- a/src/rlcmac/gre.c +++ b/src/rlcmac/gre.c @@ -21,6 +21,10 @@ #include <stdbool.h> +#include <osmocom/core/bitvec.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> + #include <osmocom/gprs/rlcmac/rlcmac.h> #include <osmocom/gprs/rlcmac/rlcmac_prim.h> #include <osmocom/gprs/rlcmac/rlcmac_private.h> @@ -29,6 +33,7 @@ #include <osmocom/gprs/rlcmac/tbf_ul_fsm.h> #include <osmocom/gprs/rlcmac/tbf_ul.h> #include <osmocom/gprs/rlcmac/gre.h> +#include <osmocom/gprs/rlcmac/rlcmac_enc.h> struct gprs_rlcmac_entity *gprs_rlcmac_entity_alloc(uint32_t tlli) { @@ -131,3 +136,38 @@ return rc; } + +struct msgb *gprs_rlcmac_gre_create_pkt_ctrl_ack(const struct gprs_rlcmac_entity *gre) +{ + struct msgb *msg; + struct bitvec bv; + RlcMacUplink_t ul_block; + int rc; + + OSMO_ASSERT(gre); + + msg = msgb_alloc(GSM_MACBLOCK_LEN, "pkt_ctrl_ack"); + if (!msg) + return NULL; + + /* Initialize a bit vector that uses allocated msgb as the data buffer. */ + bv = (struct bitvec){ + .data = msgb_put(msg, GSM_MACBLOCK_LEN), + .data_len = GSM_MACBLOCK_LEN, + }; + bitvec_unhex(&bv, GPRS_RLCMAC_DUMMY_VEC); + + gprs_rlcmac_enc_prepare_pkt_ctrl_ack(&ul_block, gre->tlli); + rc = osmo_gprs_rlcmac_encode_uplink(&bv, &ul_block); + if (rc < 0) { + LOGGRE(gre, LOGL_ERROR, "Encoding of Packet Control ACK failed (%d)\n", rc); + goto free_ret; + } + LOGGRE(gre, LOGL_DEBUG, "Tx Packet Control Ack\n"); + + return msg; + +free_ret: + msgb_free(msg); + return NULL; +} diff --git a/src/rlcmac/pdch_ul_controller.c b/src/rlcmac/pdch_ul_controller.c index 731caf0..7c5e41a 100644 --- a/src/rlcmac/pdch_ul_controller.c +++ b/src/rlcmac/pdch_ul_controller.c @@ -124,11 +124,11 @@ int gprs_rlcmac_pdch_ulc_reserve(struct gprs_rlcmac_pdch_ulc *ulc, uint32_t fn, enum gprs_rlcmac_pdch_ulc_poll_reason reason, - struct gprs_rlcmac_tbf *tbf) + void *data) { struct gprs_rlcmac_pdch_ulc_node *item = _alloc_node(ulc, fn); item->reason = reason; - item->tbf = tbf; + item->data = data; LOGRLCMAC(LOGL_DEBUG, "Register POLL (TS=%u FN=%u, reason=%s)\n", ulc->ts_nr, item->fn, get_value_string(gprs_rlcmac_pdch_ulc_poll_reason_names, item->reason)); diff --git a/src/rlcmac/rlcmac.c b/src/rlcmac/rlcmac.c index 8ff6c68..574ff5a 100644 --- a/src/rlcmac/rlcmac.c +++ b/src/rlcmac/rlcmac.c @@ -400,12 +400,12 @@ }; rc = gprs_rlcmac_tbf_start_from_pacch(&gre->dl_tbf_dl_ass_fsm, &ev_data); - if (tbf && dl_block->SP) { + if (dl_block->SP) { uint32_t poll_fn = rrbp2fn(rlcmac_prim->l1ctl.pdch_data_ind.fn, dl_block->RRBP); gprs_rlcmac_pdch_ulc_reserve(g_ctx->sched.ulc[rlcmac_prim->l1ctl.pdch_data_ind.ts_nr], poll_fn, GPRS_RLCMAC_PDCH_ULC_POLL_DL_ASS, - tbf); + gre); } return rc; } diff --git a/src/rlcmac/sched.c b/src/rlcmac/sched.c index 46e43ab..50a3910 100644 --- a/src/rlcmac/sched.c +++ b/src/rlcmac/sched.c @@ -38,7 +38,7 @@ struct gprs_rlcmac_ul_tbf *poll_ul_ack_new_ul_tbf; /* 9.3.2.4.2 (answer with PKT RES REQ) */ struct gprs_rlcmac_ul_tbf *poll_ul_ack; /* 11.2.2 (answer with PKT CTRL ACK) */ struct gprs_rlcmac_ul_tbf *poll_ul_ass; /* (answer Pkt UL ASS with PKT CTRL ACK) */ - struct gprs_rlcmac_tbf *poll_dl_ass; /* (answer Pkt DL ASS with PKT CTRL ACK) */ + struct gprs_rlcmac_entity *poll_dl_ass; /* (answer Pkt DL ASS with PKT CTRL ACK) */ struct gprs_rlcmac_ul_tbf *ul_ass; /* PCU grants USF/SBA: transmit Pkt Res Req (2phase access)*/ }; @@ -80,7 +80,7 @@ tbfs->poll_ul_ass = tbf_as_ul_tbf(node->tbf); break; case GPRS_RLCMAC_PDCH_ULC_POLL_DL_ASS: - tbfs->poll_dl_ass = node->tbf; + tbfs->poll_dl_ass = node->gre; break; case GPRS_RLCMAC_PDCH_ULC_POLL_UL_ACK: /* TS 44.060: 9.3.2.4.2 If the PACKET UPLINK ACK/NACK message @@ -199,7 +199,7 @@ if (tbfs->poll_ul_ack) { LOGRLCMAC(LOGL_DEBUG, "(ts=%u,fn=%u,usf=%u) Tx Pkt Control Ack (UL ACK/NACK poll)\n", bi->ts, bi->fn, bi->usf); - msg = gprs_rlcmac_tbf_create_pkt_ctrl_ack(ul_tbf_as_tbf(tbfs->poll_ul_ack)); + msg = gprs_rlcmac_gre_create_pkt_ctrl_ack(ul_tbf_as_tbf(tbfs->poll_ul_ack)->gre); /* Last UL message, freeing */ gprs_rlcmac_ul_tbf_free(tbfs->poll_ul_ack); return msg; @@ -207,14 +207,14 @@ if (tbfs->poll_dl_ass) { LOGRLCMAC(LOGL_DEBUG, "(ts=%u,fn=%u,usf=%u) Tx Pkt Control Ack (DL ASS poll)\n", bi->ts, bi->fn, bi->usf); - msg = gprs_rlcmac_tbf_create_pkt_ctrl_ack(tbfs->poll_dl_ass); + msg = gprs_rlcmac_gre_create_pkt_ctrl_ack(tbfs->poll_dl_ass); if (msg) return msg; } if (tbfs->poll_ul_ass) { LOGRLCMAC(LOGL_DEBUG, "(ts=%u,fn=%u,usf=%u) Tx Pkt Control Ack (UL ASS poll)\n", bi->ts, bi->fn, bi->usf); - msg = gprs_rlcmac_tbf_create_pkt_ctrl_ack(ul_tbf_as_tbf(tbfs->poll_ul_ass)); + msg = gprs_rlcmac_gre_create_pkt_ctrl_ack(ul_tbf_as_tbf(tbfs->poll_ul_ass)->gre); if (msg) return msg; } diff --git a/src/rlcmac/tbf.c b/src/rlcmac/tbf.c index 524740d..c82f0ea 100644 --- a/src/rlcmac/tbf.c +++ b/src/rlcmac/tbf.c @@ -19,14 +19,9 @@ * */ -#include <osmocom/core/bitvec.h> -#include <osmocom/core/msgb.h> -#include <osmocom/gsm/protocol/gsm_04_08.h> - #include <osmocom/gprs/rlcmac/tbf.h> #include <osmocom/gprs/rlcmac/tbf_ul.h> #include <osmocom/gprs/rlcmac/gre.h> -#include <osmocom/gprs/rlcmac/rlcmac_enc.h> #include <osmocom/gprs/rlcmac/pdch_ul_controller.h> void gprs_rlcmac_tbf_constructor(struct gprs_rlcmac_tbf *tbf, @@ -50,38 +45,3 @@ gprs_rlcmac_ul_tbf_free(tbf_as_ul_tbf(tbf)); /* else: TODO dl_tbf not yet implemented */ } - -struct msgb *gprs_rlcmac_tbf_create_pkt_ctrl_ack(const struct gprs_rlcmac_tbf *tbf) -{ - struct msgb *msg; - struct bitvec bv; - RlcMacUplink_t ul_block; - int rc; - - OSMO_ASSERT(tbf); - - msg = msgb_alloc(GSM_MACBLOCK_LEN, "pkt_ctrl_ack"); - if (!msg) - return NULL; - - /* Initialize a bit vector that uses allocated msgb as the data buffer. */ - bv = (struct bitvec){ - .data = msgb_put(msg, GSM_MACBLOCK_LEN), - .data_len = GSM_MACBLOCK_LEN, - }; - bitvec_unhex(&bv, GPRS_RLCMAC_DUMMY_VEC); - - gprs_rlcmac_enc_prepare_pkt_ctrl_ack(&ul_block, tbf->gre->tlli); - rc = osmo_gprs_rlcmac_encode_uplink(&bv, &ul_block); - if (rc < 0) { - LOGPTBF(tbf, LOGL_ERROR, "Encoding of Packet Control ACK failed (%d)\n", rc); - goto free_ret; - } - LOGPTBF(tbf, LOGL_DEBUG, "Tx Packet Control Ack\n"); - - return msg; - -free_ret: - msgb_free(msg); - return NULL; -} diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err index f0b55d0..e7edbca 100644 --- a/tests/rlcmac/rlcmac_prim_test.err +++ b/tests/rlcmac/rlcmac_prim_test.err @@ -61,7 +61,7 @@ DLGLOBAL DEBUG Register POLL (TS=7 FN=21, reason=UL_ACK) DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG (ts=7,fn=21,usf=0) Tx Pkt Control Ack (UL ACK/NACK poll) -DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Tx Packet Control Ack +DLGLOBAL DEBUG GRE(00002342) Tx Packet Control Ack DLGLOBAL INFO UL_TBF_ASS{IDLE}: Deallocated DLGLOBAL INFO UL_TBF{RELEASING}: Deallocated DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request @@ -755,7 +755,7 @@ DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG (ts=7,fn=43,usf=2) Tx Pkt Control Ack (UL ASS poll) -DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00000001) Tx Packet Control Ack +DLGLOBAL DEBUG GRE(00000001) Tx Packet Control Ack DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00000001) Sending new block at BSN 0, CS=CS-2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icdaa30e9ff942fb53cc4bbd801e4542b8885b32a Gerrit-Change-Number: 32118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bsc

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/32116 to look at the new patch set (#2). Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bsc ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on osmo-bsc Change-Id: I640dd2cd599707ad6bc661e7bea08372d85b47df --- M tests/Makefile.am 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/32116/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I640dd2cd599707ad6bc661e7bea08372d85b47df Gerrit-Change-Number: 32116 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bts-virtual

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32117 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bts-virtual ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on osmo-bts-virtual Change-Id: I4ace06e115a2689bde9afd9f99ecee99d796360b --- M tests/Makefile.am 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/17/32117/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index a1d04a7..100c5d4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,10 +32,10 @@ DISTCLEANFILES = atconfig if ENABLE_EXT_TESTS -python-tests: $(BUILT_SOURCES) +python-tests: $(MAKE) vty-test else -python-tests: $(BUILT_SOURCES) +python-tests: echo "Not running python-based tests (determined at configure-time)" endif @@ -45,7 +45,7 @@ # To update the VTY script from current application behavior, # pass -u to vty_script_runner.py by doing: # make vty-test U=-u -vty-test: +vty-test: $(top_builddir)/src/osmo-bts-virtual/osmo-bts-virtual osmo_verify_transcript_vty.py -v \ -n OsmoBTS -p 4241 \ -r "$(top_builddir)/src/osmo-bts-virtual/osmo-bts-virtual --vty-test -c $(top_srcdir)/doc/examples/virtual/osmo-bts-virtual.cfg" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4ace06e115a2689bde9afd9f99ecee99d796360b Gerrit-Change-Number: 32117 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bsc

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32116 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-bsc ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on osmo-bsc Change-Id: I640dd2cd599707ad6bc661e7bea08372d85b47df --- M tests/Makefile.am 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/32116/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 8ee8bec..f2c2d7b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -47,14 +47,14 @@ $(NULL) if ENABLE_EXT_TESTS -python-tests: $(BUILT_SOURCES) +python-tests: $(top_builddir)/src/osmo-bsc/osmo-bsc $(MAKE) vty-test osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v else -python-tests: $(BUILT_SOURCES) +python-tests: $(top_builddir)/src/osmo-bsc/osmo-bsc echo "Not running python-based tests (determined at configure-time)" endif @@ -64,7 +64,7 @@ # To update the VTY script from current application behavior, # pass -u to vty_script_runner.py by doing: # make vty-test U=-u -vty-test: +vty-test: $(top_builddir)/src/osmo-bsc/osmo-bsc osmo_verify_transcript_vty.py -v \ -n OsmoBSC -p 4242 \ -r "$(top_builddir)/src/osmo-bsc/osmo-bsc -c $(top_srcdir)/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I640dd2cd599707ad6bc661e7bea08372d85b47df Gerrit-Change-Number: 32116 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: common+trx: add rtp ecu-downstream vty option

by falconia

Attention is currently required from: pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32110 ) Change subject: common+trx: add rtp ecu-downstream vty option ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I'm not sure what you mean with "downstream" here. […] No, "downstream" here means down the RTP stream from the BTS: after the RTP stream is emitted from the BTS and passes through two OsmoMGW instances (BSC, then MSC), it goes to an external software component (themwi-mgw in my case) that applies the full Rx DTX handler of GSM 06.31 or 06.81. That full Rx DTX handler includes an ECU function that is more sophisticated than the one in libosmocore, and intertied with other (not strictly ECU) Rx DTX functions - this type of use scenario is when having OsmoBTS apply the libosmocodec ECU becomes undesirable. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0acca9c6d7da966a623287563e0789db9e0fae8e Gerrit-Change-Number: 32110 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 12:18:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in libosmo-sccp[master]: tests: $(BUILT_SOURCES) is not defined, depend on osmo-stp

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32115 ) Change subject: tests: $(BUILT_SOURCES) is not defined, depend on osmo-stp ...................................................................... tests: $(BUILT_SOURCES) is not defined, depend on osmo-stp Change-Id: I4864f4d78095187f566bcde772b71665fa6e4729 --- M tests/vty/Makefile.am 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/15/32115/1 diff --git a/tests/vty/Makefile.am b/tests/vty/Makefile.am index 9ed31b0..df5a64c 100644 --- a/tests/vty/Makefile.am +++ b/tests/vty/Makefile.am @@ -22,7 +22,7 @@ echo "Not running python-based external tests (determined at configure-time)" endif -vty-python-test: $(BUILT_SOURCES) +vty-python-test: $(top_builddir)/stp/osmo-stp $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v # To update the VTY script from current application behavior, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4864f4d78095187f566bcde772b71665fa6e4729 Gerrit-Change-Number: 32115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: logging: Introduce LOGPLCGT()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32112 ) Change subject: logging: Introduce LOGPLCGT() ...................................................................... Patch Set 3: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/32112/comment/e15caa98_c7adef46 PS2, Line 1498: LOGPLCGT(lchan, &g_time, DL1P, LOGL_NOTICE, "There can be no DATA.ind on PTCCH/U. " > lchan can be null here. nice catch, thanks. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4bf3363f92acdf67d8e7333e30ac2209e31cb287 Gerrit-Change-Number: 32112 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Mar 2023 12:05:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

2024

2023

2022

gerrit-log March 2023