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

[M] Change in osmo-bsc[master]: tests: add more tests for GPRS NSVC parameters

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32171 ) Change subject: tests: add more tests for GPRS NSVC parameters ...................................................................... tests: add more tests for GPRS NSVC parameters Change-Id: I13d6ac887ddb1c9bc5d1e4122f20405a28f135d4 Related: OS#5979 --- M tests/gprs_params.vty 1 file changed, 66 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/32171/1 diff --git a/tests/gprs_params.vty b/tests/gprs_params.vty index 3edc540..048420b 100644 --- a/tests/gprs_params.vty +++ b/tests/gprs_params.vty @@ -46,3 +46,59 @@ gprs nsvc 1 nsvci 0 gprs nsvc 1 local udp port 23101 ... + + +OsmoBSC(config-net-bts)# ### NSVC sub-command syntax +OsmoBSC(config-net-bts)# gprs nsvc? + nsvc Network Service Virtual Connection (NS-VC) +OsmoBSC(config-net-bts)# gprs nsvc ? + <0-1> NSVC Logical Number +OsmoBSC(config-net-bts)# gprs nsvc 0 ? + nsvci NS Virtual Connection Identifier + local GPRS NS Local UDP Port + remote GPRS NS Remote UDP Port +OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci ? + <0-65535> GPRS NS VC Identifier +OsmoBSC(config-net-bts)# gprs nsvc 0 local ? + udp GPRS NS Local UDP Port +OsmoBSC(config-net-bts)# gprs nsvc 0 local udp ? + port GPRS NS Local UDP Port +OsmoBSC(config-net-bts)# gprs nsvc 0 local udp port ? + <0-65535> GPRS NS Local UDP Port Number +OsmoBSC(config-net-bts)# gprs nsvc 0 remote ? + udp GPRS NS Remote UDP Port + ip GPRS NS Remote IP Address +OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp ? + port GPRS NS Remote UDP Port +OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port ? + <0-65535> GPRS NS Remote UDP Port Number +OsmoBSC(config-net-bts)# gprs nsvc 0 remote ip ? + A.B.C.D GPRS NS Remote IPv4 Address + X:X::X:X GPRS NS Remote IPv6 Address + +OsmoBSC(config-net-bts)# ### NSVC sub-command params +OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci 4242 +OsmoBSC(config-net-bts)# gprs nsvc 1 nsvci 2424 +OsmoBSC(config-net-bts)# show running-config +... + bts 0 +... + gprs nsvc 0 nsvci 4242 + gprs nsvc 0 local udp port 23100 + gprs nsvc 1 nsvci 2424 + gprs nsvc 1 local udp port 23101 +... +OsmoBSC(config-net-bts)# gprs nsvc 1 local udp port 23023 +OsmoBSC(config-net-bts)# gprs nsvc 1 remote udp port 23032 +OsmoBSC(config-net-bts)# gprs nsvc 1 remote ip 1.2.3.4 +OsmoBSC(config-net-bts)# show running-config +... + bts 0 +... + gprs nsvc 0 nsvci 4242 + gprs nsvc 0 local udp port 23100 + gprs nsvc 1 nsvci 2424 + gprs nsvc 1 local udp port 23023 + gprs nsvc 1 remote ip 1.2.3.4 + gprs nsvc 1 remote udp port 23032 +... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I13d6ac887ddb1c9bc5d1e4122f20405a28f135d4 Gerrit-Change-Number: 32171 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-bsc[master]: tests: rename and extend gprs_{bvci_default->params}.vty

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32169 ) Change subject: tests: rename and extend gprs_{bvci_default->params}.vty ...................................................................... tests: rename and extend gprs_{bvci_default->params}.vty Match default values for all GPRS related params, not only the BVCI. This patch demonstrates a problem with default NSVC bind ports: gprs nsvc 0 nsvci 0 gprs nsvc 0 local udp port 0 gprs nsvc 1 nsvci 0 gprs nsvc 1 local udp port 0 The PCU obviously cannot bind to port 0, and will keep re-starting. We should have a sane default value for the local UDP port (like our usual 23000). "0" is not a sane default, as it can never work. The user might simply add remote ip/port and not explicitly set a local port and run into that problem. Change-Id: Ia02e9a97137eb7724f22526fc3768331b35ac55d Related: OS#5979 --- D tests/gprs_bvci_default.vty A tests/gprs_params.vty 2 files changed, 73 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/32169/1 diff --git a/tests/gprs_bvci_default.vty b/tests/gprs_bvci_default.vty deleted file mode 100644 index 4bd95ce..0000000 --- a/tests/gprs_bvci_default.vty +++ /dev/null @@ -1,13 +0,0 @@ -OsmoBSC> enable -OsmoBSC# configure terminal -OsmoBSC(config)# network -OsmoBSC(config-net)# bts 0 -OsmoBSC(config-net-bts)# gprs mode gprs -OsmoBSC(config-net-bts)# exit - -OsmoBSC(config-net)# show running-config -... - bts 0 -... - gprs cell bvci 2 -... diff --git a/tests/gprs_params.vty b/tests/gprs_params.vty new file mode 100644 index 0000000..87c64b1 --- /dev/null +++ b/tests/gprs_params.vty @@ -0,0 +1,48 @@ +OsmoBSC> enable +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 + +OsmoBSC(config-net-bts)# ### GPRS is disabled by default +OsmoBSC(config-net-bts)# show running-config +... + bts 0 +... + gprs mode none +... + +OsmoBSC(config-net-bts)# ### Default [E]GPRS params +OsmoBSC(config-net-bts)# gprs mode gprs +OsmoBSC(config-net-bts)# show running-config +... + bts 0 +... + gprs mode gprs + gprs routing area 0 + gprs network-control-order nc0 + gprs power-control alpha 0 + gprs cell bvci 2 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 0 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 0 + gprs nsvc 0 local udp port 0 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 +... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia02e9a97137eb7724f22526fc3768331b35ac55d Gerrit-Change-Number: 32169 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]: gprs: disallow setting NSVC remote port to 0

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32172 ) Change subject: gprs: disallow setting NSVC remote port to 0 ...................................................................... gprs: disallow setting NSVC remote port to 0 0 is not a valid remote port and shall not be permitted. Change-Id: I46d5ad247ff2da7b319da0793e1d57561183bc8e Related: OS#5979 --- M src/osmo-bsc/bts_vty.c M tests/gprs_params.vty 2 files changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/32172/1 diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index e02c2d5..21c7b43 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -1486,7 +1486,7 @@ DEFUN_USRATTR(cfg_bts_gprs_nsvc_rport, cfg_bts_gprs_nsvc_rport_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), - "gprs nsvc <0-1> remote udp port <0-65535>", + "gprs nsvc <0-1> remote udp port <1-65535>", GPRS_TEXT NSVC_TEXT "GPRS NS Remote UDP Port\n" "GPRS NS Remote UDP Port\n" diff --git a/tests/gprs_params.vty b/tests/gprs_params.vty index 048420b..9b2622b 100644 --- a/tests/gprs_params.vty +++ b/tests/gprs_params.vty @@ -71,7 +71,7 @@ OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp ? port GPRS NS Remote UDP Port OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port ? - <0-65535> GPRS NS Remote UDP Port Number + <1-65535> GPRS NS Remote UDP Port Number OsmoBSC(config-net-bts)# gprs nsvc 0 remote ip ? A.B.C.D GPRS NS Remote IPv4 Address X:X::X:X GPRS NS Remote IPv6 Address @@ -102,3 +102,6 @@ gprs nsvc 1 remote ip 1.2.3.4 gprs nsvc 1 remote udp port 23032 ... + +OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port 0 +% Unknown command. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46d5ad247ff2da7b319da0793e1d57561183bc8e Gerrit-Change-Number: 32172 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]: core: remove unnecessary #include <osmocom/core/talloc.h>

by falconia

Attention is currently required from: fixeria. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32167 ) Change subject: core: remove unnecessary #include <osmocom/core/talloc.h> ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4b9ffd7a329081df3d2c0b0ee8698a3cf759e94e Gerrit-Change-Number: 32167 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 23:13:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in libosmocore[master]: fixup (partial revert): "coding: clean up Makefile.am"

by falconia

Attention is currently required from: fixeria. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32166 ) Change subject: fixup (partial revert): "coding: clean up Makefile.am" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic1bd82159a827af21fe36bea998f8f58f732473a Gerrit-Change-Number: 32166 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 23:09:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in libosmocore[master]: fixup (partial revert): "coding: clean up Makefile.am"

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32166 ) Change subject: fixup (partial revert): "coding: clean up Makefile.am" ...................................................................... fixup (partial revert): "coding: clean up Makefile.am" This is a partial revert of "9dca9027 coding: clean up Makefile.am". Even though libosmocoding does not use talloc API, it still depends on this library indirectly via libosmo{core,codec,gsm}. Furthermore, some of libosmocore's header files do #include <osmocom/core/talloc.h>, and thus #include <talloc.h> via this internal header. Under Slackware 14.2 talloc.h header lives in /usr/include/samba-4.0, and without $(TALLOC_CFLAGS) compilation of libmsocoding fails due to the preprocessor failing to find this header. The culprit is my recent patch 9dca9027 removing $(TALLOC_CFLAGS) and $(TALLOC_LIBS). Put $(TALLOC_CFLAGS) back to AM_CFLAGS; it will likely be emply under distributions having talloc.h header in the standard include dir. The $(TALLOC_LIBS) does not need to be resurrected because libtool will add '-ltalloc' automatically for each libosmo*.la in LIBADD. Change-Id: Ic1bd82159a827af21fe36bea998f8f58f732473a Related: OS#5960 --- M src/coding/Makefile.am 1 file changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/32166/1 diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index bb7bde2..987e073 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -8,7 +8,7 @@ -I"$(top_builddir)/include" \ -I"$(top_builddir)" \ $(NULL) -AM_CFLAGS = -Wall +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic1bd82159a827af21fe36bea998f8f58f732473a Gerrit-Change-Number: 32166 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]: core: remove unnecessary #include <osmocom/core/talloc.h>

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32167 ) Change subject: core: remove unnecessary #include <osmocom/core/talloc.h> ...................................................................... core: remove unnecessary #include <osmocom/core/talloc.h> Including this header just for TALLOC_CTX is an overkill, we use 'void *' for talloc contexts in nearly all other Osmocom projects. Change-Id: I4b9ffd7a329081df3d2c0b0ee8698a3cf759e94e Related: OS#5960 --- M include/osmocom/core/bitvec.h M include/osmocom/core/strrb.h M src/core/bitvec.c M src/core/strrb.c 4 files changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/32167/1 diff --git a/include/osmocom/core/bitvec.h b/include/osmocom/core/bitvec.h index 70b0e27..1e2fe7b 100644 --- a/include/osmocom/core/bitvec.h +++ b/include/osmocom/core/bitvec.h @@ -23,7 +23,6 @@ * \file bitvec.h */ #include <stdint.h> -#include <osmocom/core/talloc.h> #include <osmocom/core/defs.h> #include <stdbool.h> @@ -61,7 +60,7 @@ int bitvec_spare_padding(struct bitvec *bv, unsigned int up_to_bit); int bitvec_get_bytes(struct bitvec *bv, uint8_t *bytes, unsigned int count); int bitvec_set_bytes(struct bitvec *bv, const uint8_t *bytes, unsigned int count); -struct bitvec *bitvec_alloc(unsigned int size, TALLOC_CTX *bvctx); +struct bitvec *bitvec_alloc(unsigned int size, void *bvctx); void bitvec_free(struct bitvec *bv); int bitvec_unhex(struct bitvec *bv, const char *src); unsigned int bitvec_pack(const struct bitvec *bv, uint8_t *buffer); diff --git a/include/osmocom/core/strrb.h b/include/osmocom/core/strrb.h index e3d3201..92d6a2f 100644 --- a/include/osmocom/core/strrb.h +++ b/include/osmocom/core/strrb.h @@ -26,8 +26,6 @@ #include <stdbool.h> #include <stdint.h> -#include <osmocom/core/talloc.h> - /*! A structure representing an osmocom string ringbuffer */ #define RB_MAX_MESSAGE_SIZE 240 @@ -38,7 +36,7 @@ char **buffer; /*!< storage for messages */ }; -struct osmo_strrb *osmo_strrb_create(TALLOC_CTX * ctx, size_t rb_size); +struct osmo_strrb *osmo_strrb_create(void *talloc_ctx, size_t rb_size); bool osmo_strrb_is_empty(const struct osmo_strrb *rb); const char *osmo_strrb_get_nth(const struct osmo_strrb *rb, unsigned int string_index); diff --git a/src/core/bitvec.c b/src/core/bitvec.c index 350f738..38ea1bb 100644 --- a/src/core/bitvec.c +++ b/src/core/bitvec.c @@ -395,7 +395,7 @@ * \param[in] size Number of bytes in the vector * \param[in] ctx Context from which to allocate * \return pointer to allocated vector; NULL in case of error */ -struct bitvec *bitvec_alloc(unsigned int size, TALLOC_CTX *ctx) +struct bitvec *bitvec_alloc(unsigned int size, void *ctx) { struct bitvec *bv = talloc(ctx, struct bitvec); if (!bv) diff --git a/src/core/strrb.c b/src/core/strrb.c index df7edb3..c5a5ed6 100644 --- a/src/core/strrb.c +++ b/src/core/strrb.c @@ -52,12 +52,12 @@ * This function creates and initializes a ringbuffer. * Note that the ringbuffer stores at most rb_size - 1 messages. */ -struct osmo_strrb *osmo_strrb_create(TALLOC_CTX * ctx, size_t rb_size) +struct osmo_strrb *osmo_strrb_create(void *talloc_ctx, size_t rb_size) { struct osmo_strrb *rb = NULL; unsigned int i; - rb = talloc_zero(ctx, struct osmo_strrb); + rb = talloc_zero(talloc_ctx, struct osmo_strrb); if (!rb) goto alloc_error; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4b9ffd7a329081df3d2c0b0ee8698a3cf759e94e Gerrit-Change-Number: 32167 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-mgw[master]: mgcp_client: simpler error handling

by Jenkins Builder

Attention is currently required from: neels. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32162 ) Change subject: mgcp_client: simpler error handling ...................................................................... Patch Set 2: (2 comments) File src/libosmo-mgcp-client/mgcp_client.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-5626): https://gerrit.osmocom.org/c/osmo-mgw/+/32162/comment/97001204_73c2bf37 PS2, Line 1401: mgcp_msg->x_osmo_ign & MGCP_X_OSMO_IGN_CALLID ? " C": ""); spaces required around that ':' (ctx:VxW) Robot Comment from checkpatch (run ID jenkins-gerrit-lint-5626): https://gerrit.osmocom.org/c/osmo-mgw/+/32162/comment/8aa7f974_1409a3e3 PS2, Line 1412: mgcp_msg->x_osmo_osmux_cid == -1 ? " *": buf); spaces required around that ':' (ctx:VxW) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I904d56f56053952c2ebbbe5dca744fafa32b333e Gerrit-Change-Number: 32162 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 22:08:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp_client: simpler error handling

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/32162 to look at the new patch set (#2). Change subject: mgcp_client: simpler error handling ...................................................................... mgcp_client: simpler error handling add_sdp(), add_lco(): - do not msgb_free() within these functions. Just return error, and move the msgb_free() to the caler. - when failing to write to the msgb, directly return error. Change-Id: I904d56f56053952c2ebbbe5dca744fafa32b333e --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 92 insertions(+), 87 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/62/32162/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I904d56f56053952c2ebbbe5dca744fafa32b333e Gerrit-Change-Number: 32162 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_find_section_end(): skip spaces at start of SDP

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32161 ) Change subject: mgcp_find_section_end(): skip spaces at start of SDP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I015e0347a268b61c0ca45d40754942f87b461c09 Gerrit-Change-Number: 32161 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 18:19:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: Clarify configuration of TSC on each timeslot

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32165 ) Change subject: Clarify configuration of TSC on each timeslot ...................................................................... Clarify configuration of TSC on each timeslot Related: OS#5856 Change-Id: Ief21daf63ba76725de9117cbe14ada8b75f147df --- M include/osmo-bts/bts.h M include/osmo-bts/gsm_data.h M src/common/bts.c M src/common/bts_trx.c M src/common/gsm_data.c M src/common/nm_bts_fsm.c M src/common/oml.c M src/common/rsl.c 8 files changed, 102 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/32165/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 14c78a3..2d0eec7 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -158,6 +158,7 @@ /* Base Station Identification Code (BSIC), lower 3 bits is BCC, * which is used as TSC for the CCCH */ uint8_t bsic; + bool bsic_configured; /* type of BTS */ enum gsm_bts_type_variant variant; enum gsm_band band; diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 69e3b00..5bf6f02 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -91,7 +91,10 @@ /* Training Sequence Code (range 0..7) */ uint8_t tsc_oml; /* configured via OML */ - uint8_t tsc; /* currently in use */ + bool tsc_oml_configured; + uint8_t tsc_rsl; /* configured via RSL (Osmo extension) */ + bool tsc_rsl_configured; + uint8_t tsc; /* TSC currently in use. Preference: RSL, OML, BTS-BSIC-OML */ /* Training Sequence Set (range 0..3) */ uint8_t tsc_set; @@ -194,6 +197,8 @@ bool ts_is_pdch(const struct gsm_bts_trx_ts *ts); +void gsm_ts_apply_configured_tsc(struct gsm_bts_trx_ts *ts); + void gsm_ts_release(struct gsm_bts_trx_ts *ts); #endif /* _GSM_DATA_H */ diff --git a/src/common/bts.c b/src/common/bts.c index 9cc694f..de27ad8 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -351,6 +351,8 @@ power_ctrl_params_def_reset(&bts->ms_dpc_params, false); /* configurable via OML */ + bts->bsic = 0xff; /* invalid value, guarded by bsc_configured=false */ + bts->bsic_configured = false; bts->load.ccch.load_ind_period = 112; bts->rtp_jitter_buf_ms = 100; bts->max_ta = 63; diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index 280880f..089f228 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -74,6 +74,10 @@ ts->trx = trx; ts->nr = tn; + ts->tsc_oml_configured = false; + ts->tsc_rsl_configured = false; + ts->tsc = ts->tsc_oml = ts->tsc_rsl = 0xff; + ts->mo.fi = osmo_fsm_inst_alloc(&nm_chan_fsm, trx, ts, LOGL_INFO, NULL); osmo_fsm_inst_update_id_f(ts->mo.fi, "%s-ts%u", @@ -99,6 +103,10 @@ ts->trx = trx; ts->nr = tn; + ts->tsc_oml_configured = false; + ts->tsc_rsl_configured = false; + ts->tsc = ts->tsc_oml = ts->tsc_rsl = 0xff; + /* Link both primary and shadow */ trx->ts[tn].vamos.peer = ts; ts->vamos.peer = &trx->ts[tn]; diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index e5dbf10..dad5587 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -306,6 +306,29 @@ } } +/* Apply ts->tsc based on what was configured coming from different sources. + * Priorities (preferred first, overrides ones afterward): + * 1- RSL OSMO_TSC IE + * 2- OML SetChannelAttr TSC IE + * 3- OML SetBtsAttr BSIC IE + */ +void gsm_ts_apply_configured_tsc(struct gsm_bts_trx_ts *ts) +{ + if (ts->tsc_rsl_configured) { + ts->tsc = ts->tsc_rsl; + return; + } + if (ts->tsc_oml_configured) { + ts->tsc = ts->tsc_oml; + return; + } + if (ts->trx->bts->bsic_configured) { + ts->tsc = BTS_TSC(ts->trx->bts); + return; + } + ts->tsc = 0xff; /* invalid value */ +} + void gsm_ts_release(struct gsm_bts_trx_ts *ts) { unsigned int ln; @@ -318,4 +341,8 @@ /* Make sure pchan_is is reset, since PCU act_req to release it will be * ignored as the lchan will already be released. */ ts->dyn.pchan_is = ts->dyn.pchan_want = GSM_PCHAN_NONE; + + ts->tsc_oml_configured = false; + ts->tsc_rsl_configured = false; + ts->tsc = ts->tsc_oml = ts->tsc_rsl = 0xff; } diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index 063ffe8..ea3a6c3 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -60,6 +60,8 @@ struct gsm_bts *bts = (struct gsm_bts *)fi->priv; /* Reset state: */ bts->si_valid = 0; + bts->bsic_configured = false; + bts->bsic = 0xff; /* invalid value */ TALLOC_FREE(bts->mo.nm_attr); bts_cbch_reset(bts); diff --git a/src/common/oml.c b/src/common/oml.c index 724e4f8..5ffb6ff 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -712,8 +712,35 @@ bts->c0->arfcn = ntohs(tlvp_val16_unal(&tp, NM_ATT_BCCH_ARFCN)); /* 9.4.9 BSIC */ - if (TLVP_PRES_LEN(&tp, NM_ATT_BSIC, 1)) + if (TLVP_PRES_LEN(&tp, NM_ATT_BSIC, 1)) { + struct gsm_bts_trx *trx; + uint8_t bts_tsc; + bts->bsic = *TLVP_VAL(&tp, NM_ATT_BSIC); + bts->bsic_configured = true; + bts_tsc = BTS_TSC(bts); + + /* Apply TSC update on each TS if required: */ + llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ + unsigned int tn; + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { + struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + + /* First some config validation: */ + if (ts->tsc_oml_configured && + ts->tsc_oml != bts_tsc && + !osmo_bts_has_feature(bts->features, BTS_FEAT_MULTI_TSC)) { + LOGPFOH(DOML, LOGL_ERROR, foh, "SET BTS ATTR: this BTS model does not " + "support TSC %u != BSIC-BCC %u (TSC %u)\n", + ts->tsc_oml, bts->bsic, bts_tsc); + return oml_fom_ack_nack(msg, NM_NACK_PARAM_RANGE); + } + + /* Now update TS TSC if needed: */ + gsm_ts_apply_configured_tsc(ts); + } + } + } /* call into BTS driver to apply new attributes to hardware */ return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_BTS, bts); @@ -984,20 +1011,25 @@ /* 9.4.60 TSC */ if (TLVP_PRES_LEN(&tp, NM_ATT_TSC, 1)) { - ts->tsc_oml = ts->tsc = *TLVP_VAL(&tp, NM_ATT_TSC); - if (ts->tsc != BTS_TSC(bts) && + ts->tsc_oml = *TLVP_VAL(&tp, NM_ATT_TSC); + ts->tsc_oml_configured = true; + } + + if (ts->tsc_oml_configured) { + if (bts->bsic_configured && + ts->tsc_oml != BTS_TSC(bts) && !osmo_bts_has_feature(bts->features, BTS_FEAT_MULTI_TSC)) { LOGPFOH(DOML, LOGL_ERROR, foh, "SET CHAN ATTR: this BTS model does not " - "support TSC %u != BSIC-BCC %u\n", ts->tsc, BTS_TSC(bts)); + "support TSC %u != BSIC-BCC %u\n", ts->tsc_oml, BTS_TSC(bts)); talloc_free(tp_merged); return oml_fom_ack_nack(msg, NM_NACK_PARAM_RANGE); } - } else { - /* If there is no TSC specified, use the BCC */ - ts->tsc_oml = ts->tsc = BTS_TSC(bts); + gsm_ts_apply_configured_tsc(ts); } - LOGPFOH(DOML, LOGL_INFO, foh, "SET CHAN ATTR (TSC=%u pchan=%s", - ts->tsc, gsm_pchan_name(ts->pchan)); + + LOGPFOH(DOML, LOGL_INFO, foh, "SET CHAN ATTR (TSC=%d pchan=%s", + ts->tsc_oml_configured ? (int)ts->tsc_oml : -1, + gsm_pchan_name(ts->pchan)); if (ts->hopping.enabled) LOGPC(DOML, LOGL_INFO, " hsn=%u maio=%u chan_num=%u", ts->hopping.hsn, ts->hopping.maio, ts->hopping.arfcn_num); diff --git a/src/common/rsl.c b/src/common/rsl.c index 8f1ff5d..86f23bd 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -294,11 +294,14 @@ if (TLVP_PRES_LEN(tp, RSL_IE_OSMO_TRAINING_SEQUENCE, 2)) { const uint8_t *ie = TLVP_VAL(tp, RSL_IE_OSMO_TRAINING_SEQUENCE); lchan->ts->tsc_set = ie[0] & 0x03; /* Range: 0..3 */ - lchan->ts->tsc = ie[1] & 0x07; /* Range: 0..7 */ + lchan->ts->tsc_rsl = ie[1] & 0x07; /* Range: 0..7 */ + lchan->ts->tsc_rsl_configured = true; } else { - lchan->ts->tsc = lchan->ts->tsc_oml; + lchan->ts->tsc_rsl_configured = false; + lchan->ts->tsc_rsl = 0xff; lchan->ts->tsc_set = 0; } + gsm_ts_apply_configured_tsc(lchan->ts); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief21daf63ba76725de9117cbe14ada8b75f147df Gerrit-Change-Number: 32165 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]: rtp continuous-streaming: fix BFI in the quality-suppressed case

by laforge

laforge has submitted this change. ( 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: 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, 25 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 89aea58..1f173db 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1641,10 +1641,10 @@ 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. */ if (bts->rtp_nogaps_mode) { - send_ul_rtp_packet(lchan, fn, msg->data, msg->len); + send_ul_rtp_packet(lchan, fn, NULL, 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: 4 Gerrit-Owner: falconia <falcon(a)freecalypso.org> 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

[M] Change in osmo-bts[master]: sysmo: emit empty RTP ticks during FACCH stealing on TCH/F

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32100 ) Change subject: sysmo: emit empty RTP ticks during FACCH stealing on TCH/F ...................................................................... sysmo: emit empty RTP ticks during FACCH stealing on TCH/F When FACCH stealing occurs and sysmoBTS L1 delivers GsmL1_Sapi_FacchF instead of GsmL1_Sapi_TchF, that 20 ms unit still needs to be accounted for in the RTP timestamp cadence, and if we run with rtp continuous-streaming enabled, then an actual BFI packet needs to be emitted. The original code failed to do either; the present change implements correct behavior for TCH/F. The present patch only covers the case of TCH/F; handling of TCH/H is left as a FIXME for other/later developers. Related: OS#5974 Change-Id: I39d15faade28fb7d670493a99a0e0bdb654e2a4a --- M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/l1_if.h M src/osmo-bts-sysmo/tch.c 3 files changed, 64 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 19f0c5a..24a3d1e 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -980,6 +980,25 @@ return rc; } + /* If we got FACCH, the RTP clock needs to account for it, + * and if we have rtp continuous-streaming enabled, + * an actual BFI packet will be emitted. + * + * Only the case of TCH/F is currently handled; the task of + * supporting TCH/H is left as a FIXME for other/later + * developers. The difficulty with supporting FACCH/H is that + * only one GsmL1_Sapi_FacchH message will be received, + * covering 40 ms of time, but two RTP "tick" output calls + * will need to be made, with appropriately adjusted frame + * numbers. As a further consideration for rtp continuous-streaming + * mode, having the two RTP BFI packets sent directly back to back, + * as opposed to proper 20 ms timing, may be so undesirable + * that some deployments may rather disable TCH/H (use only TCH/F) + * than deal with the extra pain, or use TCH/H only on SDR-based + * BTS with osmo-bts-trx where correct timing is easily achieved. */ + if (data_ind->sapi == GsmL1_Sapi_FacchF) + l1if_tch_rx_facch(trx, chan_nr, l1p_msg); + /* fill L1SAP header */ sap_msg = l1sap_msgb_alloc(data_ind->msgUnitParam.u8Size); l1sap = msgb_l1sap_prim(sap_msg); diff --git a/src/osmo-bts-sysmo/l1_if.h b/src/osmo-bts-sysmo/l1_if.h index 8691eef..5b2da04 100644 --- a/src/osmo-bts-sysmo/l1_if.h +++ b/src/osmo-bts-sysmo/l1_if.h @@ -129,6 +129,8 @@ const uint8_t *rtp_pl, unsigned int rtp_pl_len, uint32_t fn, bool use_cache, bool marker); int l1if_tch_rx(struct gsm_bts_trx *trx, uint8_t chan_nr, struct msgb *l1p_msg); +int l1if_tch_rx_facch(struct gsm_bts_trx *trx, uint8_t chan_nr, + struct msgb *l1p_msg); int l1if_tch_fill(struct gsm_lchan *lchan, uint8_t *l1_buffer); struct msgb *gen_empty_tch_msg(struct gsm_lchan *lchan, uint32_t fn); diff --git a/src/osmo-bts-sysmo/tch.c b/src/osmo-bts-sysmo/tch.c index 832991f..3e7a1a1 100644 --- a/src/osmo-bts-sysmo/tch.c +++ b/src/osmo-bts-sysmo/tch.c @@ -623,6 +623,29 @@ return -EINVAL; } +/*! \brief provide an RTP empty payload "tick" to upper layers upon FACCH */ +int l1if_tch_rx_facch(struct gsm_bts_trx *trx, uint8_t chan_nr, + struct msgb *l1p_msg) +{ + GsmL1_Prim_t *l1p = msgb_l1prim(l1p_msg); + GsmL1_PhDataInd_t *data_ind = &l1p->u.phDataInd; + struct msgb *rmsg = NULL; + struct gsm_lchan *lchan = &trx->ts[L1SAP_CHAN2TS(chan_nr)].lchan[l1sap_chan2ss(chan_nr)]; + + if (is_recv_only(lchan->abis_ip.speech_mode)) + return -EAGAIN; + + LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "chan_nr %d Rx FACCH\n", chan_nr); + /* Push empty payload to upper layers */ + rmsg = msgb_alloc_headroom(256, 128, "L1P-to-RTP"); + return add_l1sap_header(trx, rmsg, lchan, chan_nr, data_ind->u32Fn, + data_ind->measParam.fBer * 10000, + data_ind->measParam.fLinkQuality * 10, + 0, /* suppress RSSI like in osmo-bts-trx */ + data_ind->measParam.i16BurstTiming * 64, + 0); +} + struct msgb *gen_empty_tch_msg(struct gsm_lchan *lchan, uint32_t fn) { struct msgb *msg; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I39d15faade28fb7d670493a99a0e0bdb654e2a4a Gerrit-Change-Number: 32100 Gerrit-PatchSet: 6 Gerrit-Owner: falconia <falcon(a)freecalypso.org> 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

[M] Change in osmo-bts[master]: sysmo: emit empty RTP ticks during FACCH stealing on TCH/F

by laforge

Attention is currently required from: falconia. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32100 ) Change subject: sysmo: emit empty RTP ticks during FACCH stealing on TCH/F ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I39d15faade28fb7d670493a99a0e0bdb654e2a4a Gerrit-Change-Number: 32100 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Thu, 30 Mar 2023 17:30:45 +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 laforge

Attention is currently required from: falconia. laforge 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 3: Code-Review+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: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Thu, 30 Mar 2023 17:30:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: Fix typo LLGM -> LLGMM

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32156 ) Change subject: Fix typo LLGM -> LLGMM ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I59577d27bedd26903c9b1bfc64792f0891cea728 Gerrit-Change-Number: 32156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 17:29:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: abis_rsl: Document spec ref of CCCH Load Ind

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32158 ) Change subject: abis_rsl: Document spec ref of CCCH Load Ind ...................................................................... abis_rsl: Document spec ref of CCCH Load Ind Change-Id: Iada13bb29688249eecbd492388a6d4b0cc95575d --- M src/osmo-bsc/abis_rsl.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 1880996..6a9712e 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2296,7 +2296,7 @@ return rc; } -/* current load on the CCCH */ +/* 5.4 and 8.5.2 Rx CCCH Load Ind */ static int rsl_rx_ccch_load(struct msgb *msg) { struct e1inp_sign_link *sign_link = msg->dst; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iada13bb29688249eecbd492388a6d4b0cc95575d Gerrit-Change-Number: 32158 Gerrit-PatchSet: 1 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-bsc[master]: bts-rbs2k: Simplify osmo_fsm_inst_alloc_child_id()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32160 ) Change subject: bts-rbs2k: Simplify osmo_fsm_inst_alloc_child_id() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5344161e5a65ae9959684f0fda7f8b06cbb447f3 Gerrit-Change-Number: 32160 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 17:06:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: Move paging queue specific handling to signal callback outside RSL code

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32159 ) Change subject: Move paging queue specific handling to signal callback outside RSL code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabc1c29908a5136501d6dc6e60f8777dab511b86 Gerrit-Change-Number: 32159 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 17:06:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: abis_rsl: Document spec ref of CCCH Load Ind

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32158 ) Change subject: abis_rsl: Document spec ref of CCCH Load Ind ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iada13bb29688249eecbd492388a6d4b0cc95575d Gerrit-Change-Number: 32158 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 17:05:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp_client: simpler error handling

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32162 ) Change subject: mgcp_client: simpler error handling ...................................................................... Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/32162/comment/ab62eb62_fb2f6ec8 PS1, Line 12: the msgb_free() to the caler. caller Patchset: PS1: +1 once you fix the linter -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I904d56f56053952c2ebbbe5dca744fafa32b333e Gerrit-Change-Number: 32162 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 16:39:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_find_section_end(): skip spaces at start of SDP

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32161 ) Change subject: mgcp_find_section_end(): skip spaces at start of SDP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I015e0347a268b61c0ca45d40754942f87b461c09 Gerrit-Change-Number: 32161 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 16:38:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: wip: how osmo-bsc might use SDP strings directly

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32164 ) Change subject: wip: how osmo-bsc might use SDP strings directly ...................................................................... wip: how osmo-bsc might use SDP strings directly Change-Id: Ie91de7e913235b04e84e81b6ce940364d92162d6 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/32164/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index de9d4d2..b8bf15a 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -776,6 +776,22 @@ }; mgcp_pick_codec(&mgw_info, for_lchan, false); + /* TODO: add full SDP to the MGCP command + struct sdp_msg sdp = { + .ptime = 20, + }; + + { + enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->activate.ch_mode_rate.chan_mode, + lchan->type == GSM_LCHAN_TCH_H? false : true); + struct codec_mapping *m = codec_mapping_by_mgcp_codec(codec); + if (m) + sdp_audio_codecs_add_copy(dst, &m->sdp); + } + + sdp_msg_to_sdp_str_buf(mgw_info->sdp, sizeof(mgw_info->sdp), &sdp); + */ + rc = osmo_strlcpy(mgw_info.addr, addr, sizeof(mgw_info.addr)); if (rc <= 0 || rc >= sizeof(mgw_info.addr)) { LOGPFSML(conn->fi, LOGL_ERROR, "Failed to compose MGW endpoint address for MGW -> MSC\n"); diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 7e9c31f..11006fa 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -912,6 +912,22 @@ } } +/* TODO: implement this +int lchan_add_codecs_to_sdp(struct sdp_audio_codecs *dst, const struct gsm_lchan *lchan) +{ + enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->activate.ch_mode_rate.chan_mode, + lchan->type == GSM_LCHAN_TCH_H? false : true); + + TODO codec_mapping so far only exists in osmo-msc.git + struct codec_mapping *m = codec_mapping_by_mgcp_codec(codec); + if (!m) + return 0; + + sdp_audio_codecs_add_copy(dst, &m->sdp); + return 0; +} +*/ + void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side) { enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->activate.ch_mode_rate.chan_mode, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie91de7e913235b04e84e81b6ce940364d92162d6 Gerrit-Change-Number: 32164 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp_client: simpler error handling

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32162 ) Change subject: mgcp_client: simpler error handling ...................................................................... Patch Set 1: (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-5620): https://gerrit.osmocom.org/c/osmo-mgw/+/32162/comment/5f7e0fdd_ab31ff2d PS1, Line 1134: #define MSGB_PRINTF_OR_RET(msg, FMT, ARGS...) \ Macros starting with if should be enclosed by a do - while loop to avoid possible if/else logic defects -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I904d56f56053952c2ebbbe5dca744fafa32b333e Gerrit-Change-Number: 32162 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 30 Mar 2023 16:30:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_find_section_end(): skip spaces at start of SDP

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32161 ) Change subject: mgcp_find_section_end(): skip spaces at start of SDP ...................................................................... mgcp_find_section_end(): skip spaces at start of SDP Change-Id: I015e0347a268b61c0ca45d40754942f87b461c09 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/61/32161/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 4dd278f..670910b 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -456,15 +456,15 @@ rc = strstr(string, "\n\n"); if (rc) - return rc; + return rc + 2; rc = strstr(string, "\n\r\n\r"); if (rc) - return rc; + return rc + 4; rc = strstr(string, "\r\n\r\n"); if (rc) - return rc; + return rc + 4; return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I015e0347a268b61c0ca45d40754942f87b461c09 Gerrit-Change-Number: 32161 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-mgw[master]: client: allow passing and receiving full SDP to/from MGW

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32163 ) Change subject: client: allow passing and receiving full SDP to/from MGW ...................................................................... client: allow passing and receiving full SDP to/from MGW Clients can continue to use the current way of providing the information contained in the SDP part. A client may also decide to directly provide an SDP string. That may be useful to send a list of payload types with mixed fmtp (e.g. two entries, one for AMR OA and one for AMR BE) or any other custom SDP that is not possible to be represented with the previous structure of struct mgcp_conn_peer: struct sdp_msg sdp = {}; sdp_audio_codecs_add(&sdp.audio_codecs, 96, "AMR", 8000, "octet-align=1"); sdp_audio_codecs_add(&sdp.audio_codecs, 97, "AMR", 8000, "octet-align=0"); struct mgcp_conn_peer verb_info = { ... }; sdp_msg_to_sdp_str_buf(verb_info.sdp, sizeof(verb_info.sdp), &sdp); osmo_mgcpc_ep_ci_request(my_ci, MGCP_VERB_MDCX, &verb_info,...); (TODO: sdp_msg, sdp_audio_codecs_add() and sdp_msg_to_sdp_str_buf() so far only exists in osmo-msc.git) If no SDP is present in the passed verb_info, the SDP part is composed as before from the mgcp_conn_peer members addr, port, ptime, ptmap, param. If an SDP string is present in the passed verb_info, ignore the data in the individual members, and directly pass the given SDP string instead -- the caller does not need to pass both the individual members and SDP, either one suffices. A client can read the full SDP response from the MGW, again for example to accurately parse a list with mixed fmtp for AMR like above, like this: /* Handling successful event after osmo_mgcpc_ep_ci_request(my_fi, my_notify_event): */ const struct mgcp_conn_peer *response_info = osmo_mgcpc_ep_ci_get_rtp_info(ci); struct sdp_msg sdp; sdp_msg_from_sdp_str(&sdp, response_info->sdp); for (int i = 0; i < sdp.audio_codecs.count; i++) printf("PT %u = %s %s", sdp.audio_codecs.codec[i].payload_type, sdp.audio_codecs.codec[i].subtype_name, sdp.audio_codecs.codec[i].fmtp); Related: OS#5723 Change-Id: Ib26b4d24546a9a9af65d4313fdf87cdeff9cbc22 --- M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_fsm.c 4 files changed, 83 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/63/32163/1 diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index 0fb5dee..c185971 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -83,6 +83,7 @@ }; struct mgcp_response { + /* The complete MGCP + SDP response. See also 'sdp' below. */ char *body; struct mgcp_response_head head; uint16_t audio_port; @@ -92,6 +93,8 @@ unsigned int codecs_len; struct ptmap ptmap[MGCP_MAX_CODECS]; unsigned int ptmap_len; + /* Start of the SDP part of 'body'. */ + char *sdp; }; enum mgcp_verb { @@ -131,6 +134,8 @@ int x_osmo_osmux_cid; /* -1 is wildcard */ bool param_present; struct mgcp_codec_param param; + + char sdp[1024]; }; void mgcp_client_conf_init(struct mgcp_client_conf *conf); diff --git a/include/osmocom/mgcp_client/mgcp_client_fsm.h b/include/osmocom/mgcp_client/mgcp_client_fsm.h index ade4f49..de68e70 100644 --- a/include/osmocom/mgcp_client/mgcp_client_fsm.h +++ b/include/osmocom/mgcp_client/mgcp_client_fsm.h @@ -61,6 +61,8 @@ * mgcp_common.h */ bool param_present; struct mgcp_codec_param param; + + char sdp[1024]; }; struct osmo_fsm_inst *mgcp_conn_create(struct mgcp_client *mgcp, struct osmo_fsm_inst *parent_fi, uint32_t parent_term_evt, diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index fb4c17a..85421a2 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -493,6 +493,7 @@ rc = 0; goto exit; } + r->sdp = data_ptr; /* data_ptr now points to the beginning of the section-end-marker; for_each_non_empty_line() * skips any \r and \n characters for free, so we don't need to skip the marker. */ @@ -1183,6 +1184,13 @@ /* Add separator to mark the beginning of the SDP block */ MSGB_PRINTF_OR_RET(msg, "\r\n"); + if (mgcp_msg->sdp[0] != '\0') { + /* The caller provided a full SDP string, no need to compose SDP. */ + MSGB_PRINTF_OR_RET(msg, "%s", mgcp_msg->sdp); + return 0; + } + /* The caller did not provide a full SDP section, compose SDP string from the mgcp_msg members. */ + /* Add SDP protocol version */ MSGB_PRINTF_OR_RET(msg, "v=0\r\n"); @@ -1365,8 +1373,9 @@ /* Using SDP makes sense when a valid IP/Port combination is specifiec, * if we do not know this information yet, we fall back to LCO */ - if (mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_IP - && mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_PORT) + if (((mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_IP) + && (mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_PORT)) + || mgcp_msg->sdp[0] != '\0') use_sdp = true; /* Add local connection options (LCO) */ diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 660f0ad..4a33df5 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -140,6 +140,9 @@ mgcp_msg->audio_ip = info->addr; mgcp_msg->audio_port = info->port; mgcp_msg->conn_mode = MGCP_CONN_RECV_SEND; + + if (info->sdp[0] != '\0') + OSMO_STRLCPY_ARRAY(mgcp_msg->sdp, info->sdp); } static void set_conn_mode(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *peer) @@ -179,6 +182,9 @@ mgcp_msg.presence |= MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID; } + if (mgcp_ctx->conn_peer_local.sdp[0] != '\0') + OSMO_STRLCPY_ARRAY(mgcp_msg.sdp, mgcp_ctx->conn_peer_local.sdp); + /* Note: We take the endpoint and the call_id from the remote * connection info, because we can be confident that the * information there is valid. For the local info, we explicitly @@ -319,6 +325,9 @@ return; } + if (r->sdp && r->sdp[0] != '\0') + OSMO_STRLCPY_ARRAY(mgcp_ctx->conn_peer_remote.sdp, r->sdp); + mgcp_ctx->conn_peer_remote.call_id = mgcp_ctx->conn_peer_local.call_id; osmo_fsm_inst_dispatch(fi, EV_CRCX_RESP, mgcp_ctx); @@ -426,6 +435,9 @@ osmo_strlcpy(mgcp_ctx->conn_peer_remote.addr, r->audio_ip, sizeof(mgcp_ctx->conn_peer_remote.addr)); mgcp_ctx->conn_peer_remote.port = r->audio_port; + if (r->sdp && r->sdp[0] != '\0') + OSMO_STRLCPY_ARRAY(mgcp_ctx->conn_peer_remote.sdp, r->sdp); + osmo_fsm_inst_dispatch(fi, EV_MDCX_RESP, mgcp_ctx); } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib26b4d24546a9a9af65d4313fdf87cdeff9cbc22 Gerrit-Change-Number: 32163 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp_client: simpler error handling

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32162 ) Change subject: mgcp_client: simpler error handling ...................................................................... mgcp_client: simpler error handling add_sdp(), add_lco(): - do not msgb_free() within these functions. Just return error, and move the msgb_free() to the caler. - when failing to write to the msgb, directly return error. Change-Id: I904d56f56053952c2ebbbe5dca744fafa32b333e --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 56 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/62/32162/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 670910b..fb4c17a 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1131,47 +1131,43 @@ #define MGCP_AUEP_MANDATORY (MGCP_MSG_PRESENCE_ENDPOINT) #define MGCP_RSIP_MANDATORY 0 /* none */ +#define MSGB_PRINTF_OR_RET(msg, FMT, ARGS...) \ + if (msgb_printf(msg, FMT, ##ARGS) != 0) { \ + LOGP(DLMGCP, LOGL_ERROR, "Message buffer to small, can not generate MGCP/SDP message\n"); \ + return -ENOBUFS; \ + } + /* Helper function for mgcp_msg_gen(): Add LCO information to MGCP message */ static int add_lco(struct msgb *msg, struct mgcp_msg *mgcp_msg) { unsigned int i; - int rc = 0; const char *codec; unsigned int pt; - rc |= msgb_printf(msg, "L:"); + MSGB_PRINTF_OR_RET(msg, "L:"); if (mgcp_msg->ptime) - rc |= msgb_printf(msg, " p:%u,", mgcp_msg->ptime); + MSGB_PRINTF_OR_RET(msg, " p:%u,", mgcp_msg->ptime); if (mgcp_msg->codecs_len) { - rc |= msgb_printf(msg, " a:"); + MSGB_PRINTF_OR_RET(msg, " a:"); for (i = 0; i < mgcp_msg->codecs_len; i++) { pt = mgcp_msg->codecs[i]; codec = get_value_string_or_null(osmo_mgcpc_codec_names, pt); /* Note: Use codec descriptors from enum mgcp_codecs * in mgcp_client only! */ - if (!codec) { - msgb_free(msg); + if (!codec) return -EINVAL; - } - rc |= msgb_printf(msg, "%s", extract_codec_name(codec)); + MSGB_PRINTF_OR_RET(msg, "%s", extract_codec_name(codec)); if (i < mgcp_msg->codecs_len - 1) - rc |= msgb_printf(msg, ";"); + MSGB_PRINTF_OR_RET(msg, ";"); } - rc |= msgb_printf(msg, ","); + MSGB_PRINTF_OR_RET(msg, ","); } - rc |= msgb_printf(msg, " nt:IN\r\n"); - - if (rc != 0) { - LOGP(DLMGCP, LOGL_ERROR, - "message buffer to small, can not generate MGCP message (LCO)\n"); - msgb_free(msg); - return -ENOBUFS; - } + MSGB_PRINTF_OR_RET(msg, " nt:IN\r\n"); return 0; } @@ -1179,43 +1175,37 @@ static int add_sdp(struct msgb *msg, struct mgcp_msg *mgcp_msg, struct mgcp_client *mgcp) { unsigned int i; - int rc = 0; char local_ip[INET6_ADDRSTRLEN]; int local_ip_family, audio_ip_family; const char *codec; unsigned int pt; /* Add separator to mark the beginning of the SDP block */ - rc |= msgb_printf(msg, "\r\n"); + MSGB_PRINTF_OR_RET(msg, "\r\n"); /* Add SDP protocol version */ - rc |= msgb_printf(msg, "v=0\r\n"); + MSGB_PRINTF_OR_RET(msg, "v=0\r\n"); /* Determine local IP-Address */ if (osmo_sock_local_ip(local_ip, mgcp->actual.remote_addr) < 0) { LOGPMGW(mgcp, LOGL_ERROR, "Could not determine local IP-Address!\n"); - msgb_free(msg); return -EINVAL; } local_ip_family = osmo_ip_str_type(local_ip); - if (local_ip_family == AF_UNSPEC) { - msgb_free(msg); + if (local_ip_family == AF_UNSPEC) return -EINVAL; - } audio_ip_family = osmo_ip_str_type(mgcp_msg->audio_ip); - if (audio_ip_family == AF_UNSPEC) { - msgb_free(msg); + if (audio_ip_family == AF_UNSPEC) return -EINVAL; - } /* Add owner/creator (SDP) */ - rc |= msgb_printf(msg, "o=- %x 23 IN IP%c %s\r\n", mgcp_msg->call_id, + MSGB_PRINTF_OR_RET(msg, "o=- %x 23 IN IP%c %s\r\n", mgcp_msg->call_id, local_ip_family == AF_INET6 ? '6' : '4', local_ip); /* Add session name (none) */ - rc |= msgb_printf(msg, "s=-\r\n"); + MSGB_PRINTF_OR_RET(msg, "s=-\r\n"); /* Add RTP address and port */ if (mgcp_msg->audio_port == 0) { @@ -1230,20 +1220,20 @@ msgb_free(msg); return -EINVAL; } - rc |= msgb_printf(msg, "c=IN IP%c %s\r\n", + MSGB_PRINTF_OR_RET(msg, "c=IN IP%c %s\r\n", audio_ip_family == AF_INET6 ? '6' : '4', mgcp_msg->audio_ip); /* Add time description, active time (SDP) */ - rc |= msgb_printf(msg, "t=0 0\r\n"); + MSGB_PRINTF_OR_RET(msg, "t=0 0\r\n"); - rc |= msgb_printf(msg, "m=audio %u RTP/AVP", mgcp_msg->audio_port); + MSGB_PRINTF_OR_RET(msg, "m=audio %u RTP/AVP", mgcp_msg->audio_port); for (i = 0; i < mgcp_msg->codecs_len; i++) { pt = map_codec_to_pt(mgcp_msg->ptmap, mgcp_msg->ptmap_len, mgcp_msg->codecs[i]); - rc |= msgb_printf(msg, " %u", pt); + MSGB_PRINTF_OR_RET(msg, " %u", pt); } - rc |= msgb_printf(msg, "\r\n"); + MSGB_PRINTF_OR_RET(msg, "\r\n"); /* Add optional codec parameters (fmtp) */ if (mgcp_msg->param_present) { @@ -1253,9 +1243,9 @@ continue; pt = map_codec_to_pt(mgcp_msg->ptmap, mgcp_msg->ptmap_len, mgcp_msg->codecs[i]); if (mgcp_msg->param.amr_octet_aligned_present && mgcp_msg->param.amr_octet_aligned) - rc |= msgb_printf(msg, "a=fmtp:%u octet-align=1\r\n", pt); + MSGB_PRINTF_OR_RET(msg, "a=fmtp:%u octet-align=1\r\n", pt); else if (mgcp_msg->param.amr_octet_aligned_present && !mgcp_msg->param.amr_octet_aligned) - rc |= msgb_printf(msg, "a=fmtp:%u octet-align=0\r\n", pt); + MSGB_PRINTF_OR_RET(msg, "a=fmtp:%u octet-align=0\r\n", pt); } } @@ -1275,18 +1265,12 @@ return -EINVAL; } - rc |= msgb_printf(msg, "a=rtpmap:%u %s\r\n", pt, codec); + MSGB_PRINTF_OR_RET(msg, "a=rtpmap:%u %s\r\n", pt, codec); } } if (mgcp_msg->ptime) - rc |= msgb_printf(msg, "a=ptime:%u\r\n", mgcp_msg->ptime); - - if (rc != 0) { - LOGPMGW(mgcp, LOGL_ERROR, "Message buffer to small, can not generate MGCP message (SDP)\n"); - msgb_free(msg); - return -ENOBUFS; - } + MSGB_PRINTF_OR_RET(msg, "a=ptime:%u\r\n", mgcp_msg->ptime); return 0; } @@ -1311,23 +1295,23 @@ switch (mgcp_msg->verb) { case MGCP_VERB_CRCX: mandatory_mask = MGCP_CRCX_MANDATORY; - rc |= msgb_printf(msg, "CRCX %u", trans_id); + MSGB_PRINTF_OR_RET(msg, "CRCX %u", trans_id); break; case MGCP_VERB_MDCX: mandatory_mask = MGCP_MDCX_MANDATORY; - rc |= msgb_printf(msg, "MDCX %u", trans_id); + MSGB_PRINTF_OR_RET(msg, "MDCX %u", trans_id); break; case MGCP_VERB_DLCX: mandatory_mask = MGCP_DLCX_MANDATORY; - rc |= msgb_printf(msg, "DLCX %u", trans_id); + MSGB_PRINTF_OR_RET(msg, "DLCX %u", trans_id); break; case MGCP_VERB_AUEP: mandatory_mask = MGCP_AUEP_MANDATORY; - rc |= msgb_printf(msg, "AUEP %u", trans_id); + MSGB_PRINTF_OR_RET(msg, "AUEP %u", trans_id); break; case MGCP_VERB_RSIP: mandatory_mask = MGCP_RSIP_MANDATORY; - rc |= msgb_printf(msg, "RSIP %u", trans_id); + MSGB_PRINTF_OR_RET(msg, "RSIP %u", trans_id); break; default: LOGPMGW(mgcp, LOGL_ERROR, "Invalid command verb, can not generate MGCP message\n"); @@ -1359,15 +1343,15 @@ return NULL; } - rc |= msgb_printf(msg, " %s", mgcp_msg->endpoint); + MSGB_PRINTF_OR_RET(msg, " %s", mgcp_msg->endpoint); } /* Add protocol version */ - rc |= msgb_printf(msg, " MGCP 1.0\r\n"); + MSGB_PRINTF_OR_RET(msg, " MGCP 1.0\r\n"); /* Add call id */ if (mgcp_msg->presence & MGCP_MSG_PRESENCE_CALL_ID) - rc |= msgb_printf(msg, "C: %x\r\n", mgcp_msg->call_id); + MSGB_PRINTF_OR_RET(msg, "C: %x\r\n", mgcp_msg->call_id); /* Add connection id */ if (mgcp_msg->presence & MGCP_MSG_PRESENCE_CONN_ID) { @@ -1376,7 +1360,7 @@ msgb_free(msg); return NULL; } - rc |= msgb_printf(msg, "I: %s\r\n", mgcp_msg->conn_id); + MSGB_PRINTF_OR_RET(msg, "I: %s\r\n", mgcp_msg->conn_id); } /* Using SDP makes sense when a valid IP/Port combination is specifiec, @@ -1391,6 +1375,7 @@ || mgcp_msg->verb == MGCP_VERB_MDCX)) { if (add_lco(msg, mgcp_msg) < 0) { LOGPMGW(mgcp, LOGL_ERROR, "Failed to add LCO, can not generate MGCP message\n"); + msgb_free(msg); return NULL; } } @@ -1429,6 +1414,7 @@ || mgcp_msg->verb == MGCP_VERB_MDCX)) { if (add_sdp(msg, mgcp_msg, mgcp) < 0) { LOGPMGW(mgcp, LOGL_ERROR, "Failed to add SDP, can not generate MGCP message\n"); + msgb_free(msg); return NULL; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I904d56f56053952c2ebbbe5dca744fafa32b333e Gerrit-Change-Number: 32162 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: bts-rbs2k: Simplify osmo_fsm_inst_alloc_child_id()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32160 ) Change subject: bts-rbs2k: Simplify osmo_fsm_inst_alloc_child_id() ...................................................................... bts-rbs2k: Simplify osmo_fsm_inst_alloc_child_id() Change-Id: I5344161e5a65ae9959684f0fda7f8b06cbb447f3 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/32160/1 diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 2a653bf..69a86b5 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -68,20 +68,11 @@ { struct osmo_fsm_inst *fi; - fi = osmo_fsm_inst_alloc(fsm, parent, NULL, parent->log_level, - id ? id : parent->id); - if (!fi) { - /* indicate immediate termination to caller */ - osmo_fsm_inst_dispatch(parent, parent_term_event, NULL); + fi = osmo_fsm_inst_alloc_child(fsm, parent, parent_term_event); + if (!fi) return NULL; - } - - LOGPFSM(fi, "is child of %s\n", osmo_fsm_inst_name(parent)); - - fi->proc.parent = parent; - fi->proc.parent_term_event = parent_term_event; - llist_add(&fi->proc.child, &parent->proc.children); - + if (id) + osmo_fsm_inst_update_id_f_sanitize(fi, '-', id); return fi; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5344161e5a65ae9959684f0fda7f8b06cbb447f3 Gerrit-Change-Number: 32160 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]: Move paging queue specific handling to signal callback outside RSL code

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32159 ) Change subject: Move paging queue specific handling to signal callback outside RSL code ...................................................................... Move paging queue specific handling to signal callback outside RSL code The signal is already there but not being used. Let's further split generic paging code from RSL specificites. Change-Id: Iabc1c29908a5136501d6dc6e60f8777dab511b86 --- M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/paging.c 2 files changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/32159/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 6a9712e..dfe7da9 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2311,10 +2311,9 @@ switch (rslh->data[0]) { case RSL_IE_PAGING_LOAD: sd.pg_buf_space = rslh->data[1] << 8 | rslh->data[2]; - if (is_ipaccess_bts(sign_link->trx->bts) && sd.pg_buf_space == UINT16_MAX) { + if (is_ipaccess_bts(sd.bts) && sd.pg_buf_space == UINT16_MAX) { sd.pg_buf_space = paging_estimate_available_slots(sd.bts, sd.bts->ccch_load_ind_period); } - paging_update_buffer_space(sign_link->trx->bts, sd.pg_buf_space); osmo_signal_dispatch(SS_CCCH, S_CCCH_PAGING_LOAD, &sd); break; case RSL_IE_RACH_LOAD: diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index e6f6fe4..6fc053f 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -841,8 +841,24 @@ return 0; } +/* Callback function to be called every time we receive a signal from CCCH */ +static int ccch_sig_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) +{ + struct ccch_signal_data *sd; + + if (signal != S_CCCH_PAGING_LOAD) + return 0; + + sd = signal_data; + + paging_update_buffer_space(sd->bts, sd->pg_buf_space); + return 0; +} + /* To be called once at startup of the process: */ void paging_global_init(void) { osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); + osmo_signal_register_handler(SS_CCCH, ccch_sig_cb, NULL); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabc1c29908a5136501d6dc6e60f8777dab511b86 Gerrit-Change-Number: 32159 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]: abis_rsl: Document spec ref of CCCH Load Ind

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32158 ) Change subject: abis_rsl: Document spec ref of CCCH Load Ind ...................................................................... abis_rsl: Document spec ref of CCCH Load Ind Change-Id: Iada13bb29688249eecbd492388a6d4b0cc95575d --- M src/osmo-bsc/abis_rsl.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/32158/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 1880996..6a9712e 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2296,7 +2296,7 @@ return rc; } -/* current load on the CCCH */ +/* 5.4 and 8.5.2 Rx CCCH Load Ind */ static int rsl_rx_ccch_load(struct msgb *msg) { struct e1inp_sign_link *sign_link = msg->dst; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iada13bb29688249eecbd492388a6d4b0cc95575d Gerrit-Change-Number: 32158 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: modem: llc: Fix typo LLGM -> LLGMM

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32157 ) Change subject: layer23: modem: llc: Fix typo LLGM -> LLGMM ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I786661894fc6772784ba6f0d2fdb45bbdca5254c Gerrit-Change-Number: 32157 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 12:40:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-gbproxy[master]: tests: do not depend on $(BUILT_SOURCES), but on osmo-gbproxy

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/32147 ) Change subject: tests: do not depend on $(BUILT_SOURCES), but on osmo-gbproxy ...................................................................... tests: do not depend on $(BUILT_SOURCES), but on osmo-gbproxy $(BUILT_SOURCES) is not defined, makes no sense to depend on it. Change-Id: Iefb7ae1a660891a556cf6bf2e46e1d4440da1683 --- M tests/Makefile.am 1 file changed, 16 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index 48d6579..8f83fa4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -36,15 +36,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/osmo-gbproxy 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 @@ -53,7 +53,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-gbproxy osmo_verify_transcript_vty.py -v \ -n OsmoGbProxy -p 4246 \ -r "$(top_builddir)/src/osmo-gbproxy -c $(top_srcdir)/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg" \ @@ -69,7 +69,7 @@ $(MAKE) vty-python-test $(MAKE) vty-transcript-test -ctrl-python-test: $(BUILT_SOURCES) +ctrl-python-test: $(top_builddir)/src/osmo-gbproxy $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/32147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Iefb7ae1a660891a556cf6bf2e46e1d4440da1683 Gerrit-Change-Number: 32147 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-hnodeb[master]: tests: do not depend on undefined $(BUILT_SOURCES)

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/32145 ) Change subject: tests: do not depend on undefined $(BUILT_SOURCES) ...................................................................... tests: do not depend on undefined $(BUILT_SOURCES) Change-Id: I43c78aac0d23274d2a9bb01021cde0371c231be2 --- M tests/Makefile.am 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index 37aeda6..d2be48e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,7 +34,7 @@ $(NULL) if ENABLE_EXT_TESTS -python-tests: $(BUILT_SOURCES) +python-tests: echo "" # TODO: Enable once we have a VTY/CTRL interface: # $(MAKE) vty-test @@ -42,7 +42,7 @@ # osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v # $(srcdir)/ctrl_test_runner.py -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-hnodeb/+/32145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I43c78aac0d23274d2a9bb01021cde0371c231be2 Gerrit-Change-Number: 32145 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-hnodeb[master]: build: remove $(COVERAGE_LDFLAGS) from osmo_hnodeb_LDADD

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/32143 ) Change subject: build: remove $(COVERAGE_LDFLAGS) from osmo_hnodeb_LDADD ...................................................................... build: remove $(COVERAGE_LDFLAGS) from osmo_hnodeb_LDADD Change-Id: Id088775f444640df863c346b225c1bae61725249 --- M src/osmo-hnodeb/Makefile.am 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am index 27987a1..0d2cf02 100644 --- a/src/osmo-hnodeb/Makefile.am +++ b/src/osmo-hnodeb/Makefile.am @@ -54,7 +54,6 @@ $(LIBOSMOVTY_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMONETIF_LIBS) \ - $(COVERAGE_LDFLAGS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ $(LIBOSMOSIGTRAN_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/32143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Id088775f444640df863c346b225c1bae61725249 Gerrit-Change-Number: 32143 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-hnodeb[master]: tests: make 'vty-test' target depend on the respective binary

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/32144 ) Change subject: tests: make 'vty-test' target depend on the respective binary ...................................................................... tests: make 'vty-test' target depend on the respective binary Change-Id: I53ff9a1659a0e25a6c3a5bc987dbae82d0312259 --- M tests/Makefile.am 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index ed101ae..37aeda6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -52,7 +52,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-hnodeb/osmo-hnodeb osmo_verify_transcript_vty.py -v \ -n OsmoHNodeB -p 4273 \ -r "$(top_builddir)/src/osmo-hnodeb/osmo-hnodeb -c $(top_srcdir)/doc/examples/osmo-hnodeb/osmo-hnodeb.cfg" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/32144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I53ff9a1659a0e25a6c3a5bc987dbae82d0312259 Gerrit-Change-Number: 32144 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: tests: do not depend on undefined $(BUILT_SOURCES)

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32141 ) Change subject: tests: do not depend on undefined $(BUILT_SOURCES) ...................................................................... tests: do not depend on undefined $(BUILT_SOURCES) Change-Id: I7536be8aa3f0ab39f183e00cf4382636038db4b7 --- M tests/Makefile.am 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index b9f0279..806bfb1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -35,7 +35,7 @@ $(NULL) if ENABLE_EXT_TESTS -python-tests: $(BUILT_SOURCES) +python-tests: echo "" # TODO: Enable once we have a VTY/CTRL interface: # $(MAKE) vty-test @@ -43,7 +43,7 @@ # osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v # $(srcdir)/ctrl_test_runner.py -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-hnbgw/+/32141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7536be8aa3f0ab39f183e00cf4382636038db4b7 Gerrit-Change-Number: 32141 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: tests: make 'vty-test' target depend on osmo-hnbgw binary

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32140 ) Change subject: tests: make 'vty-test' target depend on osmo-hnbgw binary ...................................................................... tests: make 'vty-test' target depend on osmo-hnbgw binary Change-Id: Iaaa1dd622fde460a250c11eb97cf0b25469e55c4 --- M tests/Makefile.am 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index f9da51f..b9f0279 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -53,10 +53,11 @@ # 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-hnbgw/osmo-hnbgw osmo_verify_transcript_vty.py -v \ -n OsmoHNBGW -p 4261 \ - -r "$(top_builddir)/src/osmo-hnbgw/osmo-hnbgw -c $(top_srcdir)/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg" \ + -r "$(top_builddir)/src/osmo-hnbgw/osmo-hnbgw \ + -c $(top_srcdir)/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg" \ $(U) $(srcdir)/$(VTY_TEST) check-local: atconfig $(TESTSUITE) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iaaa1dd622fde460a250c11eb97cf0b25469e55c4 Gerrit-Change-Number: 32140 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: tests: use -no-install libtool flag to avoid ./lt-* scripts

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32139 ) Change subject: tests: use -no-install libtool flag to avoid ./lt-* scripts ...................................................................... tests: use -no-install libtool flag to avoid ./lt-* scripts This option should be used for any executables which are used only for testing, or for generating other files and are consequently never installed. By specifying this option, we are telling Libtool that the executable it links will only ever be executed from where it is built in the build tree. Libtool is usually able to considerably speed up the link process for such executables. Change-Id: Id5f88c331cf1dfd3f38120b4ef59ced9a563d4f0 --- M tests/ranap_rab_ass/Makefile.am 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/ranap_rab_ass/Makefile.am b/tests/ranap_rab_ass/Makefile.am index 1278ae8..918682c 100644 --- a/tests/ranap_rab_ass/Makefile.am +++ b/tests/ranap_rab_ass/Makefile.am @@ -15,6 +15,8 @@ $(COVERAGE_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install + EXTRA_DIST = \ ranap_rab_ass_test.ok \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id5f88c331cf1dfd3f38120b4ef59ced9a563d4f0 Gerrit-Change-Number: 32139 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: tests: use check_PROGRAMS for tests, not noinst_PROGRAMS

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32138 ) Change subject: tests: use check_PROGRAMS for tests, not noinst_PROGRAMS ...................................................................... tests: use check_PROGRAMS for tests, not noinst_PROGRAMS Change-Id: I616ed6920af98502424e4eab6cffde5d39d9698e --- M tests/ranap_rab_ass/Makefile.am 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/ranap_rab_ass/Makefile.am b/tests/ranap_rab_ass/Makefile.am index cdda8e3..1278ae8 100644 --- a/tests/ranap_rab_ass/Makefile.am +++ b/tests/ranap_rab_ass/Makefile.am @@ -19,7 +19,7 @@ ranap_rab_ass_test.ok \ $(NULL) -noinst_PROGRAMS = \ +check_PROGRAMS = \ ranap_rab_ass_test \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I616ed6920af98502424e4eab6cffde5d39d9698e Gerrit-Change-Number: 32138 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

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 submitted this change. ( 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(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified 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: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

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 submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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: llc: Fix typo LLGM -> LLGMM

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32157 ) Change subject: layer23: modem: llc: Fix typo LLGM -> LLGMM ...................................................................... layer23: modem: llc: Fix typo LLGM -> LLGMM Depends: libosmo-gprs.git Change-Id I59577d27bedd26903c9b1bfc64792f0891cea728 Change-Id: I786661894fc6772784ba6f0d2fdb45bbdca5254c --- M src/host/layer23/src/modem/llc.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/57/32157/1 diff --git a/src/host/layer23/src/modem/llc.c b/src/host/layer23/src/modem/llc.c index 5352e0f..c611947 100644 --- a/src/host/layer23/src/modem/llc.c +++ b/src/host/layer23/src/modem/llc.c @@ -92,7 +92,7 @@ int rc = 0; switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s TLLI=0x%08x\n", __func__, pdu_name, llc_prim->llgmm.tlli); break; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I786661894fc6772784ba6f0d2fdb45bbdca5254c Gerrit-Change-Number: 32157 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]: Fix typo LLGM -> LLGMM

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32156 ) Change subject: Fix typo LLGM -> LLGMM ...................................................................... Fix typo LLGM -> LLGMM The interface name is LLGMM, as presented in TS 44.06 7.1.0 and TS 24.007 Change-Id: I59577d27bedd26903c9b1bfc64792f0891cea728 --- M include/osmocom/gprs/llc/llc_prim.h M src/gmm/gmm_prim.c M src/llc/llc_llgmm.c M src/llc/llc_prim.c M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.ok M tests/llc/llc_prim_test.c M tests/llc/llc_prim_test.err 8 files changed, 28 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/56/32156/1 diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index 1a317e1..66b8a2a 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -12,7 +12,7 @@ /* Section 7.1.0 */ enum osmo_gprs_llc_prim_sap { - OSMO_GPRS_LLC_SAP_LLGM, + OSMO_GPRS_LLC_SAP_LLGMM, OSMO_GPRS_LLC_SAP_LL, OSMO_GPRS_LLC_SAP_GRR, OSMO_GPRS_LLC_SAP_BSSGP, diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index ce7afb2..9888e50 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -643,7 +643,7 @@ LOGGMM(LOGL_INFO, "Rx from lower layers: %s\n", osmo_gprs_llc_prim_name(llc_prim)); switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: rc = gprs_gmm_prim_handle_llgmm(llc_prim); break; case OSMO_GPRS_LLC_SAP_LL: diff --git a/src/llc/llc_llgmm.c b/src/llc/llc_llgmm.c index b099a6a..9797456 100644 --- a/src/llc/llc_llgmm.c +++ b/src/llc/llc_llgmm.c @@ -79,7 +79,7 @@ enum osmo_prim_operation operation, unsigned int l3_len) { - return gprs_llc_prim_alloc(OSMO_GPRS_LLC_SAP_LLGM, type, operation, l3_len); + return gprs_llc_prim_alloc(OSMO_GPRS_LLC_SAP_LLGMM, type, operation, l3_len); } /* 7.2.1.1 LLGMM-ASSIGN.req (MS/SGSN):*/ diff --git a/src/llc/llc_prim.c b/src/llc/llc_prim.c index fd3578e..d653f03 100644 --- a/src/llc/llc_prim.c +++ b/src/llc/llc_prim.c @@ -33,7 +33,7 @@ #define LLC_MSGB_HEADROOM 0 const struct value_string osmo_gprs_llc_prim_sap_names[] = { - { OSMO_GPRS_LLC_SAP_LLGM, "LLGM" }, + { OSMO_GPRS_LLC_SAP_LLGMM, "LLGMM" }, { OSMO_GPRS_LLC_SAP_LL, "LL" }, { OSMO_GPRS_LLC_SAP_GRR, "GRR" }, { OSMO_GPRS_LLC_SAP_BSSGP, "BSSGP" }, @@ -48,7 +48,7 @@ const char *type; switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: type = osmo_gprs_llc_llgmm_prim_type_name(llc_prim->oph.primitive); break; case OSMO_GPRS_LLC_SAP_LL: @@ -157,7 +157,7 @@ LOGLLC(LOGL_INFO, "Rx from upper layers: %s\n", osmo_gprs_llc_prim_name(llc_prim)); switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: rc = gprs_llc_prim_llgmm_upper_down(llc_prim); break; case OSMO_GPRS_LLC_SAP_LL: diff --git a/tests/gmm/gmm_prim_test.c b/tests/gmm/gmm_prim_test.c index 0053b94..fa300d4 100644 --- a/tests/gmm/gmm_prim_test.c +++ b/tests/gmm/gmm_prim_test.c @@ -204,7 +204,7 @@ const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: printf("%s(): Rx %s TLLI=0x%08x\n", __func__, pdu_name, llc_prim->llgmm.tlli); break; case OSMO_GPRS_LLC_SAP_LL: diff --git a/tests/gmm/gmm_prim_test.ok b/tests/gmm/gmm_prim_test.ok index dbbb858..12afb40 100644 --- a/tests/gmm/gmm_prim_test.ok +++ b/tests/gmm/gmm_prim_test.ok @@ -2,21 +2,21 @@ test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 01 04 97 07 00 00 01 0a 00 05 f4 00 00 00 00 00 f0 00 00 00 00 00 ] test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 16 08 42 32 24 43 32 24 43 f2 ] test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 13 02 ] -test_gmm_prim_llc_down_cb(): Rx LLGM-ASSIGN.request TLLI=0x00000000 -test_gmm_prim_llc_down_cb(): Rx LLGM-ASSIGN.request TLLI=0x00000000 +test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 +test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 test_gmm_prim_down_cb(): Rx GMRR-ASSIGN.request new_tlli=0xea711b41 test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xea711b41 SAPI=GMM l3=[08 03 ] test_gmm_prim_up_cb(): Rx GMMREG-ATTACH.confirm accepted=1 rej_cause=0 test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xea711b41 SAPI=GMM l3=[08 05 20 0a 00 05 f4 ea 71 1b 41 ] -test_gmm_prim_llc_down_cb(): Rx LLGM-ASSIGN.request TLLI=0x00000000 +test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 test_gmm_prim_up_cb(): Rx GMMREG-DETACH.confirm detach_type='GPRS detach' ==== test_gmm_prim_ms_gmmreg() [end] ==== ==== test_gmm_prim_ms_gmmsm() [start] ==== test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 01 04 97 07 00 00 01 0a 00 05 f4 00 00 00 00 00 f0 00 00 00 00 00 ] test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 16 08 42 32 24 43 32 24 43 f2 ] test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 13 02 ] -test_gmm_prim_llc_down_cb(): Rx LLGM-ASSIGN.request TLLI=0x00000000 -test_gmm_prim_llc_down_cb(): Rx LLGM-ASSIGN.request TLLI=0x00000000 +test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 +test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 test_gmm_prim_down_cb(): Rx GMRR-ASSIGN.request new_tlli=0xea711b41 test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xea711b41 SAPI=GMM l3=[08 03 ] test_gmm_prim_up_cb(): Rx GMMSM-ESTABLISH.confirm sess_id=1234 accepted=1 rej_cause=0 diff --git a/tests/llc/llc_prim_test.c b/tests/llc/llc_prim_test.c index 3e3dc82..83a7556 100644 --- a/tests/llc/llc_prim_test.c +++ b/tests/llc/llc_prim_test.c @@ -44,7 +44,7 @@ const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: printf("%s(): Rx %s TLLI=0x%08x\n", __func__, pdu_name, llc_prim->llgmm.tlli); break; case OSMO_GPRS_LLC_SAP_LL: diff --git a/tests/llc/llc_prim_test.err b/tests/llc/llc_prim_test.err index 2c38469..667b423 100644 --- a/tests/llc/llc_prim_test.err +++ b/tests/llc/llc_prim_test.err @@ -8,11 +8,11 @@ DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLC RX: unknown TLLI 0xe1c5d364, creating LLME on the fly DLGLOBAL DEBUG LLE(ffffffff/e1c5d364,GMM){UNASSIGNED} Rx SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=0 FCS=f218e2 DLGLOBAL INFO Rx from upper layers: LL-UNITDATA.request -DLGLOBAL INFO Rx from upper layers: LLGM-ASSIGN.request +DLGLOBAL INFO Rx from upper layers: LLGMM-ASSIGN.request DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLGM Assign pre (e1c5d364 => e1c5d364) DLGLOBAL NOTICE LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM Assign post (e1c5d364 => e1c5d364) -DLGLOBAL INFO Rx from upper layers: LLGM-RESET.request -DLGLOBAL INFO LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM-RESET.request +DLGLOBAL INFO Rx from upper layers: LLGMM-RESET.request +DLGLOBAL INFO LLME(e1c5d364/e1c5d364){ASSIGNED} LLGMM-RESET.request DLGLOBAL INFO Rx from upper layers: LL-XID.request DLGLOBAL NOTICE LLE(e1c5d364/e1c5d364,SNDCP3){UNASSIGNED} Sending XID type L3-Params (30 bytes) request to MS... DLGLOBAL INFO Rx from upper layers: LL-UNITDATA.request -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I59577d27bedd26903c9b1bfc64792f0891cea728 Gerrit-Change-Number: 32156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: MGCP_Test: support multiple codecs

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32153 ) Change subject: MGCP_Test: support multiple codecs ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8422313fccad1bfcee52c933f643068bebdaf2d5 Gerrit-Change-Number: 32153 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 30 Mar 2023 12:13:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[L] Change in osmo-bts[master]: contrib: Add BER testing tool

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31967 ) Change subject: contrib: Add BER testing tool ...................................................................... contrib: Add BER testing tool This implements RTP based GSM BER testing for osmo-bts, implementing ideas described in https://osmocom.org/projects/osmobts/wiki/BER_Testing In short: The command transmits a PRBS sequence encapsulated in RTP frames, which are sent to the BTS, which transmits that data in the (unimpaired) downlink. The mobile station receives the data and is instructed to loop it back in the (possibly impaired) uplink. The BTS receives that uplink, puts in in RTP frames which end up being received back by this very tool. By correlating the received RTP with the PRBS sequence, this tool can compute the BER (Bit Error Rate) of the (possibly impaired) uplink. Doing this with different RF channel model simulators in the uplink allows to establish BER at different levels and channel conditions. Original code by Sylvain Munaut extended with some comments and Automake integration by Harald Welte. Change-Id: I1cffa0ae959e29ec61775b13185fd1057ed7485a --- M .gitignore M configure.ac M contrib/Makefile.am A contrib/ber/Makefile.am A contrib/ber/README A contrib/ber/rtp_ber.c A contrib/ber/rtp_gen_map.c 7 files changed, 716 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index c33b83c..72897c5 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,6 @@ doc/manuals/build contrib/osmo-bts.spec +contrib/ber/codec_bit_class.h +contrib/ber/rtp_ber +contrib/ber/rtp_gen_map diff --git a/configure.ac b/configure.ac index 0e79792..82074d4 100644 --- a/configure.ac +++ b/configure.ac @@ -449,6 +449,7 @@ doc/examples/Makefile doc/manuals/Makefile contrib/Makefile + contrib/ber/Makefile contrib/systemd/Makefile contrib/osmo-bts.spec Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 3439c97..5594199 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1 +1 @@ -SUBDIRS = systemd +SUBDIRS = systemd ber diff --git a/contrib/ber/Makefile.am b/contrib/ber/Makefile.am new file mode 100644 index 0000000..e027378 --- /dev/null +++ b/contrib/ber/Makefile.am @@ -0,0 +1,31 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(builddir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMOCODEC_CFLAGS) \ + $(NULL) + +LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMOCODEC_LIBS) \ + $(NULL) + +noinst_PROGRAMS = rtp_ber rtp_gen_map + +BUILT_SOURCES = codec_bit_class.h +DISTCLEANFILES = codec_bit_class.h + +codec_bit_class.h: rtp_gen_map + $(AM_V_GEN)./$< > $@ + +rtp_ber_SOURCES = rtp_ber.c codec_bit_class.h + +rtp_gen_map_SOURCES = rtp_gen_map.c diff --git a/contrib/ber/README b/contrib/ber/README new file mode 100644 index 0000000..07c4a78 --- /dev/null +++ b/contrib/ber/README @@ -0,0 +1,26 @@ +BER testing tool +---------------- + +* Check all configs (MSC/BSC/BTS) for proper codec support + - FR enabled + - EFR enabled + - AMR 12.2 enabled (and all other modes disabled !) + - Use `amr-payload octet-aligned` in BSC config + +* Check BTS config + - Disable jitter buffer : `bts N / rtp jitter-buffer 0` + +* Check BSC config + - Disable radio timeout : `network / bts n / radio-link-timeout infinite` + +* Start BER testing tool + - `./rtp_ber 4000` + +* On the MSC CLI, start a silent-call, then request GSM to test loop + - `subscriber imsi <XXX> silent-call start tch/f speech-amr` + - `subscriber imsi <XXX> ms-test close-loop b` + + Don't forget to terminate the loop and terminate the silent call ! + + - `subscriber imsi <XXX> ms-test open-loop` + - `subscriber imsi <XXX> silent-call stop` diff --git a/contrib/ber/rtp_ber.c b/contrib/ber/rtp_ber.c new file mode 100644 index 0000000..01c1441 --- /dev/null +++ b/contrib/ber/rtp_ber.c @@ -0,0 +1,483 @@ +/* RTP based GSM BER testing for osmo-bts, implementing ideas described in + * https://osmocom.org/projects/osmobts/wiki/BER_Testing + * + * In short: The command transmits a PRBS sequence encapsulated in RTP frames, which are sent + * to the BTS, which transmits that data in the (unimpaired) downlink. The mobile station + * receives the data and is instructed to loop it back in the (possibly impaired) uplink. + * The BTS receives that uplink, puts in in RTP frames which end up being received back by this + * very tool. By correlating the received RTP with the PRBS sequence, this tool can compute + * the BER (Bit Error Rate) of the (possibly impaired) uplink. Doing this with different + * RF channel model simulators in the uplink allows to establish BER at different levels and + * channel conditions. */ + +/* (C) 2019 sysmocom - s.f.m.c. GmbH; Author: Sylvain Munaut + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> + +#include <osmocom/codec/codec.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/prbs.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/utils.h> +#include <osmocom/trau/osmo_ortp.h> + +#include <codec_bit_class.h> + + +struct app_state { + struct osmo_rtp_socket *rs; + + enum { + WAIT_CONN = 0, /* Wait for incoming connection */ + WAIT_LOOP, /* Wait for a somewhat valid packet to start measuring */ + RUNNING, /* Main state */ + } state; + + int pt; + + int ref_len; + uint8_t ref_bytes[GSM_FR_BYTES]; /* FR is the largest possible one */ + ubit_t ref_bits[8*GSM_FR_BYTES]; + + struct osmo_timer_list rtp_timer; + + uint16_t rx_last_seq; + uint32_t rx_last_ts; + uint32_t rx_idx; + uint32_t tx_idx; + + const int *err_tbl; /* Classification table */ + int err_frames; /* Number of accumulated frames */ + int err_cnt[3]; /* Bit error counter */ + int err_tot[3]; /* Total # bits in that class */ +}; + +#define FLOW_REG_TX_MAX_ADVANCE 200 +#define FLOW_REG_TX_MIN_ADVANCE 50 + + +const struct log_info log_info; + + +static const uint8_t amr_size_by_ft[] = { + [0] = 12, /* 4.75 */ + [1] = 13, /* 5.15 */ + [2] = 15, /* 5.9 */ + [3] = 17, /* 6.7 */ + [4] = 19, /* 7.4 */ + [5] = 20, /* 7.95 */ + [6] = 26, /* 10.2 */ + [7] = 31, /* 12.2 */ + [8] = 5, /* SID */ +}; + +static const char * const amr_rate_by_ft[] = { + [0] = "4.75", + [1] = "5.15", + [2] = "5.9", + [3] = "6.7", + [4] = "7.4", + [5] = "7.95", + [6] = "10.2", + [7] = "12.2", + [8] = "SID", +}; + + +static void +_gsm_fr_gen_ref(struct app_state *as) +{ + struct osmo_prbs_state pn9; + + /* Length */ + as->ref_len = GSM_FR_BYTES; + + /* Marker */ + as->ref_bits[0] = 1; + as->ref_bits[1] = 1; + as->ref_bits[2] = 0; + as->ref_bits[3] = 1; + + /* PN */ + osmo_prbs_state_init(&pn9, &osmo_prbs9); + pn9.state = 31; + osmo_prbs_get_ubits(&as->ref_bits[4], 260, &pn9); + + /* Convert to bytes */ + osmo_ubit2pbit_ext(as->ref_bytes, 0, as->ref_bits, 0, 8*GSM_FR_BYTES, 0); + + /* Init error classes */ + as->err_tot[0] = 50; + as->err_tot[1] = 132; + as->err_tot[2] = 78; + as->err_tbl = gsm_fr_bitclass; +} + +static void +_gsm_efr_gen_ref(struct app_state *as) +{ + struct osmo_prbs_state pn9; + + /* Length */ + as->ref_len = GSM_EFR_BYTES; + + /* Marker */ + as->ref_bits[0] = 1; + as->ref_bits[1] = 1; + as->ref_bits[2] = 0; + as->ref_bits[3] = 0; + + /* PN */ + osmo_prbs_state_init(&pn9, &osmo_prbs9); + pn9.state = 31; + osmo_prbs_get_ubits(&as->ref_bits[4], 244, &pn9); + + /* Convert to bytes */ + osmo_ubit2pbit_ext(as->ref_bytes, 0, as->ref_bits, 0, 8*GSM_EFR_BYTES, 0); + + /* Init error classes */ + as->err_tot[0] = 50; + as->err_tot[1] = 125; + as->err_tot[2] = 73; + as->err_tbl = gsm_efr_bitclass; +} + +static void +_gsm_amr_gen_ref(struct app_state *as) +{ + struct osmo_prbs_state pn9; + uint8_t hdr[2]; + + /* Length */ + as->ref_len = 33; + + /* Header */ + hdr[0] = 0x70; + hdr[1] = 0x3c; + osmo_pbit2ubit_ext(as->ref_bits, 0, hdr, 0, 16, 0); + + /* PN */ + osmo_prbs_state_init(&pn9, &osmo_prbs9); + pn9.state = 31; + osmo_prbs_get_ubits(&as->ref_bits[16], 244, &pn9); + + /* Unused bits */ + as->ref_bits[260] = 0; + as->ref_bits[261] = 0; + as->ref_bits[262] = 0; + as->ref_bits[263] = 0; + + /* Convert to bytes */ + osmo_ubit2pbit_ext(as->ref_bytes, 0, as->ref_bits, 0, 264, 0); + + /* Init error classes */ + as->err_tot[0] = 81; + as->err_tot[1] = 163; + as->err_tot[2] = -1; + as->err_tbl = gsm_amr_12_2_bitclass; +} + + +static void +_gsm_gen_ref(struct app_state *as) +{ + switch (as->pt) { + case RTP_PT_GSM_FULL: + _gsm_fr_gen_ref(as); + break; + case RTP_PT_GSM_EFR: + _gsm_efr_gen_ref(as); + break; + case RTP_PT_AMR: + _gsm_amr_gen_ref(as); + break; + default: + fprintf(stderr, "[!] Unsupported payload type for BER measurement\n"); + } +} + +static int +_gsm_ber(struct app_state *as, const uint8_t *payload, unsigned int payload_len) +{ + ubit_t rx_bits[8*33]; + int err[3]; /* Class 1a, 1b, 2 */ + int ones; + int i, j; + + if (payload) { + /* Process real-payload */ + osmo_pbit2ubit_ext(rx_bits, 0, payload, 0, 8*payload_len, 0); + + err[0] = err[1] = err[2] = 0; + ones = 0; + + for (i = 0; i < 8 * payload_len; i++) { + j = as->err_tbl[i]; + if (j >= 0) { + err[j] += rx_bits[i] ^ as->ref_bits[i]; + ones += rx_bits[i]; + } + } + + if (ones < 32) { // This frames is probably us underrunning Tx, don't use it + fprintf(stderr, "[w] Frame ignored as probably TX underrun %d %d\n", as->tx_idx, as->rx_idx); + return 1; + } + } else { + /* No payload -> Lost frame completely */ + err[0] = as->err_tot[0] / 2; + err[1] = as->err_tot[1] / 2; + err[2] = as->err_tot[2] / 2; + } + + if (as->state == RUNNING) { + /* Update records */ + if (err[0] != 0) { + /* Class 1a bits bad -> Frame error */ + as->err_cnt[0]++; + } + + as->err_cnt[1] += err[1]; /* Class 1b */ + as->err_cnt[2] += err[2]; /* class 2 */ + + as->err_frames++; + + /* Enough for a read-out ? */ + if (as->err_frames == 200) { + printf("FBER: %4.2f C1b RBER: %5.3f C2 RBER: %5.3f\n", + 100.0f * as->err_cnt[0] / as->err_frames, + 100.0f * as->err_cnt[1] / (as->err_tot[1] * as->err_frames), + 100.0f * as->err_cnt[2] / (as->err_tot[2] * as->err_frames) + ); + memset(as->err_cnt, 0, sizeof(as->err_cnt)); + as->err_frames = 0; + } + } + + return err[0] != 0; +} + +static int +_rtp_check_payload_type(const uint8_t *payload, unsigned int payload_len) +{ + uint8_t ft; + int pt = -1; + + switch (payload_len) { + case GSM_FR_BYTES: /* FR or AMR 12.2k */ + /* Check for AMR */ + ft = (payload[1] >> 3) & 0xf; + if (ft == 7) + pt = RTP_PT_AMR; + + /* Check for FR */ + else if ((payload[0] & 0xF0) == 0xD0) + pt = RTP_PT_GSM_FULL; + + /* None of the above */ + else + fprintf(stderr, "[!] FR without 0xD0 signature or AMR with unknwon Frame Type ?!?\n"); + + break; + case GSM_EFR_BYTES: /* EFR */ + if ((payload[0] & 0xF0) != 0xC0) + fprintf(stderr, "[!] EFR without 0xC0 signature ?!?\n"); + pt = RTP_PT_GSM_EFR; + break; + case GSM_HR_BYTES: /* HR */ + pt = RTP_PT_GSM_HALF; + break; + default: /* AMR */ + { + uint8_t cmr, cmi, sti; + cmr = payload[0] >> 4; + ft = (payload[1] >> 3) & 0xf; + + if (payload_len != amr_size_by_ft[ft]+2) + fprintf(stderr, "AMR FT %u(%s) but size %u\n", + ft, amr_rate_by_ft[ft], payload_len); + + switch (ft) { + case 0: case 1: case 2: case 3: + case 4: case 5: case 6: case 7: + cmi = ft; + printf("AMR SPEECH with FT/CMI %u(%s), " + "CMR %u\n", + cmi, amr_rate_by_ft[cmi], + cmr); + break; + case 8: /* SID */ + cmi = (payload[2+4] >> 1) & 0x7; + sti = payload[2+4] & 0x10; + printf("AMR SID %s with CMI %u(%s), CMR %u(%s)\n", + sti ? "UPDATE" : "FIRST", + cmi, amr_rate_by_ft[cmi], + cmr, amr_rate_by_ft[cmr]); + break; + } + } + break; + } + + return pt; +} + +static void +rtp_timer_cb(void *priv) +{ + struct app_state *as = (struct app_state *)priv; + + /* Send at least one frame if we're not too far ahead */ + if (as->tx_idx < (as->rx_idx + FLOW_REG_TX_MAX_ADVANCE)) { + osmo_rtp_send_frame(as->rs, as->ref_bytes, as->ref_len, GSM_RTP_DURATION); + as->tx_idx++; + } else { + fprintf(stderr, "Skipped\n"); + } + + /* Then maybe a second one to try and catch up to RX */ + if (as->tx_idx < (as->rx_idx + FLOW_REG_TX_MIN_ADVANCE)) { + osmo_rtp_send_frame(as->rs, as->ref_bytes, as->ref_len, GSM_RTP_DURATION); + as->tx_idx++; + } + + /* Re-schedule */ + osmo_timer_schedule(&as->rtp_timer, 0, 20000); +} + +static int +rtp_seq_num_diff(uint16_t new, uint16_t old) +{ + int d = (int)new - (int)old; + while (d > 49152) + d -= 65536; + while (d < -49152) + d += 65536; + return d; +} + +static void +rtp_rx_cb(struct osmo_rtp_socket *rs, + const uint8_t *payload, unsigned int payload_len, + uint16_t seq_number, uint32_t timestamp, bool marker) +{ + struct app_state *as = (struct app_state *)rs->priv; + int pt, rc, d; + +// printf("Rx(%u, %d, %d, %d): %s\n", payload_len, seq_number, timestamp, marker, osmo_hexdump(payload, payload_len)); + + /* Identify payload */ + pt = _rtp_check_payload_type(payload, payload_len); + + /* First packet ? */ + if (as->state == WAIT_CONN) { + /* Setup for this payload type */ + as->pt = pt; + osmo_rtp_socket_set_pt(as->rs, pt); + _gsm_gen_ref(as); + + /* Timer every 20 ms */ + osmo_timer_setup(&as->rtp_timer, rtp_timer_cb, as); + osmo_timer_add(&as->rtp_timer); + osmo_timer_schedule(&as->rtp_timer, 0, 20000); + + /* Init our time tracking */ + as->rx_last_seq = seq_number; + as->rx_last_ts = timestamp; + + /* Now we wait for a loop */ + as->state = WAIT_LOOP; + } + + /* RX sequence & timstamp tracking */ + if (rtp_seq_num_diff(seq_number, as->rx_last_seq) > 1) + fprintf(stderr, "[!] RTP sequence number discontinuity (%d -> %d)\n", as->rx_last_seq, seq_number); + + d = (timestamp - as->rx_last_ts) / GSM_RTP_DURATION; + + as->rx_idx += d; + as->rx_last_seq = seq_number; + as->rx_last_ts = timestamp; + + /* Account for missing frames in BER tracking */ + if (d > 1) { + fprintf(stderr, "[!] RTP %d missing frames assumed lost @%d\n", d-1, seq_number); + while (--d) + _gsm_ber(as, NULL, 0); + } + + /* BER analysis */ + rc = _gsm_ber(as, payload, payload_len); + + if ((as->state == WAIT_LOOP) && (rc == 0)) + as->state = RUNNING; +} + + +int main(int argc, char **argv) +{ + struct app_state _as, *as = &_as; + int rc, port; + + /* Args */ + if (argc < 2) + return -1; + + port = atoi(argv[1]); + + /* App init */ + memset(as, 0x00, sizeof(struct app_state)); + + log_init(&log_info, NULL); + osmo_rtp_init(NULL); + + /* Start auto-connect RTP socket */ + as->rs = osmo_rtp_socket_create(NULL, 0); + + as->rs->priv = as; + as->rs->rx_cb = rtp_rx_cb; + + /* Jitter buffer gets in the way, we want the raw traffic */ + osmo_rtp_socket_set_param(as->rs, OSMO_RTP_P_JIT_ADAP, 0); + osmo_rtp_socket_set_param(as->rs, OSMO_RTP_P_JITBUF, 0); + + /* Bind to requested port */ + fprintf(stderr, "[+] Binding RTP socket on port %u...\n", port); + rc = osmo_rtp_socket_bind(as->rs, "0.0.0.0", port); + if (rc < 0) { + fprintf(stderr, "[!] error binding RTP socket: %d\n", rc); + return rc; + } + + /* We 'connect' to the first source we hear from */ + osmo_rtp_socket_autoconnect(as->rs); + + /* Main loop */ + while (1) + osmo_select_main(0); + + return 0; +} diff --git a/contrib/ber/rtp_gen_map.c b/contrib/ber/rtp_gen_map.c new file mode 100644 index 0000000..40b7025 --- /dev/null +++ b/contrib/ber/rtp_gen_map.c @@ -0,0 +1,145 @@ +/* utility to generate codec_bit_class.h, a file with structures + * describing which [protection] class each bit of a given codec frame belongs to */ + +/* (C) 2019 sysmocom - s.f.m.c. GmbH; Author: Sylvain Munaut + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + + +#include <stdio.h> + +#include <osmocom/codec/codec.h> + + +static int +gen_table_fr(int *tbl) +{ + int i, j; + + tbl[0] = tbl[1] = tbl[2] = tbl[3] = -1; + + for (i = 0; i < 260; i++) { + j = 4 + gsm610_bitorder[i]; + if (i < 50) + tbl[j] = 0; /* Class 1a */ + else if (i < 182) + tbl[j] = 1; /* Class 1b */ + else + tbl[j] = 2; /* Class 2 */ + } + + return GSM_FR_BYTES * 8; +} + +static int +gen_table_efr(int *tbl) +{ + int i, j, k; + + tbl[0] = tbl[1] = tbl[2] = tbl[3] = -1; + + for (i = 0; i < 260; i++) { + j = gsm660_bitorder[i]; + + if (j < 71) + k = j; + else if (j < 73) + k = 71; + else if (j < 123) + k = j - 2; + else if (j < 125) + k = 119; + else if (j < 178) + k = j - 4; + else if (j < 180) + k = 172; + else if (j < 230) + k = j - 6; + else if (j < 232) + k = 222; + else if (j < 252) + k = j - 8; + else + continue; + + if (i < 50) + tbl[k] = 0; /* Class 1a */ + else if (i < 182) + tbl[k] = 1; /* Class 1b */ + else + tbl[k] = 2; /* Class 2 */ + } + + return GSM_EFR_BYTES * 8; +} + +static int +gen_table_amr_12_2(int *tbl) +{ + int i; + + for (i = 0; i < 16; i++) + tbl[i] = -1; + + for (i = 0; i < 244; i++) + tbl[i+16] = i < 81 ? 0 : 1; + + for (i = 0; i < 4; i++) + tbl[i+16+244] = -1; + + return 8 * 33; +} + + +static void +print_table(const char *name, int *tbl, int len) +{ + int i; + + printf("static const int %s[] = {\n", name); + + for (i = 0; i < len; i++) { + if ((i & 15) == 0) + printf("\t"); + + printf("%2d", tbl[i]); + + if (((i & 15) == 15) || (i == len-1)) + printf(",\n"); + else + printf(", "); + } + + printf("};\n\n"); +} + + +int main(int argc, char *argv[]) +{ + int tbl[33*8]; + int rv; + + rv = gen_table_fr(tbl); + print_table("gsm_fr_bitclass", tbl, rv); + + rv = gen_table_efr(tbl); + print_table("gsm_efr_bitclass", tbl, rv); + + rv = gen_table_amr_12_2(tbl); + print_table("gsm_amr_12_2_bitclass", tbl, rv); + + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1cffa0ae959e29ec61775b13185fd1057ed7485a Gerrit-Change-Number: 31967 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[L] Change in osmo-bts[master]: contrib: Add BER testing tool

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31967 ) Change subject: contrib: Add BER testing tool ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1cffa0ae959e29ec61775b13185fd1057ed7485a Gerrit-Change-Number: 31967 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 30 Mar 2023 11:59:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmocom-bb[master]: modem: initial SM layer support through libosmo-gprs-sm

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/32155 to look at the new patch set (#2). Change subject: modem: initial SM layer support through libosmo-gprs-sm ...................................................................... modem: initial SM layer support through libosmo-gprs-sm Depends: libosmo-gprs.git Change-Id I9b4a9a6364f7799540475e7e1d10ab2310768281 Related: OS#5501 Change-Id: I9476d93954c7dc348e6f97ca89eaa651f802f9a0 --- M src/host/layer23/configure.ac M src/host/layer23/include/osmocom/bb/common/logging.h M src/host/layer23/include/osmocom/bb/modem/Makefile.am A src/host/layer23/include/osmocom/bb/modem/sm.h M src/host/layer23/src/common/logging.c M src/host/layer23/src/modem/Makefile.am M src/host/layer23/src/modem/app_modem.c A src/host/layer23/src/modem/sm.c M src/host/layer23/src/modem/vty.c 9 files changed, 228 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/55/32155/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9476d93954c7dc348e6f97ca89eaa651f802f9a0 Gerrit-Change-Number: 32155 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[XL] Change in libosmo-gprs[master]: Introduce libosmo-gprs-sm

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/+/32154 to look at the new patch set (#3). Change subject: Introduce libosmo-gprs-sm ...................................................................... Introduce libosmo-gprs-sm This patch itnroduces all the boilerplate required to build and package a new libosmo-gprs-sm.so library, which aims to contain the SM layer implementation. A minimal implementation is provided together with a unit test, showcasing Activation of a PDP Context and requesting implicit GPRS attach to GMM if it is not yet attached. This commit also adds/improves code in GMM layer implementing the GMMSM SAP which is used to interact SM<->GMM. Related: OS#5501 Change-Id: I9b4a9a6364f7799540475e7e1d10ab2310768281 --- M Makefile.am M configure.ac M contrib/libosmo-gprs.spec.in M debian/control A debian/libosmo-gprs-sm-dev.install A debian/libosmo-gprs-sm0.install M include/osmocom/gprs/Makefile.am M include/osmocom/gprs/gmm/gmm_ms_fsm.h M include/osmocom/gprs/gmm/gmm_prim.h M include/osmocom/gprs/gmm/gmm_private.h A include/osmocom/gprs/sm/Makefile.am A include/osmocom/gprs/sm/sm.h A include/osmocom/gprs/sm/sm_ms_fsm.h A include/osmocom/gprs/sm/sm_pdu.h A include/osmocom/gprs/sm/sm_prim.h A include/osmocom/gprs/sm/sm_private.h A libosmo-gprs-sm.pc.in M src/Makefile.am M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c M src/gmm/gmm_prim.c A src/sm/Makefile.am A src/sm/misc.c A src/sm/sm.c A src/sm/sm_ms_fsm.c A src/sm/sm_pdu.c A src/sm/sm_prim.c M tests/Makefile.am M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.err M tests/gmm/gmm_prim_test.ok A tests/sm/Makefile.am A tests/sm/sm_prim_test.c A tests/sm/sm_prim_test.err A tests/sm/sm_prim_test.ok M tests/testsuite.at 36 files changed, 2,501 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/54/32154/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9b4a9a6364f7799540475e7e1d10ab2310768281 Gerrit-Change-Number: 32154 Gerrit-PatchSet: 3 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

[L] Change in osmo-bts[master]: contrib: Add BER testing tool

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31967 ) Change subject: contrib: Add BER testing tool ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1cffa0ae959e29ec61775b13185fd1057ed7485a Gerrit-Change-Number: 31967 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 30 Mar 2023 11:01:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[XL] Change in libosmo-gprs[master]: Introduce libosmo-gprs-sm

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32154 to look at the new patch set (#2). Change subject: Introduce libosmo-gprs-sm ...................................................................... Introduce libosmo-gprs-sm This patch itnroduces all the boilerplate required to build and package a new libosmo-gprs-sm.so library, which aims to contain the SM layer implementation. A minimal implementation is provided together with a unit test, showcasing Activation of a PDP Context and requesting implicit GPRS attach to GMM if it is not yet attached. This commit also adds/improves code in GMM layer implementing the GMMSM SAP which is used to interact SM<->GMM. Related: OS#5501 Change-Id: I9b4a9a6364f7799540475e7e1d10ab2310768281 --- M Makefile.am M configure.ac M contrib/libosmo-gprs.spec.in M debian/control A debian/libosmo-gprs-sm-dev.install A debian/libosmo-gprs-sm0.install M include/osmocom/gprs/Makefile.am M include/osmocom/gprs/gmm/gmm_ms_fsm.h M include/osmocom/gprs/gmm/gmm_prim.h M include/osmocom/gprs/gmm/gmm_private.h A include/osmocom/gprs/sm/Makefile.am A include/osmocom/gprs/sm/sm.h A include/osmocom/gprs/sm/sm_ms_fsm.h A include/osmocom/gprs/sm/sm_pdu.h A include/osmocom/gprs/sm/sm_prim.h A include/osmocom/gprs/sm/sm_private.h A libosmo-gprs-sm.pc.in M src/Makefile.am M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c M src/gmm/gmm_prim.c A src/sm/Makefile.am A src/sm/misc.c A src/sm/sm.c A src/sm/sm_ms_fsm.c A src/sm/sm_pdu.c A src/sm/sm_prim.c M tests/Makefile.am M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.err M tests/gmm/gmm_prim_test.ok A tests/sm/Makefile.am A tests/sm/sm_prim_test.c A tests/sm/sm_prim_test.err A tests/sm/sm_prim_test.ok M tests/testsuite.at 36 files changed, 2,453 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/54/32154/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9b4a9a6364f7799540475e7e1d10ab2310768281 Gerrit-Change-Number: 32154 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

2024

2023

2022

gerrit-log March 2023