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

[S] Change in osmo-ci[master]: jobs/osmocom-build-tags: run inside docker

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34204 ) Change subject: jobs/osmocom-build-tags: run inside docker ...................................................................... jobs/osmocom-build-tags: run inside docker Run this job inside docker, so all depends are available (fixes that it currently fails because liburing isn't available for libosmocore). Change-Id: I5a8243b3096dba8f94f715413c84683c7495777c --- M jobs/osmocom-build-tags-against-master.yml 1 file changed, 20 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/osmocom-build-tags-against-master.yml b/jobs/osmocom-build-tags-against-master.yml index 2e87c69..4ea4055 100644 --- a/jobs/osmocom-build-tags-against-master.yml +++ b/jobs/osmocom-build-tags-against-master.yml @@ -24,7 +24,14 @@ default: '*/master' builders: - shell: | - PARALLEL_MAKE=-j8 scripts/osmocom-build-old-tags-against-master.sh + docker run \ + --rm=true \ + -e PARALLEL_MAKE="-j8" \ + -u build \ + -v "$PWD:/build" \ + -w /build \ + "$USER/debian-bookworm-build" \ + scripts/osmocom-build-old-tags-against-master.sh scm: - git: branches: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5a8243b3096dba8f94f715413c84683c7495777c Gerrit-Change-Number: 34204 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: scripts/osmocom-api-doxygen: check ssh early

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34203 ) Change subject: scripts/osmocom-api-doxygen: check ssh early ...................................................................... scripts/osmocom-api-doxygen: check ssh early Check for working SSH right at the start of the job, so we don't need to wait 2 minutes until it has built everything to find it out. Change-Id: Id93c15d38a49859dc63d39f70f051a7df871c398 --- M scripts/osmocom-api-doxygen.sh 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/scripts/osmocom-api-doxygen.sh b/scripts/osmocom-api-doxygen.sh index 765b7fb..cfa5e61 100755 --- a/scripts/osmocom-api-doxygen.sh +++ b/scripts/osmocom-api-doxygen.sh @@ -1,4 +1,6 @@ #!/bin/sh -ex +SSH_CMD="ssh -o UserKnownHostsFile=/build/contrib/known_hosts -p 48" + # Repositories for which doxygen documentation will be generated and # uploaded, also dependencies which need to be built repos_api=" @@ -13,6 +15,9 @@ # Source common.sh from osmo-ci.git for osmo_git_clone_url() . scripts/common.sh +# Check early that SSH works +$SSH_CMD api(a)ftp.osmocom.org -T -- true + # Put git repos and install data in a subdir, so it isn't in the root # of the cloned osmo-ci.git repository mkdir _osmocom_api @@ -45,7 +50,7 @@ rsync \ -avz \ --delete \ - -e "ssh -o UserKnownHostsFile=/build/contrib/known_hosts -p 48" \ + -e "$SSH_CMD" \ ./"$i"/doc/ \ api@ftp.osmocom.org:web-files/latest/"$i"/ done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id93c15d38a49859dc63d39f70f051a7df871c398 Gerrit-Change-Number: 34203 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[M] Change in osmo-ci[master]: jobs/osmocom-api: run inside docker

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34202 ) Change subject: jobs/osmocom-api: run inside docker ...................................................................... jobs/osmocom-api: run inside docker Run the osmocom-api job inside docker, so all depends are available (fixes that it currently fails because liburing isn't available for libosmocore). Use the contrib/known_hosts file, instead of writing an own copy during the job. Change-Id: I6e831c71c4c88772c3e4232fcb1a9e2c1c73d997 --- M jobs/osmocom-api.yml A scripts/osmocom-api-doxygen.sh 2 files changed, 76 insertions(+), 56 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/osmocom-api.yml b/jobs/osmocom-api.yml index 238340c..294ccaa 100644 --- a/jobs/osmocom-api.yml +++ b/jobs/osmocom-api.yml @@ -35,59 +35,12 @@ wipe-workspace: true builders: - shell: | - # Repositories for which doxygen documentation will be generated and - # uploaded, also dependencies which need to be built - repos_api=" - libosmocore - libosmo-abis - libosmo-dsp - libosmo-netif - libosmo-sccp - osmo-gmr" - - # Source common.sh from osmo-ci.git for osmo_git_clone_url() - . scripts/common.sh - - # Put git repos and install data in a subdir, so it isn't in the root - # of the cloned osmo-ci.git repository - mkdir _osmocom_api - cd _osmocom_api - - # Prepare pkgconfig path - export PKG_CONFIG_PATH=$PWD/install/lib/pkgconfig - mkdir -p "$PKG_CONFIG_PATH" - - # Prepare known_hosts - cat > known_hosts <<EOF - [ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9 - [ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= - [ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX - EOF - - # Clone and build the repositories - for i in $repos_api; do - git clone "$(osmo_git_clone_url "$i")" - cd "$i" - autoreconf -fi - ./configure \ - --prefix=$PWD/../install \ - --with-systemdsystemunitdir=no - make $PARALLEL_MAKE install - cd .. - done - - # Upload all docs - for i in $repos_api; do - if ! [ -d "$i"/doc ]; then - # e.g. libosmo-abis is built as dependency for others but doesn't - # have its own doxygen documentation as of writing - continue - fi - - rsync \ - -avz \ - --delete \ - -e "ssh -o 'UserKnownHostsFile=known_hosts' -p 48" \ - ./"$i"/doc/ \ - api@ftp.osmocom.org:web-files/latest/"$i"/ - done + docker run \ + --rm=true \ + -e SSH_AUTH_SOCK=/ssh-agent \ + -u build \ + -v "$PWD:/build" \ + -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ + -w /build \ + "$USER/debian-bookworm-build" \ + scripts/osmocom-api-doxygen.sh diff --git a/scripts/osmocom-api-doxygen.sh b/scripts/osmocom-api-doxygen.sh new file mode 100755 index 0000000..765b7fb --- /dev/null +++ b/scripts/osmocom-api-doxygen.sh @@ -0,0 +1,51 @@ +#!/bin/sh -ex +# Repositories for which doxygen documentation will be generated and +# uploaded, also dependencies which need to be built +repos_api=" + libosmocore + libosmo-abis + libosmo-dsp + libosmo-netif + libosmo-sccp + osmo-gmr +" + +# Source common.sh from osmo-ci.git for osmo_git_clone_url() +. scripts/common.sh + +# Put git repos and install data in a subdir, so it isn't in the root +# of the cloned osmo-ci.git repository +mkdir _osmocom_api +cd _osmocom_api + +# Prepare pkgconfig path +export PKG_CONFIG_PATH=$PWD/install/lib/pkgconfig +mkdir -p "$PKG_CONFIG_PATH" + +# Clone and build the repositories +for i in $repos_api; do + git clone "$(osmo_git_clone_url "$i")" + cd "$i" + autoreconf -fi + ./configure \ + --prefix=$PWD/../install \ + --with-systemdsystemunitdir=no + make $PARALLEL_MAKE install + cd .. +done + +# Upload all docs +for i in $repos_api; do + if ! [ -d "$i"/doc ]; then + # e.g. libosmo-abis is built as dependency for others but doesn't + # have its own doxygen documentation as of writing + continue + fi + + rsync \ + -avz \ + --delete \ + -e "ssh -o UserKnownHostsFile=/build/contrib/known_hosts -p 48" \ + ./"$i"/doc/ \ + api@ftp.osmocom.org:web-files/latest/"$i"/ +done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6e831c71c4c88772c3e4232fcb1a9e2c1c73d997 Gerrit-Change-Number: 34202 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: coverity: run inside docker

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34205 ) Change subject: coverity: run inside docker ...................................................................... coverity: run inside docker Run the coverity job inside docker, so all depends are available (fixes that it currently fails because liburing isn't available for libosmocore). Depends: docker-playground I25862a7e3c8a73e13fd4a9237ab57500d8dfc95c Change-Id: I5cfdb6b2e12e176ff6d6ed6c1b8505d7694993f9 --- M coverity/jenkins.sh M jobs/coverity.yml 2 files changed, 26 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/coverity/jenkins.sh b/coverity/jenkins.sh index 64d21de..dfe3067 100755 --- a/coverity/jenkins.sh +++ b/coverity/jenkins.sh @@ -3,6 +3,8 @@ set -e -x +export PATH=$PATH:/opt/coverity/current/bin + base_dir="$HOME/osmo-ci/coverity" src_dir="$PWD/source-Osmocom" cov_dir="$src_dir/cov-int" diff --git a/jobs/coverity.yml b/jobs/coverity.yml index 242d1aa..7c4b0e8 100644 --- a/jobs/coverity.yml +++ b/jobs/coverity.yml @@ -12,9 +12,16 @@ node: coverity builders: - shell: | - cd coverity - export PATH=$PATH:/opt/coverity/current/bin - ./jenkins.sh + docker run \ + --rm=true \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -u build \ + -v "$PWD:/build" \ + -v "/home/osmo-ci/coverity:/home/osmo-ci/coverity:ro" \ + -v "/opt/coverity:/opt/coverity:ro" \ + -w /build/coverity \ + "$USER/debian-bookworm-build" \ + ./jenkins.sh publishers: - email: recipients: 'jenkins-notifications(a)lists.osmocom.org' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5cfdb6b2e12e176ff6d6ed6c1b8505d7694993f9 Gerrit-Change-Number: 34205 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: debian-*-erlang: Install on libsctp-dev to enable sctp support in erl...

by pespin

Attention is currently required from: osmith, pespin, daniel. Hello osmith, Jenkins Builder, fixeria, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/34200 to look at the new patch set (#3). Change subject: debian-*-erlang: Install on libsctp-dev to enable sctp support in erlang apps ...................................................................... debian-*-erlang: Install on libsctp-dev to enable sctp support in erlang apps The current "--enable-sctp" flag when building erlang consists of supporting SCTP if the libsctp library is found at runtime, by dynamically linking to it only when SCTP features are requested. The erlang package in debian only lists libsctp as a Build-Depends, but it is not installed by default, so apps wishing to use SCTP will fail: """ [error] CRASH REPORT Process <0.155.0> with 0 neighbours crashed with reason: no match of right hand value {error,{shutdown,{open,eprotonosupport} """ Installing the libsctp library fixes the issue. Related: OS#5757 Change-Id: I5ca332f9064c16491116608577b3f68379d840e6 --- M debian-bookworm-erlang/Dockerfile M debian-bullseye-erlang/Dockerfile 2 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/00/34200/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5ca332f9064c16491116608577b3f68379d840e6 Gerrit-Change-Number: 34200 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 1 week

1
0
0 0

[S] Change in ...osmo_dia2gsup[master]: gsup: Attempt reconnecting if connect fails

by pespin

Attention is currently required from: laforge, daniel, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34199 ) Change subject: gsup: Attempt reconnecting if connect fails ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I need this one to have TTCN3 test passing since osmo_dia2gsup starts before the TTCN3 GSUP server starts. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I47b6db0f0267bbd4c80fbac9d51a8647862827a0 Gerrit-Change-Number: 34199 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 28 Aug 2023 09:05:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: properly set E1/E2/E3 for non-transparent data

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34218 ) Change subject: csd_v110: properly set E1/E2/E3 for non-transparent data ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie38c12e462654cd9fe83a0420bc8ea8b476214b8 Gerrit-Change-Number: 34218 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Aug 2023 08:59:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: fix comments in csd_v110_rtp_{en,de}code()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34217 ) Change subject: csd_v110: fix comments in csd_v110_rtp_{en,de}code() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6fee665e587bfa76058187e13f0cdafaea991940 Gerrit-Change-Number: 34217 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Aug 2023 08:59:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[L] Change in libosmo-netif[master]: stream tests: Eliminate timestamps from output

by pespin

Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34224 ) Change subject: stream tests: Eliminate timestamps from output ...................................................................... Patch Set 1: Code-Review-2 (1 comment) Patchset: PS1: Removing time from test output just because you don't know why it changes it not a valid rationale. Either there's a known reason requiring and justifying this change, or you need to fix whatever it doing that. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7faed932927d4f6e328a28c7f30a647a7272e89c Gerrit-Change-Number: 34224 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Aug 2023 08:48:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by arehbein

Attention is currently required from: pespin, fixeria, daniel. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198 ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 20: (1 comment) Patchset: PS19: > I have added a patch eliminating timestamp logging in the test: […] *timestamp behavior of the second half of the test to be more exact. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 20 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Aug 2023 22:26:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by arehbein

Attention is currently required from: pespin, fixeria, daniel. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198 ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 20: (2 comments) Patchset: PS19: > But if that's unrelated to this patch and it shows up as a result of rebase, better submit a precedi […] I have added a patch eliminating timestamp logging in the test: https://gerrit.osmocom.org/c/libosmo-netif/+/34224 I don't know what the cause is, but it appears recent changes to libosmocore or libosmo-netif have changed the timestamp behavior which used to be predictable. Patchset: PS20: After adapting `stream_test.err` to some of the new logs (locally), a connectivity issue (it's not just the logging, a lag that I didn't have before comes along with the following output) has appeared ``` unable to connect socket: 127.0.0.11:1111: Cannot assign requested address no suitable remote addr found for: 127.0.0.11:1111 CLICONN(,){WAIT_RECONNECT} retrying reconnect in 5 seconds... Cannot open stream client ``` It's not any patches in libosmocore causing this new behavior (I tried an older libosmocore patch, that didn't change anything), so I took a look at libosmo-netif and saw a couple of recent changes, probably something there. A workaround for this was changing the port for the stream client tests from 1111 to 1112 (similarly to how I had to change the local port from 8967 to something else in order for osmo time not becoming unpredictable...). But I do wonder if this shouldn't be addressed (somehow after destroying the client, and reopening the server link, the same port remains blocked for a noticeable amount of time, apart from the error log). -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 20 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Aug 2023 22:19:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by arehbein

Attention is currently required from: arehbein, fixeria, daniel. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 to look at the new patch set (#20). Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... stream: Add client-side (segmentation) support for IPA With this commit, IPA segmentation is taken care of by setting the segmentation callback provided by libosmo-netif. The ipa-stream-server example needs to prepend IPA headers now because those are stripped by the segm. cb on both sides. Depends: libosmocore.git I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Related: OS#5753, OS#5751 Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c M include/osmocom/netif/stream.h M src/stream_cli.c M tests/stream/stream_test.c M tests/stream/stream_test.err M tests/stream/stream_test.ok 7 files changed, 337 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/98/33198/20 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 20 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 1 week

1
0
0 0

[L] Change in libosmo-netif[master]: stream tests: Eliminate timestamps from output

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34224 ) Change subject: stream tests: Eliminate timestamps from output ...................................................................... stream tests: Eliminate timestamps from output Timestamps using override and osmo_gettimeofday() aren't guaranteed to be predictable anymore for whatever reason. This removes all timestamps from the test logs so checking against .err and .ok files doesn't fail due to different timestamps. Change-Id: I7faed932927d4f6e328a28c7f30a647a7272e89c --- M tests/stream/stream_test.c M tests/stream/stream_test.err M tests/stream/stream_test.ok 3 files changed, 140 insertions(+), 135 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/24/34224/1 diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index 20afc55..69f0450 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -63,9 +63,7 @@ /* client defs */ #define LOGCLI(cli, fmt, args...) do { \ - struct timeval tv; \ - osmo_gettimeofday(&tv, NULL); \ - printf("{%lu.%06lu} [%s] Client's %s(): " fmt, tv.tv_sec, tv.tv_usec, \ + printf("[%s] Client's %s(): " fmt, \ osmo_stream_cli_get_data(cli) ? "OK" : "NA", __func__, ##args); \ } while (0) @@ -240,9 +238,7 @@ printf("[%s] Server's %s(): " fmt, osmo_stream_srv_link_get_data(lnk) ? "OK" : "NA", __func__, ##args) #define LOGSRV(srv, fmt, args...) do { \ - struct timeval tv; \ - osmo_gettimeofday(&tv, NULL); \ - printf("{%lu.%06lu} [%s|%s] Server's %s(): " fmt, tv.tv_sec, tv.tv_usec, \ + printf("[%s|%s] Server's %s(): " fmt, \ osmo_stream_srv_get_data(srv) ? "OK" : "NA", \ osmo_stream_srv_link_get_data(osmo_stream_srv_get_master(srv)) ? "OK" : "NA", \ __func__, ##args); \ @@ -339,7 +335,6 @@ static void test_recon(void *ctx, const char *host, unsigned port, unsigned steps, struct osmo_stream_srv_link *lnk, bool autoreconnect) { - struct timeval tv; struct osmo_stream_cli *cli = make_client(ctx, host, port, autoreconnect); if (!cli) return; @@ -353,22 +348,20 @@ while(steps--) { osmo_gettimeofday_override_add(0, 1); /* small increment to easily spot iterations */ osmo_select_main(0); - osmo_gettimeofday(&tv, NULL); - fprintf(stderr, "\n{%lu.%06lu} %s test step %u [client %s, server %s], FD reg %u\n", - tv.tv_sec, tv.tv_usec, ASTR(autoreconnect), steps, + fprintf(stderr, "\n%s test step %u [client %s, server %s], FD reg %u\n", + ASTR(autoreconnect), steps, osmo_stream_cli_get_data(cli) ? "OK" : "NA", osmo_stream_srv_link_get_data(lnk) ? "OK" : "NA", osmo_fd_is_registered(osmo_stream_cli_get_ofd(cli))); if (test_stop_requested(lnk)) { - printf("{%lu.%06lu} Server requested test termination\n", - tv.tv_sec, tv.tv_usec); + printf("Server requested test termination\n"); steps = 0; } } osmo_stream_cli_destroy(cli); - printf("{%lu.%06lu} %s test complete.\n\n", tv.tv_sec, tv.tv_usec, ASTR(autoreconnect)); + printf("%s test complete.\n\n", ASTR(autoreconnect)); } /* Segmentation test code (using IPA) */ @@ -645,8 +638,6 @@ void *tall_test = talloc_named_const(NULL, 1, "osmo_stream_test"); osmo_gettimeofday_override = true; - osmo_gettimeofday_override_time.tv_sec = 2; - osmo_gettimeofday_override_time.tv_usec = 0; msgb_talloc_ctx_init(tall_test, 0); osmo_init_logging2(tall_test, &osmo_stream_test_log_info); diff --git a/tests/stream/stream_test.err b/tests/stream/stream_test.err index 03ce0cf..f920258 100644 --- a/tests/stream/stream_test.err +++ b/tests/stream/stream_test.err @@ -1,51 +1,51 @@ SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8976 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTING} connection established -{2.000001} autoreconnecting test step 11 [client NA, server OK], FD reg 1 +autoreconnecting test step 11 [client NA, server OK], FD reg 1 -{2.000002} autoreconnecting test step 10 [client NA, server OK], FD reg 1 +autoreconnecting test step 10 [client NA, server OK], FD reg 1 -{2.000003} autoreconnecting test step 9 [client NA, server OK], FD reg 1 +autoreconnecting test step 9 [client NA, server OK], FD reg 1 -{2.000004} autoreconnecting test step 8 [client NA, server OK], FD reg 1 +autoreconnecting test step 8 [client NA, server OK], FD reg 1 -{2.000005} autoreconnecting test step 7 [client OK, server OK], FD reg 1 +autoreconnecting test step 7 [client OK, server OK], FD reg 1 -{2.000006} autoreconnecting test step 6 [client OK, server OK], FD reg 1 +autoreconnecting test step 6 [client OK, server OK], FD reg 1 -{2.000007} autoreconnecting test step 5 [client OK, server OK], FD reg 1 +autoreconnecting test step 5 [client OK, server OK], FD reg 1 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connection closed with srv CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){WAIT_RECONNECT} retrying reconnect in 9 seconds... -{11.000008} autoreconnecting test step 4 [client OK, server OK], FD reg 0 +autoreconnecting test step 4 [client OK, server OK], FD reg 0 -{11.000009} autoreconnecting test step 3 [client OK, server OK], FD reg 1 +autoreconnecting test step 3 [client OK, server OK], FD reg 1 SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8976 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTING} connection established -{11.000010} autoreconnecting test step 2 [client OK, server OK], FD reg 0 +autoreconnecting test step 2 [client OK, server OK], FD reg 0 SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) connection closed with client -{11.000011} autoreconnecting test step 1 [client OK, server NA], FD reg 0 +autoreconnecting test step 1 [client OK, server NA], FD reg 0 SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8976 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTING} connection established -{11.000012} non-reconnecting test step 7 [client NA, server OK], FD reg 1 +non-reconnecting test step 7 [client NA, server OK], FD reg 1 -{11.000013} non-reconnecting test step 6 [client NA, server OK], FD reg 1 +non-reconnecting test step 6 [client NA, server OK], FD reg 1 -{11.000014} non-reconnecting test step 5 [client NA, server OK], FD reg 1 +non-reconnecting test step 5 [client NA, server OK], FD reg 1 -{11.000015} non-reconnecting test step 4 [client NA, server OK], FD reg 1 +non-reconnecting test step 4 [client NA, server OK], FD reg 1 -{11.000016} non-reconnecting test step 3 [client OK, server OK], FD reg 1 +non-reconnecting test step 3 [client OK, server OK], FD reg 1 -{11.000017} non-reconnecting test step 2 [client OK, server OK], FD reg 1 +non-reconnecting test step 2 [client OK, server OK], FD reg 1 -{11.000018} non-reconnecting test step 1 [client OK, server OK], FD reg 1 +non-reconnecting test step 1 [client OK, server OK], FD reg 1 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connection closed with srv CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CLOSED} not reconnecting, disabled -{20.000019} non-reconnecting test step 0 [client OK, server OK], FD reg 0 +non-reconnecting test step 0 [client OK, server OK], FD reg 0 SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8977 CLICONN(,r=127.0.0.11:1111<->l=127.0.0.1:8977){CONNECTING} connection established diff --git a/tests/stream/stream_test.ok b/tests/stream/stream_test.ok index f21b486..5322d93 100644 --- a/tests/stream/stream_test.ok +++ b/tests/stream/stream_test.ok @@ -3,118 +3,118 @@ ======================================= Client/Server entering autoreconnecting event loop... ======================================= -{2.000001} [NA] Client's connect_cb_cli(): callback triggered <initial> -{2.000001} [NA] Client's connect_cb_cli(): sent 29 bytes message: 48 69 21 20 66 72 6f 6d 20 63 6f 6e 6e 65 63 74 20 63 61 6c 6c 62 61 63 6b 20 3a 2d 50 -{2.000003} [NA|OK] Server's read_cb_srv(): callback triggered -{2.000003} [NA|OK] Server's read_cb_srv(): received 29(29) bytes: 48 69 21 20 66 72 6f 6d 20 63 6f 6e 6e 65 63 74 20 63 61 6c 6c 62 61 63 6b 20 3a 2d 50 -{2.000003} [NA|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 -{2.000003} [OK|OK] Server's read_cb_srv(): keep initial client connection -{2.000005} [NA] Client's read_cb_cli(): callback triggered -{2.000005} [NA] Client's read_cb_cli(): received 11(11) bytes: 72 65 61 64 5f 63 62 5f 73 72 76 -{2.000005} [NA] Client's read_cb_cli(): initial read, contacting server -{2.000005} [OK] Client's read_cb_cli(): sent 29 bytes message: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 -{2.000007} [OK|OK] Server's read_cb_srv(): callback triggered -{2.000007} [OK|OK] Server's read_cb_srv(): received 29(29) bytes: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 -{2.000007} [OK|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 -{2.000007} [OK|OK] Server's read_cb_srv(): force client disconnect on subsequent call -{2.000008} [OK] Client's read_cb_cli(): callback triggered -{2.000008} [OK] Client's read_cb_cli(): 0-byte read, auto-reconnect will be triggered if enabled -{11.000010} [OK] Client's connect_cb_cli(): callback triggered <reconnected> -{11.000010} [OK] Client's connect_cb_cli(): closing connection -{11.000011} [NA|OK] Server's read_cb_srv(): callback triggered -{11.000011} [NA|OK] Server's read_cb_srv(): client have already closed connection -{11.000011} Server requested test termination -{11.000011} autoreconnecting test complete. +[NA] Client's connect_cb_cli(): callback triggered <initial> +[NA] Client's connect_cb_cli(): sent 29 bytes message: 48 69 21 20 66 72 6f 6d 20 63 6f 6e 6e 65 63 74 20 63 61 6c 6c 62 61 63 6b 20 3a 2d 50 +[NA|OK] Server's read_cb_srv(): callback triggered +[NA|OK] Server's read_cb_srv(): received 29(29) bytes: 48 69 21 20 66 72 6f 6d 20 63 6f 6e 6e 65 63 74 20 63 61 6c 6c 62 61 63 6b 20 3a 2d 50 +[NA|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 +[OK|OK] Server's read_cb_srv(): keep initial client connection +[NA] Client's read_cb_cli(): callback triggered +[NA] Client's read_cb_cli(): received 11(11) bytes: 72 65 61 64 5f 63 62 5f 73 72 76 +[NA] Client's read_cb_cli(): initial read, contacting server +[OK] Client's read_cb_cli(): sent 29 bytes message: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 +[OK|OK] Server's read_cb_srv(): callback triggered +[OK|OK] Server's read_cb_srv(): received 29(29) bytes: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 +[OK|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 +[OK|OK] Server's read_cb_srv(): force client disconnect on subsequent call +[OK] Client's read_cb_cli(): callback triggered +[OK] Client's read_cb_cli(): 0-byte read, auto-reconnect will be triggered if enabled +[OK] Client's connect_cb_cli(): callback triggered <reconnected> +[OK] Client's connect_cb_cli(): closing connection +[NA|OK] Server's read_cb_srv(): callback triggered +[NA|OK] Server's read_cb_srv(): client have already closed connection +Server requested test termination +autoreconnecting test complete. Prepare non-reconnecting stream client... ======================================= Client/Server entering non-reconnecting event loop... ======================================= -{11.000012} [NA] Client's connect_cb_cli(): callback triggered <initial> -{11.000012} [NA] Client's connect_cb_cli(): sent 29 bytes message: 48 69 21 20 66 72 6f 6d 20 63 6f 6e 6e 65 63 74 20 63 61 6c 6c 62 61 63 6b 20 3a 2d 50 -{11.000014} [NA|OK] Server's read_cb_srv(): callback triggered -{11.000014} [NA|OK] Server's read_cb_srv(): received 29(29) bytes: 48 69 21 20 66 72 6f 6d 20 63 6f 6e 6e 65 63 74 20 63 61 6c 6c 62 61 63 6b 20 3a 2d 50 -{11.000014} [NA|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 -{11.000014} [OK|OK] Server's read_cb_srv(): keep initial client connection -{11.000016} [NA] Client's read_cb_cli(): callback triggered -{11.000016} [NA] Client's read_cb_cli(): received 11(11) bytes: 72 65 61 64 5f 63 62 5f 73 72 76 -{11.000016} [NA] Client's read_cb_cli(): initial read, contacting server -{11.000016} [OK] Client's read_cb_cli(): sent 29 bytes message: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 -{11.000018} [OK|OK] Server's read_cb_srv(): callback triggered -{11.000018} [OK|OK] Server's read_cb_srv(): received 29(29) bytes: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 -{11.000018} [OK|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 -{11.000018} [OK|OK] Server's read_cb_srv(): force client disconnect on subsequent call -{11.000019} [OK] Client's read_cb_cli(): callback triggered -{11.000019} [OK] Client's read_cb_cli(): 0-byte read, auto-reconnect will be triggered if enabled -{20.000019} non-reconnecting test complete. +[NA] Client's connect_cb_cli(): callback triggered <initial> +[NA] Client's connect_cb_cli(): sent 29 bytes message: 48 69 21 20 66 72 6f 6d 20 63 6f 6e 6e 65 63 74 20 63 61 6c 6c 62 61 63 6b 20 3a 2d 50 +[NA|OK] Server's read_cb_srv(): callback triggered +[NA|OK] Server's read_cb_srv(): received 29(29) bytes: 48 69 21 20 66 72 6f 6d 20 63 6f 6e 6e 65 63 74 20 63 61 6c 6c 62 61 63 6b 20 3a 2d 50 +[NA|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 +[OK|OK] Server's read_cb_srv(): keep initial client connection +[NA] Client's read_cb_cli(): callback triggered +[NA] Client's read_cb_cli(): received 11(11) bytes: 72 65 61 64 5f 63 62 5f 73 72 76 +[NA] Client's read_cb_cli(): initial read, contacting server +[OK] Client's read_cb_cli(): sent 29 bytes message: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 +[OK|OK] Server's read_cb_srv(): callback triggered +[OK|OK] Server's read_cb_srv(): received 29(29) bytes: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 +[OK|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 +[OK|OK] Server's read_cb_srv(): force client disconnect on subsequent call +[OK] Client's read_cb_cli(): callback triggered +[OK] Client's read_cb_cli(): 0-byte read, auto-reconnect will be triggered if enabled +non-reconnecting test complete. ______________________________________Running test test_segm_ipa_stream_srv______________________________________ -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): [1-cli] Appending msg of type IPAC_MSGT_PING into buffer -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (msg dump: 00 01 fe 00 ) -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): [2-cli] Appending msg of type IPAC_MSGT_PONG into buffer -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (msg dump: 00 01 fe 01 ) -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): [3-cli] Appending msg of type IPAC_MSGT_PING into buffer -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (msg dump: 00 01 fe 00 ) -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): [4-cli] Appending msg of type IPAC_MSGT_ID_RESP into buffer -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (msg dump: 00 07 fe 05 01 01 de ad be ef ) -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): [(04 + 1/3)-cli] Appending 1st third of msg of type IPAC_MSGT_ID_GET into buffer -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (dump: 00 03 ) -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): Sending 4 + 1/3 messages as one: -{20.000020} [OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (msg dump: 00 01 fe 00 00 01 fe 01 00 01 fe 00 00 07 fe 05 01 01 de ad be ef 00 03 ) +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): [1-cli] Appending msg of type IPAC_MSGT_PING into buffer +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (msg dump: 00 01 fe 00 ) +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): [2-cli] Appending msg of type IPAC_MSGT_PONG into buffer +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (msg dump: 00 01 fe 01 ) +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): [3-cli] Appending msg of type IPAC_MSGT_PING into buffer +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (msg dump: 00 01 fe 00 ) +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): [4-cli] Appending msg of type IPAC_MSGT_ID_RESP into buffer +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (msg dump: 00 07 fe 05 01 01 de ad be ef ) +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): [(04 + 1/3)-cli] Appending 1st third of msg of type IPAC_MSGT_ID_GET into buffer +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (dump: 00 03 ) +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): Sending 4 + 1/3 messages as one: +[OK] Client's test_segm_ipa_stream_srv_cli_connect_cb(): (msg dump: 00 01 fe 00 00 01 fe 01 00 01 fe 00 00 07 fe 05 01 01 de ad be ef 00 03 ) -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [1-srv] Received IPA message from stream (payload len = 1) -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 01 fe 00 -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 00 -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_PING -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 00 ) -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [2-srv] Received IPA message from stream (payload len = 1) -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 01 fe 01 -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 01 -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_PONG -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 01 ) -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [3-srv] Received IPA message from stream (payload len = 1) -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 01 fe 00 -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 00 -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_PING -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 00 ) -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [4-srv] Received IPA message from stream (payload len = 7) -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 07 fe 05 01 01 de ad be ef -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 05 01 01 de ad be ef -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_ID_RESP -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 07 fe 05 01 01 de ad be ef ) -{20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Send IPAC_MSGT_ID_GET to trigger client to send next third +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [1-srv] Received IPA message from stream (payload len = 1) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 01 fe 00 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 00 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_PING +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 00 ) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [2-srv] Received IPA message from stream (payload len = 1) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 01 fe 01 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 01 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_PONG +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 01 ) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [3-srv] Received IPA message from stream (payload len = 1) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 01 fe 00 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 00 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_PING +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 00 ) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [4-srv] Received IPA message from stream (payload len = 7) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 07 fe 05 01 01 de ad be ef +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 05 01 01 de ad be ef +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_ID_RESP +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 07 fe 05 01 01 de ad be ef ) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Send IPAC_MSGT_ID_GET to trigger client to send next third -{20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Received message from stream (total len = 6) -{20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Type: IPAC_MSGT_ID_GET -{20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Got IPAC_MSGT_ID_GET from server -{20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): [(4 + 2/3) -cli] Appending: Second third of IPAC_MSGT_ID_GET -{20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Sending: Second third of IPAC_MSGT_ID_GET -{20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): (msg dump: fe 04 ) +[OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Received message from stream (total len = 6) +[OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Type: IPAC_MSGT_ID_GET +[OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Got IPAC_MSGT_ID_GET from server +[OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): [(4 + 2/3) -cli] Appending: Second third of IPAC_MSGT_ID_GET +[OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Sending: Second third of IPAC_MSGT_ID_GET +[OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): (msg dump: fe 04 ) -{20.500024} [OK] Client's send_last_third(): Delay for sending last third of message is over -{20.500024} [OK] Client's send_last_third(): [5-cli] Appending: Last third of IPAC_MSGT_ID_GET -{20.500024} [OK] Client's send_last_third(): [6-cli] Appending msg of type IPAC_MSGT_PONG into buffer -{20.500024} [OK] Client's send_last_third(): (msg dump: 00 01 fe 01 ) -{20.500024} [OK] Client's send_last_third(): [7-cli] Appending msg of type IPAC_MSGT_PONG into buffer -{20.500024} [OK] Client's send_last_third(): (msg dump: 00 01 fe 01 ) -{20.500024} [OK] Client's send_last_third(): Sending:[ Last third of IPAC_MSGT_ID_GET | IPAC_MSGT_PONG | IPAC_MSGT_PONG ] -{20.500024} [OK] Client's send_last_third(): (msg dump: 01 01 00 01 fe 01 00 01 fe 01 ) +[OK] Client's send_last_third(): Delay for sending last third of message is over +[OK] Client's send_last_third(): [5-cli] Appending: Last third of IPAC_MSGT_ID_GET +[OK] Client's send_last_third(): [6-cli] Appending msg of type IPAC_MSGT_PONG into buffer +[OK] Client's send_last_third(): (msg dump: 00 01 fe 01 ) +[OK] Client's send_last_third(): [7-cli] Appending msg of type IPAC_MSGT_PONG into buffer +[OK] Client's send_last_third(): (msg dump: 00 01 fe 01 ) +[OK] Client's send_last_third(): Sending:[ Last third of IPAC_MSGT_ID_GET | IPAC_MSGT_PONG | IPAC_MSGT_PONG ] +[OK] Client's send_last_third(): (msg dump: 01 01 00 01 fe 01 00 01 fe 01 ) -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [5-srv] Received IPA message from stream (payload len = 3) -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 03 fe 04 01 01 -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 04 01 01 -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_ID_GET -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 03 fe 04 01 01 ) -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [6-srv] Received IPA message from stream (payload len = 1) -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 01 fe 01 -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 01 -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_PONG -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 01 ) -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [7-srv] Received IPA message from stream (payload len = 1) -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 01 fe 01 -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 01 -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_PONG -{20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 01 ) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [5-srv] Received IPA message from stream (payload len = 3) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 03 fe 04 01 01 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 04 01 01 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_ID_GET +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 03 fe 04 01 01 ) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [6-srv] Received IPA message from stream (payload len = 1) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 01 fe 01 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 01 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_PONG +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 01 ) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): [7-srv] Received IPA message from stream (payload len = 1) +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): msg buff data (including stripped headers): 00 01 fe 01 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): IPA payload: 01 +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Type: IPAC_MSGT_PONG +[NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 01 ) ==================================Test test_segm_ipa_stream_srv complete======================================== Stream tests completed -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7faed932927d4f6e328a28c7f30a647a7272e89c Gerrit-Change-Number: 34224 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: osmo_ortp: register a PayloadType for RTP_PT_CSDATA

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/34223 ) Change subject: osmo_ortp: register a PayloadType for RTP_PT_CSDATA ...................................................................... osmo_ortp: register a PayloadType for RTP_PT_CSDATA Add a PayloadType definition for payload type 120 as per RFC 4040. Change-Id: I48e91d2c4e9124ee1b7eb88e26af24603aa69f25 Related: OS#1572 --- M src/trau/osmo_ortp.c 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/23/34223/1 diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index b681888..015ac34 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -39,6 +39,7 @@ #include "config.h" +static PayloadType *payload_type_clearmode; static PayloadType *payload_type_efr; static PayloadType *payload_type_hr; static RtpProfile *osmo_pt_profile; @@ -266,6 +267,16 @@ { PayloadType *pt; + /* CLEARMODE as per RFC 4040 (chapter 3) */ + pt = payload_type_new(); + pt->type = PAYLOAD_OTHER; + pt->clock_rate = 8000; + pt->bits_per_sample = 8; + pt->mime_type = "CLEARMODE"; + pt->normal_bitrate = 64000; + pt->channels = 1; + payload_type_clearmode = pt; + /* EFR */ pt = payload_type_new(); pt->type = PAYLOAD_AUDIO_PACKETIZED; @@ -290,6 +301,7 @@ /* add the GSM specific payload types. They are all dynamically * assigned, but in the Osmocom GSM system we have allocated * them as follows: */ + rtp_profile_set_payload(osmo_pt_profile, RTP_PT_CSDATA, payload_type_clearmode); rtp_profile_set_payload(osmo_pt_profile, RTP_PT_GSM_EFR, payload_type_efr); rtp_profile_set_payload(osmo_pt_profile, RTP_PT_GSM_HALF, payload_type_hr); rtp_profile_set_payload(osmo_pt_profile, RTP_PT_AMR, &payload_type_amr); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/34223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I48e91d2c4e9124ee1b7eb88e26af24603aa69f25 Gerrit-Change-Number: 34223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 1 week

1
0
0 0

[XL] Change in osmo-tetra[master]: add the gnuradio 3.10 demodulator and receiver from telive

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34222 ) Change subject: add the gnuradio 3.10 demodulator and receiver from telive ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I81f20fa115822b3ad642b638f6414d8249a8ac6a Gerrit-Change-Number: 34222 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 27 Aug 2023 19:57:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[XL] Change in osmo-tetra[master]: add the gnuradio 3.10 demodulator and receiver from telive

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/34222 to look at the new patch set (#2). Change subject: add the gnuradio 3.10 demodulator and receiver from telive ...................................................................... add the gnuradio 3.10 demodulator and receiver from telive Change-Id: I81f20fa115822b3ad642b638f6414d8249a8ac6a --- A src/demod/simdemod3.grc A src/demod/simdemod3.py A src/demod/telive_1ch_simple_gr310_udp.grc A src/demod/telive_1ch_simple_gr310_udp.py A src/receiver1udp 5 files changed, 2,115 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/22/34222/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I81f20fa115822b3ad642b638f6414d8249a8ac6a Gerrit-Change-Number: 34222 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

9 months, 1 week

1
0
0 0

[XL] Change in osmo-tetra[master]: add the gnuradio 3.10 demodulator and receiver from telive

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34222 ) Change subject: add the gnuradio 3.10 demodulator and receiver from telive ...................................................................... Patch Set 1: (10 comments) File src/demod/simdemod3.grc: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10691): https://gerrit.osmocom.org/c/osmo-tetra/+/34222/comment/907f8b95_ff04ed2c PS1, Line 13: (this option is disabled for the version commited to osmo-tetra) 'commited' may be misspelled - perhaps 'committed'? File src/demod/simdemod3.py: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10691): https://gerrit.osmocom.org/c/osmo-tetra/+/34222/comment/bc3cb04f_510d8d85 PS1, Line 10: # Description: cqpsk demodulator for tetra. based on pi4dqpsk_rx.grc (by 'Luca Bortolotti' @optiluca) from https://gitlab.com/larryth/tetra-kit/ . It is meant as a replacement for simdemod2.py, taked the data from stdin, and dumpd demodulated data to STDOUT. Also sends via UDP the information how much the signal is mistuned (this option is disabled for the version commited to osmo-tetra) 'commited' may be misspelled - perhaps 'committed'? File src/receiver1udp: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10691): https://gerrit.osmocom.org/c/osmo-tetra/+/34222/comment/0d913b28_c483dfff PS1, Line 5: # This is an example how to get I/Q data via udp packets, trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10691): https://gerrit.osmocom.org/c/osmo-tetra/+/34222/comment/5898f9b6_99003535 PS1, Line 32: 3.6) trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10691): https://gerrit.osmocom.org/c/osmo-tetra/+/34222/comment/38e0c874_bd7b80b6 PS1, Line 36: 3.7) trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10691): https://gerrit.osmocom.org/c/osmo-tetra/+/34222/comment/b3090d65_41bbd6b9 PS1, Line 40: 3.10) trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10691): https://gerrit.osmocom.org/c/osmo-tetra/+/34222/comment/6ff7624f_4d027df3 PS1, Line 44: *) trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10691): https://gerrit.osmocom.org/c/osmo-tetra/+/34222/comment/ce071c39_1bb3d4c7 PS1, Line 45: echo "Unsuported gnuradio version $GR_VERSION" 'Unsuported' may be misspelled - perhaps 'Unsupported'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10691): https://gerrit.osmocom.org/c/osmo-tetra/+/34222/comment/6e7e8094_5c879547 PS1, Line 62: socat -b 4096 UDP-RECV:${UDP_PORT} STDOUT | demod/simdemod2.py -o /dev/stdout -i /dev/stdin | ./float_to_bits -a /dev/stdin /dev/stdout | ./tetra-rx /dev/stdin trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10691): https://gerrit.osmocom.org/c/osmo-tetra/+/34222/comment/e9bce98e_033b7e02 PS1, Line 68: echo "Dont know how to handle pythin version [$PYT]" trailing whitespace -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I81f20fa115822b3ad642b638f6414d8249a8ac6a Gerrit-Change-Number: 34222 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 27 Aug 2023 19:51:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[XL] Change in osmo-tetra[master]: add the gnuradio 3.10 demodulator and receiver from telive

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34222 ) Change subject: add the gnuradio 3.10 demodulator and receiver from telive ...................................................................... add the gnuradio 3.10 demodulator and receiver from telive Change-Id: I81f20fa115822b3ad642b638f6414d8249a8ac6a --- A src/demod/simdemod3.grc A src/demod/simdemod3.py A src/demod/telive_1ch_simple_gr310_udp.grc A src/demod/telive_1ch_simple_gr310_udp.py A src/receiver1udp 5 files changed, 2,115 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/22/34222/1 diff --git a/src/demod/simdemod3.grc b/src/demod/simdemod3.grc new file mode 100644 index 0000000..b5e7b73 --- /dev/null +++ b/src/demod/simdemod3.grc @@ -0,0 +1,498 @@ +options: + parameters: + author: Jacek Lipkowski SQ5BPF + catch_exceptions: 'True' + category: '[GRC Hier Blocks]' + cmake_opt: '' + comment: '' + copyright: '' + description: cqpsk demodulator for tetra. based on pi4dqpsk_rx.grc (by 'Luca + Bortolotti' @optiluca) from https://gitlab.com/larryth/tetra-kit/ . It is meant + as a replacement for simdemod2.py, taked the data from stdin, and dumpd demodulated + data to STDOUT. Also sends via UDP the information how much the signal is mistuned + (this option is disabled for the version commited to osmo-tetra) + gen_cmake: 'On' + gen_linking: dynamic + generate_options: no_gui + hier_block_src_path: '.:' + id: simdemod3 + max_nouts: '0' + output_language: python + placement: (0,0) + qt_qss_theme: '' + realtime_scheduling: '' + run: 'True' + run_command: '{python} -u {filename}' + run_options: run + sizing_mode: fixed + thread_safe_setters: '' + title: DQPSK demodulator for Telive, with the AFC packet sending option disabled + window_size: (1000,1000) + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [8, 8] + rotation: 0 + state: enabled + +blocks: +- name: TETRA_HACK_IP + id: variable + parameters: + comment: '' + value: os.getenv('TETRA_HACK_IP') if os.getenv('TETRA_HACK_IP') else "127.0.0.1" + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [304, 92.0] + rotation: 0 + state: disabled +- name: TETRA_HACK_PORT + id: variable + parameters: + comment: '' + value: int(os.getenv('TETRA_HACK_PORT')) if os.getenv('TETRA_HACK_PORT') else + 7379 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [416, 92.0] + rotation: 0 + state: disabled +- name: TETRA_HACK_RXID + id: variable + parameters: + comment: '' + value: int(os.getenv('TETRA_HACK_RXID')) if os.getenv('TETRA_HACK_RXID') else + 0 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [176, 92.0] + rotation: 0 + state: disabled +- name: arity + id: variable + parameters: + comment: '' + value: '4' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [560, 12] + rotation: 0 + state: enabled +- name: channel_rate + id: variable + parameters: + comment: '' + value: '36000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [288, 12] + rotation: 0 + state: enabled +- name: constel + id: variable_constellation + parameters: + comment: '' + const_points: '[1-1j, 1+1j, -1-1j, 1-1j]' + dims: '1' + normalization: digital.constellation.AMPLITUDE_NORMALIZATION + precision: '8' + rot_sym: '4' + soft_dec_lut: '''auto''' + sym_map: '[0, 1, 3, 2]' + type: dqpsk + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [768, 452.0] + rotation: 0 + state: enabled +- name: decim + id: variable + parameters: + comment: '' + value: '32' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [808, 12] + rotation: 0 + state: enabled +- name: nfilts + id: variable + parameters: + comment: '' + value: '32' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [400, 12] + rotation: 0 + state: enabled +- name: rrc_taps + id: variable + parameters: + comment: '' + value: firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), 0.35, 11*sps*nfilts) + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [640, 12] + rotation: 0 + state: enabled +- name: samp_rate + id: variable + parameters: + comment: '' + value: '2000000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [184, 12] + rotation: 0 + state: enabled +- name: sps + id: variable + parameters: + comment: '' + value: '2' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [480, 12] + rotation: 0 + state: enabled +- name: variable_adaptive_algorithm_0 + id: variable_adaptive_algorithm + parameters: + comment: '' + cons: constel + delta: '10.0' + ffactor: '0.99' + modulus: '1' + step_size: 10e-3 + type: cma + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [904, 444.0] + rotation: 0 + state: true +- name: Author_note + id: note + parameters: + alias: '' + comment: '' + note: 'This is originally part of the telive software: https://github.com/sq5bpf/telive ' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [8, 156.0] + rotation: 0 + state: true +- name: analog_feedforward_agc_cc_0 + id: analog_feedforward_agc_cc + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + num_samples: '8' + reference: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [312, 220.0] + rotation: 0 + state: enabled +- name: blocks_file_descriptor_source_0 + id: blocks_file_descriptor_source + parameters: + affinity: '' + alias: '' + comment: '' + fd: '0' + maxoutbuf: '0' + minoutbuf: '0' + repeat: 'False' + type: complex + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [112, 220.0] + rotation: 0 + state: true +- name: blocks_null_sink_0 + id: blocks_null_sink + parameters: + affinity: '' + alias: '' + bus_structure_sink: '[[0,],]' + comment: '' + num_inputs: '3' + type: float + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [800, 224.0] + rotation: 0 + state: true +- name: blocks_unpack_k_bits_bb_0 + id: blocks_unpack_k_bits_bb + parameters: + affinity: '' + alias: '' + comment: '' + k: constel.bits_per_symbol() + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [752, 564.0] + rotation: 0 + state: enabled +- name: digital_constellation_decoder_cb_0 + id: digital_constellation_decoder_cb + parameters: + affinity: '' + alias: '' + comment: '' + constellation: constel + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [576, 452.0] + rotation: 0 + state: enabled +- name: digital_diff_phasor_cc_0 + id: digital_diff_phasor_cc + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [624, 356.0] + rotation: 0 + state: enabled +- name: digital_fll_band_edge_cc_0 + id: digital_fll_band_edge_cc + parameters: + affinity: '' + alias: '' + comment: '' + filter_size: '45' + maxoutbuf: '0' + minoutbuf: '0' + rolloff: '0.35' + samps_per_sym: sps + type: cc + w: cmath.pi/100.0 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [544, 192.0] + rotation: 0 + state: enabled +- name: digital_linear_equalizer_0 + id: digital_linear_equalizer + parameters: + adapt_after_training: 'True' + affinity: '' + alg: variable_adaptive_algorithm_0 + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + num_taps: '15' + sps: sps + training_sequence: '[ ]' + training_start_tag: corr_est + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [368, 360.0] + rotation: 0 + state: true +- name: digital_map_bb_0 + id: digital_map_bb + parameters: + affinity: '' + alias: '' + comment: '' + map: constel.pre_diff_code() + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [576, 564.0] + rotation: 0 + state: enabled +- name: digital_pfb_clock_sync_xxx_0 + id: digital_pfb_clock_sync_xxx + parameters: + affinity: '' + alias: '' + comment: '' + filter_size: nfilts + init_phase: nfilts/2 + loop_bw: 2*cmath.pi/100.0 + max_dev: '1.5' + maxoutbuf: '0' + minoutbuf: '0' + osps: sps + sps: sps + taps: rrc_taps + type: ccf + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [128, 344.0] + rotation: 0 + state: enabled +- name: import_0 + id: import + parameters: + alias: '' + comment: '' + imports: import cmath + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [944, 12.0] + rotation: 0 + state: enabled +- name: import_1 + id: import + parameters: + alias: '' + comment: '' + imports: import os + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1040, 12.0] + rotation: 0 + state: true +- name: send_udp_to_telive + id: epy_block + parameters: + _source_code: "\"\"\"\nEmbedded Python Blocks:\n\nEach time this file is saved,\ + \ GRC will instantiate the first class it finds\nto get ports and parameters\ + \ of your block. The arguments to __init__ will\nbe the parameters. All of\ + \ them are required to have default values!\n\"\"\"\n\nimport numpy as np\n\ + from gnuradio import gr\nimport socket\n\nclass blk(gr.sync_block): # other\ + \ base classes are basic_block, decim_block, interp_block\n \"\"\"Embedded\ + \ Python Block - periodically send UDP packet to telive\"\"\"\n\n def __init__(self,\ + \ ntimes=10, rxid=0, port=7379, ip=\"127.0.0.1\",scaling=10): # only default\ + \ arguments here\n \"\"\"arguments to this function show up as parameters\ + \ in GRC\"\"\"\n gr.sync_block.__init__(\n self,\n \ + \ name='Send UDP messages to telive', # will show up in GRC\n \ + \ in_sig=[np.float32],\n out_sig=None\n )\n # if\ + \ an attribute with the same name as a parameter is found,\n # a callback\ + \ is registered (properties work, too).\n self.sock = socket.socket(socket.AF_INET,socket.SOCK_DGRAM)\n\ + \ self.counter=0\n self.ntimes=ntimes\n self.tetra_hack_rxid=int(rxid)\n\ + \ self.tetra_hack_ip=str(ip)\n self.tetra_hack_port=int(port)\n\ + \ self.tetra_hack_scaling=scaling\n \n \n\n def work(self,\ + \ input_items, output_items):\n \"\"\"example: multiply with constant\"\ + \"\"\n self.counter=(self.counter+1)%self.ntimes\n if self.counter==0:\n\ + \ mmm=\"TETMON_begin FUNC:AFCVAL AFC:%i RX:%i TETMON_end\" % ( int\ + \ (input_items[0][0] * self.tetra_hack_scaling * - 1.0), self.tetra_hack_rxid)\n\ + \ message=bytes(mmm, \"utf-8\")\n self.sock.sendto(message,\ + \ (self.tetra_hack_ip, self.tetra_hack_port))\n return len(input_items\ + \ [0])\n" + affinity: '' + alias: '' + comment: '' + ip: TETRA_HACK_IP + maxoutbuf: '0' + minoutbuf: '0' + ntimes: '5' + port: TETRA_HACK_PORT + rxid: TETRA_HACK_RXID + scaling: '100' + states: + _io_cache: ('Send UDP messages to telive', 'blk', [('ntimes', '10'), ('rxid', + '0'), ('port', '7379'), ('ip', "'127.0.0.1'"), ('scaling', '10')], [('0', 'float', + 1)], [], 'Embedded Python Block - periodically send UDP packet to telive', ['ntimes']) + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [960, 140.0] + rotation: 0 + state: disabled +- name: stdout_sink + id: blocks_file_descriptor_sink + parameters: + affinity: '' + alias: '' + comment: '' + fd: '1' + type: byte + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [960, 564.0] + rotation: 0 + state: true + +connections: +- [analog_feedforward_agc_cc_0, '0', digital_fll_band_edge_cc_0, '0'] +- [blocks_file_descriptor_source_0, '0', analog_feedforward_agc_cc_0, '0'] +- [blocks_unpack_k_bits_bb_0, '0', stdout_sink, '0'] +- [digital_constellation_decoder_cb_0, '0', digital_map_bb_0, '0'] +- [digital_diff_phasor_cc_0, '0', digital_constellation_decoder_cb_0, '0'] +- [digital_fll_band_edge_cc_0, '0', digital_pfb_clock_sync_xxx_0, '0'] +- [digital_fll_band_edge_cc_0, '1', blocks_null_sink_0, '0'] +- [digital_fll_band_edge_cc_0, '1', send_udp_to_telive, '0'] +- [digital_fll_band_edge_cc_0, '2', blocks_null_sink_0, '1'] +- [digital_fll_band_edge_cc_0, '3', blocks_null_sink_0, '2'] +- [digital_linear_equalizer_0, '0', digital_diff_phasor_cc_0, '0'] +- [digital_map_bb_0, '0', blocks_unpack_k_bits_bb_0, '0'] +- [digital_pfb_clock_sync_xxx_0, '0', digital_linear_equalizer_0, '0'] + +metadata: + file_format: 1 + grc_version: 3.10.5.1 diff --git a/src/demod/simdemod3.py b/src/demod/simdemod3.py new file mode 100755 index 0000000..dd3261a --- /dev/null +++ b/src/demod/simdemod3.py @@ -0,0 +1,161 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# +# SPDX-License-Identifier: GPL-3.0 +# +# GNU Radio Python Flow Graph +# Title: DQPSK demodulator for Telive, with the AFC packet sending option disabled +# Author: Jacek Lipkowski SQ5BPF +# Description: cqpsk demodulator for tetra. based on pi4dqpsk_rx.grc (by 'Luca Bortolotti' @optiluca) from https://gitlab.com/larryth/tetra-kit/ . It is meant as a replacement for simdemod2.py, taked the data from stdin, and dumpd demodulated data to STDOUT. Also sends via UDP the information how much the signal is mistuned (this option is disabled for the version commited to osmo-tetra) +# GNU Radio version: 3.10.5.1 + +from gnuradio import analog +from gnuradio import blocks +from gnuradio import digital +from gnuradio import gr +from gnuradio.filter import firdes +from gnuradio.fft import window +import sys +import signal +from argparse import ArgumentParser +from gnuradio.eng_arg import eng_float, intx +from gnuradio import eng_notation +import cmath +import os + + + + +class simdemod3(gr.top_block): + + def __init__(self): + gr.top_block.__init__(self, "DQPSK demodulator for Telive, with the AFC packet sending option disabled", catch_exceptions=True) + + ################################################## + # Variables + ################################################## + self.sps = sps = 2 + self.nfilts = nfilts = 32 + self.constel = constel = digital.constellation_dqpsk().base() + self.constel.gen_soft_dec_lut(8) + self.variable_adaptive_algorithm_0 = variable_adaptive_algorithm_0 = digital.adaptive_algorithm_cma( constel, 10e-3, 1).base() + self.samp_rate = samp_rate = 2000000 + self.rrc_taps = rrc_taps = firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), 0.35, 11*sps*nfilts) + self.decim = decim = 32 + self.channel_rate = channel_rate = 36000 + self.arity = arity = 4 + + ################################################## + # Blocks + ################################################## + + self.stdout_sink = blocks.file_descriptor_sink(gr.sizeof_char*1, 1) + self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, (2*cmath.pi/100.0), rrc_taps, nfilts, (nfilts/2), 1.5, sps) + self.digital_map_bb_0 = digital.map_bb(constel.pre_diff_code()) + self.digital_linear_equalizer_0 = digital.linear_equalizer(15, sps, variable_adaptive_algorithm_0, True, [ ], 'corr_est') + self.digital_fll_band_edge_cc_0 = digital.fll_band_edge_cc(sps, 0.35, 45, (cmath.pi/100.0)) + self.digital_diff_phasor_cc_0 = digital.diff_phasor_cc() + self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(constel) + self.blocks_unpack_k_bits_bb_0 = blocks.unpack_k_bits_bb(constel.bits_per_symbol()) + self.blocks_null_sink_0 = blocks.null_sink(gr.sizeof_float*1) + self.blocks_file_descriptor_source_0 = blocks.file_descriptor_source(gr.sizeof_gr_complex*1, 0, False) + self.analog_feedforward_agc_cc_0 = analog.feedforward_agc_cc(8, 1) + + + ################################################## + # Connections + ################################################## + self.connect((self.analog_feedforward_agc_cc_0, 0), (self.digital_fll_band_edge_cc_0, 0)) + self.connect((self.blocks_file_descriptor_source_0, 0), (self.analog_feedforward_agc_cc_0, 0)) + self.connect((self.blocks_unpack_k_bits_bb_0, 0), (self.stdout_sink, 0)) + self.connect((self.digital_constellation_decoder_cb_0, 0), (self.digital_map_bb_0, 0)) + self.connect((self.digital_diff_phasor_cc_0, 0), (self.digital_constellation_decoder_cb_0, 0)) + self.connect((self.digital_fll_band_edge_cc_0, 2), (self.blocks_null_sink_0, 1)) + self.connect((self.digital_fll_band_edge_cc_0, 3), (self.blocks_null_sink_0, 2)) + self.connect((self.digital_fll_band_edge_cc_0, 1), (self.blocks_null_sink_0, 0)) + self.connect((self.digital_fll_band_edge_cc_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) + self.connect((self.digital_linear_equalizer_0, 0), (self.digital_diff_phasor_cc_0, 0)) + self.connect((self.digital_map_bb_0, 0), (self.blocks_unpack_k_bits_bb_0, 0)) + self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.digital_linear_equalizer_0, 0)) + + + def get_sps(self): + return self.sps + + def set_sps(self, sps): + self.sps = sps + self.set_rrc_taps(firdes.root_raised_cosine(self.nfilts, self.nfilts, 1.0/float(self.sps), 0.35, 11*self.sps*self.nfilts)) + + def get_nfilts(self): + return self.nfilts + + def set_nfilts(self, nfilts): + self.nfilts = nfilts + self.set_rrc_taps(firdes.root_raised_cosine(self.nfilts, self.nfilts, 1.0/float(self.sps), 0.35, 11*self.sps*self.nfilts)) + + def get_constel(self): + return self.constel + + def set_constel(self, constel): + self.constel = constel + + def get_variable_adaptive_algorithm_0(self): + return self.variable_adaptive_algorithm_0 + + def set_variable_adaptive_algorithm_0(self, variable_adaptive_algorithm_0): + self.variable_adaptive_algorithm_0 = variable_adaptive_algorithm_0 + + def get_samp_rate(self): + return self.samp_rate + + def set_samp_rate(self, samp_rate): + self.samp_rate = samp_rate + + def get_rrc_taps(self): + return self.rrc_taps + + def set_rrc_taps(self, rrc_taps): + self.rrc_taps = rrc_taps + self.digital_pfb_clock_sync_xxx_0.update_taps(self.rrc_taps) + + def get_decim(self): + return self.decim + + def set_decim(self, decim): + self.decim = decim + + def get_channel_rate(self): + return self.channel_rate + + def set_channel_rate(self, channel_rate): + self.channel_rate = channel_rate + + def get_arity(self): + return self.arity + + def set_arity(self, arity): + self.arity = arity + + + + +def main(top_block_cls=simdemod3, options=None): + tb = top_block_cls() + + def sig_handler(sig=None, frame=None): + tb.stop() + tb.wait() + + sys.exit(0) + + signal.signal(signal.SIGINT, sig_handler) + signal.signal(signal.SIGTERM, sig_handler) + + tb.start() + + tb.wait() + + +if __name__ == '__main__': + main() diff --git a/src/demod/telive_1ch_simple_gr310_udp.grc b/src/demod/telive_1ch_simple_gr310_udp.grc new file mode 100644 index 0000000..00a1130 --- /dev/null +++ b/src/demod/telive_1ch_simple_gr310_udp.grc @@ -0,0 +1,936 @@ +options: + parameters: + author: Jacek Lipkowski SQ5BPF + catch_exceptions: 'True' + category: Custom + cmake_opt: '' + comment: '' + copyright: '' + description: This is a receiver flowgraph, uses a rtl-sdr dongle, and outputs + a downsampled stream to 127.0.0.1 42001/udp. This can be used with telive, or + just osmo-tetra + gen_cmake: 'On' + gen_linking: dynamic + generate_options: qt_gui + hier_block_src_path: '.:' + id: telive_1ch_simple_gr310_udp + max_nouts: '0' + output_language: python + placement: (0,0) + qt_qss_theme: '' + realtime_scheduling: '' + run: 'True' + run_command: '{python} -u {filename}' + run_options: prompt + sizing_mode: fixed + thread_safe_setters: '' + title: SQ5BPF Tetra live receiver 1ch simple UDP demo with fixed offset (gnuradio + 3.10 version) xmlrpc + window_size: 2048, 2048 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [10, 10] + rotation: 0 + state: enabled + +blocks: +- name: first_decim + id: variable + parameters: + comment: '' + value: '32' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [547, 15] + rotation: 0 + state: enabled +- name: first_port + id: variable + parameters: + comment: '' + value: '42000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1080, 85] + rotation: 0 + state: enabled +- name: freq + id: variable_qtgui_entry + parameters: + comment: '' + gui_hint: 0,0,1,2 + label: Frequency + type: real + value: 438.0125e6 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [40, 404.0] + rotation: 0 + state: true +- name: if_samp_rate + id: variable + parameters: + comment: '' + value: samp_rate/first_decim + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [315, 18] + rotation: 0 + state: enabled +- name: options_low_pass + id: variable + parameters: + comment: '' + value: '12500' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [654, 18] + rotation: 0 + state: enabled +- name: out_sample_rate + id: variable + parameters: + comment: '' + value: '36000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [419, 18] + rotation: 0 + state: enabled +- name: ppm_corr + id: variable_qtgui_range + parameters: + comment: '' + gui_hint: 0,5,1,3 + label: ppm + min_len: '200' + orient: QtCore.Qt.Horizontal + rangeType: float + start: '-100' + step: '0.5' + stop: '100' + value: '0' + widget: counter_slider + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [360, 420.0] + rotation: 0 + state: true +- name: samp_rate + id: variable + parameters: + comment: '' + value: '2000000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [223, 19] + rotation: 0 + state: enabled +- name: sdr_gain + id: variable_qtgui_range + parameters: + comment: '' + gui_hint: 0,8,1,2 + label: gain + min_len: '200' + orient: QtCore.Qt.Horizontal + rangeType: int + start: '0' + step: '1' + stop: '50' + value: '30' + widget: counter_slider + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [448, 420.0] + rotation: 0 + state: true +- name: sdr_ifgain + id: variable + parameters: + comment: '' + value: '20' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [56, 628.0] + rotation: 0 + state: enabled +- name: telive_receiver_channels + id: variable + parameters: + comment: '' + value: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1160, 396.0] + rotation: 0 + state: enabled +- name: telive_receiver_name + id: variable + parameters: + comment: '' + value: '''SQ5BPF 1-channel rx for telive''' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1192, 332.0] + rotation: 0 + state: enabled +- name: udp_dest_addr + id: variable + parameters: + comment: '' + value: '"127.0.0.1"' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1056, 157] + rotation: 0 + state: enabled +- name: udp_packet_size + id: variable + parameters: + comment: '' + value: '1472' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1072, 229] + rotation: 0 + state: enabled +- name: variable_qtgui_label_0_0 + id: variable_qtgui_label + parameters: + comment: '' + formatter: 'lambda x: f''{x/1000000:.4f} MHz''' + gui_hint: '' + label: 'Receive frequency: ' + type: real + value: freq+xlate_offset_fine1 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [176, 636.0] + rotation: 0 + state: true +- name: xlate_offset1 + id: variable + parameters: + comment: '' + value: '500000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [464, 652.0] + rotation: 0 + state: enabled +- name: xlate_offset_fine1 + id: variable_qtgui_range + parameters: + comment: '' + gui_hint: 0,2,1,3 + label: Fine tune1 + min_len: '200' + orient: QtCore.Qt.Horizontal + rangeType: float + start: -5e3 + step: '1' + stop: +5e3 + value: '0' + widget: counter_slider + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [168, 404.0] + rotation: 0 + state: true +- name: analog_agc3_xx_0 + id: analog_agc3_xx + parameters: + affinity: '' + alias: '' + attack_rate: 1e-3 + comment: '' + decay_rate: 1e-4 + gain: '1.0' + iir_update_decim: '1' + max_gain: '65536' + maxoutbuf: '0' + minoutbuf: '0' + reference: '1.0' + type: complex + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [568, 392.0] + rotation: 0 + state: enabled +- name: freq_xlating_fir_filter_xxx_0 + id: freq_xlating_fir_filter_xxx + parameters: + affinity: '' + alias: '' + center_freq: xlate_offset1+xlate_offset_fine1 + comment: '' + decim: first_decim + maxoutbuf: '0' + minoutbuf: '0' + samp_rate: samp_rate + taps: firdes.low_pass(1, samp_rate, options_low_pass, options_low_pass*0.2) + type: ccc + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [520, 95] + rotation: 0 + state: enabled +- name: mmse_resampler_xx_0 + id: mmse_resampler_xx + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + phase_shift: '0' + resamp_ratio: float(float(if_samp_rate)/float(out_sample_rate)) + type: complex + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [760, 440.0] + rotation: 0 + state: true +- name: network_udp_sink_0 + id: network_udp_sink + parameters: + addr: udp_dest_addr + affinity: '' + alias: '' + comment: '' + header: '0' + payloadsize: udp_packet_size + port: first_port+1 + send_eof: 'False' + type: complex + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [952, 428.0] + rotation: 0 + state: true +- name: note_0 + id: note + parameters: + alias: '' + comment: '' + note: 'The xmlrpc server is disabled, so that it doesn''t confuse anyone. You + can enable it when gnuradio bug #6766 is fixed' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [896, 20.0] + rotation: 0 + state: true +- name: osmosdr_source_0 + id: osmosdr_source + parameters: + affinity: '' + alias: '' + ant0: '' + ant1: '' + ant10: '' + ant11: '' + ant12: '' + ant13: '' + ant14: '' + ant15: '' + ant16: '' + ant17: '' + ant18: '' + ant19: '' + ant2: '' + ant20: '' + ant21: '' + ant22: '' + ant23: '' + ant24: '' + ant25: '' + ant26: '' + ant27: '' + ant28: '' + ant29: '' + ant3: '' + ant30: '' + ant31: '' + ant4: '' + ant5: '' + ant6: '' + ant7: '' + ant8: '' + ant9: '' + args: '' + bb_gain0: '20' + bb_gain1: '20' + bb_gain10: '20' + bb_gain11: '20' + bb_gain12: '20' + bb_gain13: '20' + bb_gain14: '20' + bb_gain15: '20' + bb_gain16: '20' + bb_gain17: '20' + bb_gain18: '20' + bb_gain19: '20' + bb_gain2: '20' + bb_gain20: '20' + bb_gain21: '20' + bb_gain22: '20' + bb_gain23: '20' + bb_gain24: '20' + bb_gain25: '20' + bb_gain26: '20' + bb_gain27: '20' + bb_gain28: '20' + bb_gain29: '20' + bb_gain3: '20' + bb_gain30: '20' + bb_gain31: '20' + bb_gain4: '20' + bb_gain5: '20' + bb_gain6: '20' + bb_gain7: '20' + bb_gain8: '20' + bb_gain9: '20' + bw0: '0' + bw1: '0' + bw10: '0' + bw11: '0' + bw12: '0' + bw13: '0' + bw14: '0' + bw15: '0' + bw16: '0' + bw17: '0' + bw18: '0' + bw19: '0' + bw2: '0' + bw20: '0' + bw21: '0' + bw22: '0' + bw23: '0' + bw24: '0' + bw25: '0' + bw26: '0' + bw27: '0' + bw28: '0' + bw29: '0' + bw3: '0' + bw30: '0' + bw31: '0' + bw4: '0' + bw5: '0' + bw6: '0' + bw7: '0' + bw8: '0' + bw9: '0' + clock_source0: '' + clock_source1: '' + clock_source2: '' + clock_source3: '' + clock_source4: '' + clock_source5: '' + clock_source6: '' + clock_source7: '' + comment: '' + corr0: ppm_corr + corr1: '0' + corr10: '0' + corr11: '0' + corr12: '0' + corr13: '0' + corr14: '0' + corr15: '0' + corr16: '0' + corr17: '0' + corr18: '0' + corr19: '0' + corr2: '0' + corr20: '0' + corr21: '0' + corr22: '0' + corr23: '0' + corr24: '0' + corr25: '0' + corr26: '0' + corr27: '0' + corr28: '0' + corr29: '0' + corr3: '0' + corr30: '0' + corr31: '0' + corr4: '0' + corr5: '0' + corr6: '0' + corr7: '0' + corr8: '0' + corr9: '0' + dc_offset_mode0: '0' + dc_offset_mode1: '0' + dc_offset_mode10: '0' + dc_offset_mode11: '0' + dc_offset_mode12: '0' + dc_offset_mode13: '0' + dc_offset_mode14: '0' + dc_offset_mode15: '0' + dc_offset_mode16: '0' + dc_offset_mode17: '0' + dc_offset_mode18: '0' + dc_offset_mode19: '0' + dc_offset_mode2: '0' + dc_offset_mode20: '0' + dc_offset_mode21: '0' + dc_offset_mode22: '0' + dc_offset_mode23: '0' + dc_offset_mode24: '0' + dc_offset_mode25: '0' + dc_offset_mode26: '0' + dc_offset_mode27: '0' + dc_offset_mode28: '0' + dc_offset_mode29: '0' + dc_offset_mode3: '0' + dc_offset_mode30: '0' + dc_offset_mode31: '0' + dc_offset_mode4: '0' + dc_offset_mode5: '0' + dc_offset_mode6: '0' + dc_offset_mode7: '0' + dc_offset_mode8: '0' + dc_offset_mode9: '0' + freq0: freq-xlate_offset1 + freq1: 100e6 + freq10: 100e6 + freq11: 100e6 + freq12: 100e6 + freq13: 100e6 + freq14: 100e6 + freq15: 100e6 + freq16: 100e6 + freq17: 100e6 + freq18: 100e6 + freq19: 100e6 + freq2: 100e6 + freq20: 100e6 + freq21: 100e6 + freq22: 100e6 + freq23: 100e6 + freq24: 100e6 + freq25: 100e6 + freq26: 100e6 + freq27: 100e6 + freq28: 100e6 + freq29: 100e6 + freq3: 100e6 + freq30: 100e6 + freq31: 100e6 + freq4: 100e6 + freq5: 100e6 + freq6: 100e6 + freq7: 100e6 + freq8: 100e6 + freq9: 100e6 + gain0: sdr_gain + gain1: '10' + gain10: '10' + gain11: '10' + gain12: '10' + gain13: '10' + gain14: '10' + gain15: '10' + gain16: '10' + gain17: '10' + gain18: '10' + gain19: '10' + gain2: '10' + gain20: '10' + gain21: '10' + gain22: '10' + gain23: '10' + gain24: '10' + gain25: '10' + gain26: '10' + gain27: '10' + gain28: '10' + gain29: '10' + gain3: '10' + gain30: '10' + gain31: '10' + gain4: '10' + gain5: '10' + gain6: '10' + gain7: '10' + gain8: '10' + gain9: '10' + gain_mode0: 'False' + gain_mode1: 'False' + gain_mode10: 'False' + gain_mode11: 'False' + gain_mode12: 'False' + gain_mode13: 'False' + gain_mode14: 'False' + gain_mode15: 'False' + gain_mode16: 'False' + gain_mode17: 'False' + gain_mode18: 'False' + gain_mode19: 'False' + gain_mode2: 'False' + gain_mode20: 'False' + gain_mode21: 'False' + gain_mode22: 'False' + gain_mode23: 'False' + gain_mode24: 'False' + gain_mode25: 'False' + gain_mode26: 'False' + gain_mode27: 'False' + gain_mode28: 'False' + gain_mode29: 'False' + gain_mode3: 'False' + gain_mode30: 'False' + gain_mode31: 'False' + gain_mode4: 'False' + gain_mode5: 'False' + gain_mode6: 'False' + gain_mode7: 'False' + gain_mode8: 'False' + gain_mode9: 'False' + if_gain0: sdr_ifgain + if_gain1: '20' + if_gain10: '20' + if_gain11: '20' + if_gain12: '20' + if_gain13: '20' + if_gain14: '20' + if_gain15: '20' + if_gain16: '20' + if_gain17: '20' + if_gain18: '20' + if_gain19: '20' + if_gain2: '20' + if_gain20: '20' + if_gain21: '20' + if_gain22: '20' + if_gain23: '20' + if_gain24: '20' + if_gain25: '20' + if_gain26: '20' + if_gain27: '20' + if_gain28: '20' + if_gain29: '20' + if_gain3: '20' + if_gain30: '20' + if_gain31: '20' + if_gain4: '20' + if_gain5: '20' + if_gain6: '20' + if_gain7: '20' + if_gain8: '20' + if_gain9: '20' + iq_balance_mode0: '0' + iq_balance_mode1: '0' + iq_balance_mode10: '0' + iq_balance_mode11: '0' + iq_balance_mode12: '0' + iq_balance_mode13: '0' + iq_balance_mode14: '0' + iq_balance_mode15: '0' + iq_balance_mode16: '0' + iq_balance_mode17: '0' + iq_balance_mode18: '0' + iq_balance_mode19: '0' + iq_balance_mode2: '0' + iq_balance_mode20: '0' + iq_balance_mode21: '0' + iq_balance_mode22: '0' + iq_balance_mode23: '0' + iq_balance_mode24: '0' + iq_balance_mode25: '0' + iq_balance_mode26: '0' + iq_balance_mode27: '0' + iq_balance_mode28: '0' + iq_balance_mode29: '0' + iq_balance_mode3: '0' + iq_balance_mode30: '0' + iq_balance_mode31: '0' + iq_balance_mode4: '0' + iq_balance_mode5: '0' + iq_balance_mode6: '0' + iq_balance_mode7: '0' + iq_balance_mode8: '0' + iq_balance_mode9: '0' + maxoutbuf: '0' + minoutbuf: '0' + nchan: '1' + num_mboards: '1' + sample_rate: samp_rate + sync: sync + time_source0: '' + time_source1: '' + time_source2: '' + time_source3: '' + time_source4: '' + time_source5: '' + time_source6: '' + time_source7: '' + type: fc32 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [32, 136.0] + rotation: 0 + state: enabled +- name: qtgui_freq_sink_x_0 + id: qtgui_freq_sink_x + parameters: + affinity: '' + alias: '' + alpha1: '1.0' + alpha10: '1.0' + alpha2: '1.0' + alpha3: '1.0' + alpha4: '1.0' + alpha5: '1.0' + alpha6: '1.0' + alpha7: '1.0' + alpha8: '1.0' + alpha9: '1.0' + autoscale: 'False' + average: '0.2' + axislabels: 'True' + bw: samp_rate + color1: '"blue"' + color10: '"dark blue"' + color2: '"red"' + color3: '"green"' + color4: '"black"' + color5: '"cyan"' + color6: '"magenta"' + color7: '"yellow"' + color8: '"dark red"' + color9: '"dark green"' + comment: '' + ctrlpanel: 'True' + fc: freq-xlate_offset1 + fftsize: '1024' + freqhalf: 'True' + grid: 'False' + gui_hint: 1,0,1,6 + label: Relative Gain + label1: '' + label10: '''''' + label2: '''''' + label3: '''''' + label4: '''''' + label5: '''''' + label6: '''''' + label7: '''''' + label8: '''''' + label9: '''''' + legend: 'True' + maxoutbuf: '0' + minoutbuf: '0' + name: '""' + nconnections: '1' + norm_window: 'False' + showports: 'False' + tr_chan: '0' + tr_level: '0.0' + tr_mode: qtgui.TRIG_MODE_FREE + tr_tag: '""' + type: complex + units: dB + update_time: '0.10' + width1: '1' + width10: '1' + width2: '1' + width3: '1' + width4: '1' + width5: '1' + width6: '1' + width7: '1' + width8: '1' + width9: '1' + wintype: window.WIN_BLACKMAN_hARRIS + ymax: '10' + ymin: '-140' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [280, 284.0] + rotation: 0 + state: true +- name: qtgui_freq_sink_x_0_0 + id: qtgui_freq_sink_x + parameters: + affinity: '' + alias: '' + alpha1: '1.0' + alpha10: '1.0' + alpha2: '1.0' + alpha3: '1.0' + alpha4: '1.0' + alpha5: '1.0' + alpha6: '1.0' + alpha7: '1.0' + alpha8: '1.0' + alpha9: '1.0' + autoscale: 'True' + average: '1.0' + axislabels: 'True' + bw: if_samp_rate + color1: '"blue"' + color10: '"dark blue"' + color2: '"red"' + color3: '"green"' + color4: '"black"' + color5: '"cyan"' + color6: '"magenta"' + color7: '"yellow"' + color8: '"dark red"' + color9: '"dark green"' + comment: '' + ctrlpanel: 'True' + fc: '0' + fftsize: '256' + freqhalf: 'True' + grid: 'True' + gui_hint: 1,6,1,6 + label: Relative Gain + label1: '' + label10: '''''' + label2: '''''' + label3: '''''' + label4: '''''' + label5: '''''' + label6: '''''' + label7: '''''' + label8: '''''' + label9: '''''' + legend: 'True' + maxoutbuf: '0' + minoutbuf: '0' + name: '"IF"' + nconnections: '1' + norm_window: 'False' + showports: 'True' + tr_chan: '0' + tr_level: '0.0' + tr_mode: qtgui.TRIG_MODE_FREE + tr_tag: '""' + type: complex + units: dB + update_time: '0.01' + width1: '1' + width10: '1' + width2: '1' + width3: '1' + width4: '1' + width5: '1' + width6: '1' + width7: '1' + width8: '1' + width9: '1' + wintype: window.WIN_BLACKMAN_hARRIS + ymax: '-30' + ymin: '-180' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [832, 156.0] + rotation: 0 + state: true +- name: xlate_offset_fine1 + id: variable_slider + parameters: + alias: '' + comment: '' + converver: float_converter + grid_pos: 3,1,1,4 + label: Fine Tune + max: '10000' + min: '-10000' + notebook: '' + num_steps: '200' + style: wx.SL_HORIZONTAL + value: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [144, 770] + rotation: 0 + state: enabled +- name: xmlrpc_server_0 + id: xmlrpc_server + parameters: + addr: 0.0.0.0 + alias: '' + comment: '' + port: first_port + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [800, 20.0] + rotation: 0 + state: disabled + +connections: +- [analog_agc3_xx_0, '0', mmse_resampler_xx_0, '0'] +- [freq_xlating_fir_filter_xxx_0, '0', analog_agc3_xx_0, '0'] +- [freq_xlating_fir_filter_xxx_0, '0', qtgui_freq_sink_x_0_0, '0'] +- [mmse_resampler_xx_0, '0', network_udp_sink_0, '0'] +- [osmosdr_source_0, '0', freq_xlating_fir_filter_xxx_0, '0'] +- [osmosdr_source_0, '0', qtgui_freq_sink_x_0, '0'] + +metadata: + file_format: 1 + grc_version: 3.10.5.1 diff --git a/src/demod/telive_1ch_simple_gr310_udp.py b/src/demod/telive_1ch_simple_gr310_udp.py new file mode 100755 index 0000000..22990c0 --- /dev/null +++ b/src/demod/telive_1ch_simple_gr310_udp.py @@ -0,0 +1,438 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# +# SPDX-License-Identifier: GPL-3.0 +# +# GNU Radio Python Flow Graph +# Title: SQ5BPF Tetra live receiver 1ch simple UDP demo with fixed offset (gnuradio 3.10 version) xmlrpc +# Author: Jacek Lipkowski SQ5BPF +# Description: This is a receiver flowgraph, uses a rtl-sdr dongle, and outputs a downsampled stream to 127.0.0.1 42001/udp. This can be used with telive, or just osmo-tetra +# GNU Radio version: 3.10.5.1 + +from packaging.version import Version as StrictVersion + +if __name__ == '__main__': + import ctypes + import sys + if sys.platform.startswith('linux'): + try: + x11 = ctypes.cdll.LoadLibrary('libX11.so') + x11.XInitThreads() + except: + print("Warning: failed to XInitThreads()") + +from PyQt5 import Qt +from gnuradio import eng_notation +from gnuradio import qtgui +from gnuradio.filter import firdes +import sip +from gnuradio import analog +from gnuradio import filter +from gnuradio import gr +from gnuradio.fft import window +import sys +import signal +from argparse import ArgumentParser +from gnuradio.eng_arg import eng_float, intx +from gnuradio import network +from gnuradio.qtgui import Range, RangeWidget +from PyQt5 import QtCore +import osmosdr +import time + + + +from gnuradio import qtgui + +class telive_1ch_simple_gr310_udp(gr.top_block, Qt.QWidget): + + def __init__(self): + gr.top_block.__init__(self, "SQ5BPF Tetra live receiver 1ch simple UDP demo with fixed offset (gnuradio 3.10 version) xmlrpc", catch_exceptions=True) + Qt.QWidget.__init__(self) + self.setWindowTitle("SQ5BPF Tetra live receiver 1ch simple UDP demo with fixed offset (gnuradio 3.10 version) xmlrpc") + qtgui.util.check_set_qss() + try: + self.setWindowIcon(Qt.QIcon.fromTheme('gnuradio-grc')) + except: + pass + self.top_scroll_layout = Qt.QVBoxLayout() + self.setLayout(self.top_scroll_layout) + self.top_scroll = Qt.QScrollArea() + self.top_scroll.setFrameStyle(Qt.QFrame.NoFrame) + self.top_scroll_layout.addWidget(self.top_scroll) + self.top_scroll.setWidgetResizable(True) + self.top_widget = Qt.QWidget() + self.top_scroll.setWidget(self.top_widget) + self.top_layout = Qt.QVBoxLayout(self.top_widget) + self.top_grid_layout = Qt.QGridLayout() + self.top_layout.addLayout(self.top_grid_layout) + + self.settings = Qt.QSettings("GNU Radio", "telive_1ch_simple_gr310_udp") + + try: + if StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"): + self.restoreGeometry(self.settings.value("geometry").toByteArray()) + else: + self.restoreGeometry(self.settings.value("geometry")) + except: + pass + + ################################################## + # Variables + ################################################## + self.xlate_offset_fine1 = xlate_offset_fine1 = 0 + self.samp_rate = samp_rate = 2000000 + self.freq = freq = 438.0125e6 + self.first_decim = first_decim = 32 + self.xlate_offset1 = xlate_offset1 = 500000 + self.variable_qtgui_label_0_0 = variable_qtgui_label_0_0 = (freq+xlate_offset_fine1) + self.udp_packet_size = udp_packet_size = 1472 + self.udp_dest_addr = udp_dest_addr = "127.0.0.1" + self.telive_receiver_name = telive_receiver_name = 'SQ5BPF 1-channel rx for telive' + self.telive_receiver_channels = telive_receiver_channels = 1 + self.sdr_ifgain = sdr_ifgain = 20 + self.sdr_gain = sdr_gain = 30 + self.ppm_corr = ppm_corr = 0 + self.out_sample_rate = out_sample_rate = 36000 + self.options_low_pass = options_low_pass = 12500 + self.if_samp_rate = if_samp_rate = samp_rate/first_decim + self.first_port = first_port = 42000 + + ################################################## + # Blocks + ################################################## + + self._xlate_offset_fine1_range = Range(-5e3, +5e3, 1, 0, 200) + self._xlate_offset_fine1_win = RangeWidget(self._xlate_offset_fine1_range, self.set_xlate_offset_fine1, "Fine tune1", "counter_slider", float, QtCore.Qt.Horizontal) + self.top_grid_layout.addWidget(self._xlate_offset_fine1_win, 0, 2, 1, 3) + for r in range(0, 1): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(2, 5): + self.top_grid_layout.setColumnStretch(c, 1) + self._sdr_gain_range = Range(0, 50, 1, 30, 200) + self._sdr_gain_win = RangeWidget(self._sdr_gain_range, self.set_sdr_gain, "gain", "counter_slider", int, QtCore.Qt.Horizontal) + self.top_grid_layout.addWidget(self._sdr_gain_win, 0, 8, 1, 2) + for r in range(0, 1): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(8, 10): + self.top_grid_layout.setColumnStretch(c, 1) + self._ppm_corr_range = Range(-100, 100, 0.5, 0, 200) + self._ppm_corr_win = RangeWidget(self._ppm_corr_range, self.set_ppm_corr, "ppm", "counter_slider", float, QtCore.Qt.Horizontal) + self.top_grid_layout.addWidget(self._ppm_corr_win, 0, 5, 1, 3) + for r in range(0, 1): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(5, 8): + self.top_grid_layout.setColumnStretch(c, 1) + self._freq_tool_bar = Qt.QToolBar(self) + self._freq_tool_bar.addWidget(Qt.QLabel("Frequency" + ": ")) + self._freq_line_edit = Qt.QLineEdit(str(self.freq)) + self._freq_tool_bar.addWidget(self._freq_line_edit) + self._freq_line_edit.returnPressed.connect( + lambda: self.set_freq(eng_notation.str_to_num(str(self._freq_line_edit.text())))) + self.top_grid_layout.addWidget(self._freq_tool_bar, 0, 0, 1, 2) + for r in range(0, 1): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(0, 2): + self.top_grid_layout.setColumnStretch(c, 1) + self._variable_qtgui_label_0_0_tool_bar = Qt.QToolBar(self) + + if lambda x: f'{x/1000000:.4f} MHz': + self._variable_qtgui_label_0_0_formatter = lambda x: f'{x/1000000:.4f} MHz' + else: + self._variable_qtgui_label_0_0_formatter = lambda x: eng_notation.num_to_str(x) + + self._variable_qtgui_label_0_0_tool_bar.addWidget(Qt.QLabel("Receive frequency: ")) + self._variable_qtgui_label_0_0_label = Qt.QLabel(str(self._variable_qtgui_label_0_0_formatter(self.variable_qtgui_label_0_0))) + self._variable_qtgui_label_0_0_tool_bar.addWidget(self._variable_qtgui_label_0_0_label) + self.top_layout.addWidget(self._variable_qtgui_label_0_0_tool_bar) + self.qtgui_freq_sink_x_0_0 = qtgui.freq_sink_c( + 256, #size + window.WIN_BLACKMAN_hARRIS, #wintype + 0, #fc + if_samp_rate, #bw + "IF", #name + 1, + None # parent + ) + self.qtgui_freq_sink_x_0_0.set_update_time(0.01) + self.qtgui_freq_sink_x_0_0.set_y_axis((-180), (-30)) + self.qtgui_freq_sink_x_0_0.set_y_label('Relative Gain', 'dB') + self.qtgui_freq_sink_x_0_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, 0.0, 0, "") + self.qtgui_freq_sink_x_0_0.enable_autoscale(True) + self.qtgui_freq_sink_x_0_0.enable_grid(True) + self.qtgui_freq_sink_x_0_0.set_fft_average(1.0) + self.qtgui_freq_sink_x_0_0.enable_axis_labels(True) + self.qtgui_freq_sink_x_0_0.enable_control_panel(True) + self.qtgui_freq_sink_x_0_0.set_fft_window_normalized(False) + + + + labels = ['', '', '', '', '', + '', '', '', '', ''] + widths = [1, 1, 1, 1, 1, + 1, 1, 1, 1, 1] + colors = ["blue", "red", "green", "black", "cyan", + "magenta", "yellow", "dark red", "dark green", "dark blue"] + alphas = [1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0] + + for i in range(1): + if len(labels[i]) == 0: + self.qtgui_freq_sink_x_0_0.set_line_label(i, "Data {0}".format(i)) + else: + self.qtgui_freq_sink_x_0_0.set_line_label(i, labels[i]) + self.qtgui_freq_sink_x_0_0.set_line_width(i, widths[i]) + self.qtgui_freq_sink_x_0_0.set_line_color(i, colors[i]) + self.qtgui_freq_sink_x_0_0.set_line_alpha(i, alphas[i]) + + self._qtgui_freq_sink_x_0_0_win = sip.wrapinstance(self.qtgui_freq_sink_x_0_0.qwidget(), Qt.QWidget) + self.top_grid_layout.addWidget(self._qtgui_freq_sink_x_0_0_win, 1, 6, 1, 6) + for r in range(1, 2): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(6, 12): + self.top_grid_layout.setColumnStretch(c, 1) + self.qtgui_freq_sink_x_0 = qtgui.freq_sink_c( + 1024, #size + window.WIN_BLACKMAN_hARRIS, #wintype + (freq-xlate_offset1), #fc + samp_rate, #bw + "", #name + 1, + None # parent + ) + self.qtgui_freq_sink_x_0.set_update_time(0.10) + self.qtgui_freq_sink_x_0.set_y_axis((-140), 10) + self.qtgui_freq_sink_x_0.set_y_label('Relative Gain', 'dB') + self.qtgui_freq_sink_x_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, 0.0, 0, "") + self.qtgui_freq_sink_x_0.enable_autoscale(False) + self.qtgui_freq_sink_x_0.enable_grid(False) + self.qtgui_freq_sink_x_0.set_fft_average(0.2) + self.qtgui_freq_sink_x_0.enable_axis_labels(True) + self.qtgui_freq_sink_x_0.enable_control_panel(True) + self.qtgui_freq_sink_x_0.set_fft_window_normalized(False) + + + + labels = ['', '', '', '', '', + '', '', '', '', ''] + widths = [1, 1, 1, 1, 1, + 1, 1, 1, 1, 1] + colors = ["blue", "red", "green", "black", "cyan", + "magenta", "yellow", "dark red", "dark green", "dark blue"] + alphas = [1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0] + + for i in range(1): + if len(labels[i]) == 0: + self.qtgui_freq_sink_x_0.set_line_label(i, "Data {0}".format(i)) + else: + self.qtgui_freq_sink_x_0.set_line_label(i, labels[i]) + self.qtgui_freq_sink_x_0.set_line_width(i, widths[i]) + self.qtgui_freq_sink_x_0.set_line_color(i, colors[i]) + self.qtgui_freq_sink_x_0.set_line_alpha(i, alphas[i]) + + self._qtgui_freq_sink_x_0_win = sip.wrapinstance(self.qtgui_freq_sink_x_0.qwidget(), Qt.QWidget) + self.top_grid_layout.addWidget(self._qtgui_freq_sink_x_0_win, 1, 0, 1, 6) + for r in range(1, 2): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(0, 6): + self.top_grid_layout.setColumnStretch(c, 1) + self.osmosdr_source_0 = osmosdr.source( + args="numchan=" + str(1) + " " + '' + ) + self.osmosdr_source_0.set_time_unknown_pps(osmosdr.time_spec_t()) + self.osmosdr_source_0.set_sample_rate(samp_rate) + self.osmosdr_source_0.set_center_freq((freq-xlate_offset1), 0) + self.osmosdr_source_0.set_freq_corr(ppm_corr, 0) + self.osmosdr_source_0.set_dc_offset_mode(0, 0) + self.osmosdr_source_0.set_iq_balance_mode(0, 0) + self.osmosdr_source_0.set_gain_mode(False, 0) + self.osmosdr_source_0.set_gain(sdr_gain, 0) + self.osmosdr_source_0.set_if_gain(sdr_ifgain, 0) + self.osmosdr_source_0.set_bb_gain(20, 0) + self.osmosdr_source_0.set_antenna('', 0) + self.osmosdr_source_0.set_bandwidth(0, 0) + self.network_udp_sink_0 = network.udp_sink(gr.sizeof_gr_complex, 1, udp_dest_addr, (first_port+1), 0, udp_packet_size, False) + self.mmse_resampler_xx_0 = filter.mmse_resampler_cc(0, (float(float(if_samp_rate)/float(out_sample_rate)))) + self.freq_xlating_fir_filter_xxx_0 = filter.freq_xlating_fir_filter_ccc(first_decim, firdes.low_pass(1, samp_rate, options_low_pass, options_low_pass*0.2), (xlate_offset1+xlate_offset_fine1), samp_rate) + self.analog_agc3_xx_0 = analog.agc3_cc((1e-3), (1e-4), 1.0, 1.0, 1) + self.analog_agc3_xx_0.set_max_gain(65536) + + + ################################################## + # Connections + ################################################## + self.connect((self.analog_agc3_xx_0, 0), (self.mmse_resampler_xx_0, 0)) + self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.analog_agc3_xx_0, 0)) + self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.qtgui_freq_sink_x_0_0, 0)) + self.connect((self.mmse_resampler_xx_0, 0), (self.network_udp_sink_0, 0)) + self.connect((self.osmosdr_source_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0)) + self.connect((self.osmosdr_source_0, 0), (self.qtgui_freq_sink_x_0, 0)) + + + def closeEvent(self, event): + self.settings = Qt.QSettings("GNU Radio", "telive_1ch_simple_gr310_udp") + self.settings.setValue("geometry", self.saveGeometry()) + self.stop() + self.wait() + + event.accept() + + def get_xlate_offset_fine1(self): + return self.xlate_offset_fine1 + + def set_xlate_offset_fine1(self, xlate_offset_fine1): + self.xlate_offset_fine1 = xlate_offset_fine1 + self.set_variable_qtgui_label_0_0((self.freq+self.xlate_offset_fine1)) + self.freq_xlating_fir_filter_xxx_0.set_center_freq((self.xlate_offset1+self.xlate_offset_fine1)) + + def get_samp_rate(self): + return self.samp_rate + + def set_samp_rate(self, samp_rate): + self.samp_rate = samp_rate + self.set_if_samp_rate(self.samp_rate/self.first_decim) + self.freq_xlating_fir_filter_xxx_0.set_taps(firdes.low_pass(1, self.samp_rate, self.options_low_pass, self.options_low_pass*0.2)) + self.osmosdr_source_0.set_sample_rate(self.samp_rate) + self.qtgui_freq_sink_x_0.set_frequency_range((self.freq-self.xlate_offset1), self.samp_rate) + + def get_freq(self): + return self.freq + + def set_freq(self, freq): + self.freq = freq + Qt.QMetaObject.invokeMethod(self._freq_line_edit, "setText", Qt.Q_ARG("QString", eng_notation.num_to_str(self.freq))) + self.set_variable_qtgui_label_0_0((self.freq+self.xlate_offset_fine1)) + self.osmosdr_source_0.set_center_freq((self.freq-self.xlate_offset1), 0) + self.qtgui_freq_sink_x_0.set_frequency_range((self.freq-self.xlate_offset1), self.samp_rate) + + def get_first_decim(self): + return self.first_decim + + def set_first_decim(self, first_decim): + self.first_decim = first_decim + self.set_if_samp_rate(self.samp_rate/self.first_decim) + + def get_xlate_offset1(self): + return self.xlate_offset1 + + def set_xlate_offset1(self, xlate_offset1): + self.xlate_offset1 = xlate_offset1 + self.freq_xlating_fir_filter_xxx_0.set_center_freq((self.xlate_offset1+self.xlate_offset_fine1)) + self.osmosdr_source_0.set_center_freq((self.freq-self.xlate_offset1), 0) + self.qtgui_freq_sink_x_0.set_frequency_range((self.freq-self.xlate_offset1), self.samp_rate) + + def get_variable_qtgui_label_0_0(self): + return self.variable_qtgui_label_0_0 + + def set_variable_qtgui_label_0_0(self, variable_qtgui_label_0_0): + self.variable_qtgui_label_0_0 = variable_qtgui_label_0_0 + Qt.QMetaObject.invokeMethod(self._variable_qtgui_label_0_0_label, "setText", Qt.Q_ARG("QString", str(self._variable_qtgui_label_0_0_formatter(self.variable_qtgui_label_0_0)))) + + def get_udp_packet_size(self): + return self.udp_packet_size + + def set_udp_packet_size(self, udp_packet_size): + self.udp_packet_size = udp_packet_size + + def get_udp_dest_addr(self): + return self.udp_dest_addr + + def set_udp_dest_addr(self, udp_dest_addr): + self.udp_dest_addr = udp_dest_addr + + def get_telive_receiver_name(self): + return self.telive_receiver_name + + def set_telive_receiver_name(self, telive_receiver_name): + self.telive_receiver_name = telive_receiver_name + + def get_telive_receiver_channels(self): + return self.telive_receiver_channels + + def set_telive_receiver_channels(self, telive_receiver_channels): + self.telive_receiver_channels = telive_receiver_channels + + def get_sdr_ifgain(self): + return self.sdr_ifgain + + def set_sdr_ifgain(self, sdr_ifgain): + self.sdr_ifgain = sdr_ifgain + self.osmosdr_source_0.set_if_gain(self.sdr_ifgain, 0) + + def get_sdr_gain(self): + return self.sdr_gain + + def set_sdr_gain(self, sdr_gain): + self.sdr_gain = sdr_gain + self.osmosdr_source_0.set_gain(self.sdr_gain, 0) + + def get_ppm_corr(self): + return self.ppm_corr + + def set_ppm_corr(self, ppm_corr): + self.ppm_corr = ppm_corr + self.osmosdr_source_0.set_freq_corr(self.ppm_corr, 0) + + def get_out_sample_rate(self): + return self.out_sample_rate + + def set_out_sample_rate(self, out_sample_rate): + self.out_sample_rate = out_sample_rate + self.mmse_resampler_xx_0.set_resamp_ratio((float(float(self.if_samp_rate)/float(self.out_sample_rate)))) + + def get_options_low_pass(self): + return self.options_low_pass + + def set_options_low_pass(self, options_low_pass): + self.options_low_pass = options_low_pass + self.freq_xlating_fir_filter_xxx_0.set_taps(firdes.low_pass(1, self.samp_rate, self.options_low_pass, self.options_low_pass*0.2)) + + def get_if_samp_rate(self): + return self.if_samp_rate + + def set_if_samp_rate(self, if_samp_rate): + self.if_samp_rate = if_samp_rate + self.mmse_resampler_xx_0.set_resamp_ratio((float(float(self.if_samp_rate)/float(self.out_sample_rate)))) + self.qtgui_freq_sink_x_0_0.set_frequency_range(0, self.if_samp_rate) + + def get_first_port(self): + return self.first_port + + def set_first_port(self, first_port): + self.first_port = first_port + + + + +def main(top_block_cls=telive_1ch_simple_gr310_udp, options=None): + + if StrictVersion("4.5.0") <= StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"): + style = gr.prefs().get_string('qtgui', 'style', 'raster') + Qt.QApplication.setGraphicsSystem(style) + qapp = Qt.QApplication(sys.argv) + + tb = top_block_cls() + + tb.start() + + tb.show() + + def sig_handler(sig=None, frame=None): + tb.stop() + tb.wait() + + Qt.QApplication.quit() + + signal.signal(signal.SIGINT, sig_handler) + signal.signal(signal.SIGTERM, sig_handler) + + timer = Qt.QTimer() + timer.start(500) + timer.timeout.connect(lambda: None) + + qapp.exec_() + +if __name__ == '__main__': + main() diff --git a/src/receiver1udp b/src/receiver1udp new file mode 100755 index 0000000..96d007a --- /dev/null +++ b/src/receiver1udp @@ -0,0 +1,73 @@ +#!/bin/bash +# +# receiver1udp (c) 2023 Jacek Lipkowski SQ5BPF <sq5bpf(a)lipkowski.org> +# +# This is an example how to get I/Q data via udp packets, +# feed them to a qpsk demodulator, and feed the result to tetra-rx +# +# Originally this was developed to work with the osmo-tetra-sq5bpf tree +# but will work with original osmo-tetra too +# +# +# To use with an rtl-sdr dongle: +# +# - run the demod/telive_1ch_simple_gr310_udp.py (you can also use the telive_1ch_simple_gr310_udp.grc in gnuradio-companion) +# +# - run ./receiver1udp +# +# - enter the frequency in the receiver window, set the ppm (frequency correction) and the gain +# + + +if [ "$1" ]; then + RXID=$1 +else + RXID=1 +fi + + +# you can also set GR_VERSION yourself outside of this script --sq5bpf +[ "$GR_VERSION" ] || GR_VERSION=`gnuradio-config-info -v|cut -d . -f 1-2|tr -d v` +case $GR_VERSION in + 3.6) + GR_DIR=gnuradio-3.6 + PYT=2 + ;; + 3.7) + GR_DIR=gnuradio-3.7 + PYT=2 + ;; + 3.10) + GR_DIR=gnuradio-3.10 + PYT=3 + ;; + *) + echo "Unsuported gnuradio version $GR_VERSION" + exit 1 + ;; +esac + +UDP_PORT=42001 + + +ulimit -c unlimited + +#tetra-rx args: -a turns on pseudo-afc , -i uses an internal float_t_bits +# -r turns on fragment reassembly, -s tries to dump unknown SDS protocols as text +# +#if you have problems with the receiver, then try to remove -a + +case "$PYT" in + 2) + socat -b 4096 UDP-RECV:${UDP_PORT} STDOUT | demod/simdemod2.py -o /dev/stdout -i /dev/stdin | ./float_to_bits -a /dev/stdin /dev/stdout | ./tetra-rx /dev/stdin + ;; + 3) + socat -b 4096 UDP-RECV:${UDP_PORT} STDOUT | demod/simdemod3.py | ./tetra-rx /dev/stdin + ;; + *) + echo "Dont know how to handle pythin version [$PYT]" + exit 1 +esac + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I81f20fa115822b3ad642b638f6414d8249a8ac6a Gerrit-Change-Number: 34222 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

9 months, 1 week

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: refactor l1sched_mframe_layout()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34216 ) Change subject: trxcon/l1sched: refactor l1sched_mframe_layout() ...................................................................... trxcon/l1sched: refactor l1sched_mframe_layout() Change-Id: Ie1c3679879ef97d42237d6723d1619ac0ef97f6b --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_mframe.c 2 files changed, 19 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 7d9a5b5..3f5e8b0 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -327,8 +327,8 @@ }; extern const struct l1sched_lchan_desc l1sched_lchan_desc[_L1SCHED_CHAN_MAX]; -const struct l1sched_tdma_multiframe *l1sched_mframe_layout( - enum gsm_phys_chan_config config, int tn); +const struct l1sched_tdma_multiframe * +l1sched_mframe_layout(enum gsm_phys_chan_config config, uint8_t tn); /* Scheduler management functions */ struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, void *priv); diff --git a/src/host/trxcon/src/sched_mframe.c b/src/host/trxcon/src/sched_mframe.c index 90b7763..0d95e0a 100644 --- a/src/host/trxcon/src/sched_mframe.c +++ b/src/host/trxcon/src/sched_mframe.c @@ -2087,15 +2087,15 @@ }, }; -const struct l1sched_tdma_multiframe *l1sched_mframe_layout( - enum gsm_phys_chan_config config, int tn) +const struct l1sched_tdma_multiframe * +l1sched_mframe_layout(enum gsm_phys_chan_config config, uint8_t tn) { - int i, ts_allowed; - - for (i = 0; i < ARRAY_SIZE(layouts); i++) { - ts_allowed = layouts[i].slotmask & (0x01 << tn); - if (layouts[i].chan_config == config && ts_allowed) - return &layouts[i]; + for (unsigned int i = 0; i < ARRAY_SIZE(layouts); i++) { + if (layouts[i].chan_config != config) + continue; + if (~layouts[i].slotmask & (1 << tn)) + continue; + return &layouts[i]; } return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1c3679879ef97d42237d6723d1619ac0ef97f6b Gerrit-Change-Number: 34216 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library: L1CTL: add 'start_fn' field to UL/DL TBF CFG.req messages

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34220 ) Change subject: library: L1CTL: add 'start_fn' field to UL/DL TBF CFG.req messages ...................................................................... library: L1CTL: add 'start_fn' field to UL/DL TBF CFG.req messages Change-Id: I800e4813671e92f6010945d58dfe6297302c6f13 Related: osmocom-bb.git Ibb6a05165fe1c81268fb0e3674adae4065e78171 Related: OS#5500, OS#6147 --- M library/L1CTL_Types.ttcn 1 file changed, 29 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index fe56459..73e09fc 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -315,7 +315,8 @@ type record L1ctlGprsUlTbfCfgReq { uint8_t tbf_ref, BIT8 slotmask, - OCT2 pad ('0000'O) + OCT2 pad ('0000'O), + uint32_t start_fn /* TBF Starting Time (absolute Fn) */ } with { variant (slotmask) "BITORDER(msb)" }; /* payload of L1CTL_GPRS_DL_TBF_CFG_REQ */ @@ -323,7 +324,8 @@ uint8_t tbf_ref, BIT8 slotmask, uint8_t dl_tfi, - OCT1 pad ('00'O) + OCT1 pad ('00'O), + uint32_t start_fn /* TBF Starting Time (absolute Fn) */ } with { variant (slotmask) "BITORDER(msb)" }; /* part of L1CTL_GPRS_{UL,DL}_BLOCK_{REQ,IND} */ @@ -863,7 +865,8 @@ template (value) L1ctlMessage ts_L1CTL_GPRS_UL_TBF_CFG_REQ(template (value) uint8_t tbf_ref, - template (value) BIT8 slotmask := '00000000'B) := { + template (value) BIT8 slotmask := '00000000'B, + template (value) uint32_t start_fn := c_UINT32_MAX) := { header := ts_L1ctlHeader(L1CTL_GPRS_UL_TBF_CFG_REQ), ul_info := omit, dl_info := omit, @@ -871,13 +874,15 @@ ul_tbf_cfg_req := { tbf_ref := tbf_ref, slotmask := slotmask, - pad := '0000'O + pad := '0000'O, + start_fn := start_fn } } }; template L1ctlMessage tr_L1CTL_GPRS_UL_TBF_CFG_REQ(template (present) uint8_t tbf_ref := ?, - template (present) BIT8 slotmask := ?) := { + template (present) BIT8 slotmask := ?, + template (present) uint32_t start_fn := ?) := { header := tr_L1ctlHeader(L1CTL_GPRS_UL_TBF_CFG_REQ), ul_info := omit, dl_info := omit, @@ -885,7 +890,8 @@ ul_tbf_cfg_req := { tbf_ref := tbf_ref, slotmask := slotmask, - pad := ? + pad := ?, + start_fn := start_fn } } }; @@ -893,6 +899,7 @@ template (value) L1ctlMessage ts_L1CTL_GPRS_DL_TBF_CFG_REQ(template (value) uint8_t tbf_ref, template (value) BIT8 slotmask := '00000000'B, + template (value) uint32_t start_fn := c_UINT32_MAX, template (value) uint5_t dl_tfi := 0) := { header := ts_L1ctlHeader(L1CTL_GPRS_DL_TBF_CFG_REQ), ul_info := omit, @@ -902,13 +909,15 @@ tbf_ref := tbf_ref, slotmask := slotmask, dl_tfi := dl_tfi, - pad := '00'O + pad := '00'O, + start_fn := start_fn } } }; template L1ctlMessage tr_L1CTL_GPRS_DL_TBF_CFG_REQ(template (present) uint8_t tbf_ref := ?, template (present) BIT8 slotmask := ?, + template (present) uint32_t start_fn := ?, template (present) uint5_t dl_tfi := ?) := { header := tr_L1ctlHeader(L1CTL_GPRS_DL_TBF_CFG_REQ), ul_info := omit, @@ -918,7 +927,8 @@ tbf_ref := tbf_ref, slotmask := slotmask, dl_tfi := dl_tfi, - pad := ? + pad := ?, + start_fn := start_fn } } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34220 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: I800e4813671e92f6010945d58dfe6297302c6f13 Gerrit-Change-Number: 34220 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

9 months, 1 week

1
0
0 0

[S] Change in gapk[master]: README.md: fix typo in the project name

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/gapk/+/34221 ) Change subject: README.md: fix typo in the project name ...................................................................... README.md: fix typo in the project name Change-Id: I1d0a7488a55d7866446797e99f585885cd446ebe --- M README.md 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/README.md b/README.md index b33e52a..5cf880e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ gapk - GSM Audio Pocket Knife ============================= -The GSM Audio Picket Knife is a tool that can help you to convert +The GSM Audio Pocket Knife is a tool that can help you to convert codec frames of all codecs in GSM networks between a variety of different formats / representations. -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I1d0a7488a55d7866446797e99f585885cd446ebe Gerrit-Change-Number: 34221 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

9 months, 1 week

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: refactor l1sched_mframe_layout()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34216 ) Change subject: trxcon/l1sched: refactor l1sched_mframe_layout() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1c3679879ef97d42237d6723d1619ac0ef97f6b Gerrit-Change-Number: 34216 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Aug 2023 14:33:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library: L1CTL: add 'start_fn' field to UL/DL TBF CFG.req messages

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34220 ) Change subject: library: L1CTL: add 'start_fn' field to UL/DL TBF CFG.req messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34220 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: I800e4813671e92f6010945d58dfe6297302c6f13 Gerrit-Change-Number: 34220 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Aug 2023 14:32:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in gapk[master]: README.md: fix typo in the project name

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34221 ) Change subject: README.md: fix typo in the project name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I1d0a7488a55d7866446797e99f585885cd446ebe Gerrit-Change-Number: 34221 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Aug 2023 14:31:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in gapk[master]: README.md: fix typo in the project name

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/gapk/+/34221 ) Change subject: README.md: fix typo in the project name ...................................................................... README.md: fix typo in the project name Change-Id: I1d0a7488a55d7866446797e99f585885cd446ebe --- M README.md 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/21/34221/1 diff --git a/README.md b/README.md index b33e52a..5cf880e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ gapk - GSM Audio Pocket Knife ============================= -The GSM Audio Picket Knife is a tool that can help you to convert +The GSM Audio Pocket Knife is a tool that can help you to convert codec frames of all codecs in GSM networks between a variety of different formats / representations. -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I1d0a7488a55d7866446797e99f585885cd446ebe Gerrit-Change-Number: 34221 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 1 week

1
0
0 0

[S] Change in libosmo-netif[master]: stream test: Fix test output check

by arehbein

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34210 ) Change subject: stream test: Fix test output check ...................................................................... stream test: Fix test output check A previous commit added additional logging information, necessitating changes to the test code as well as to the output check. Related:OS#5753 Change-Id: Ib8f01c3651c13814c212328946415094da39d6a8 --- M tests/stream/stream_test.c M tests/stream/stream_test.err 2 files changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index 01ebb23..20afc55 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -538,6 +538,7 @@ return NULL; } osmo_stream_cli_set_addr(osc, "127.0.0.11"); + osmo_stream_cli_set_local_port(osc, 8977); osmo_stream_cli_set_port(osc, 1111); osmo_stream_cli_set_connect_cb(osc, test_segm_ipa_stream_srv_cli_connect_cb); osmo_stream_cli_set_data(osc, ctx); diff --git a/tests/stream/stream_test.err b/tests/stream/stream_test.err index df0ebc3..03ce0cf 100644 --- a/tests/stream/stream_test.err +++ b/tests/stream/stream_test.err @@ -47,3 +47,5 @@ CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CLOSED} not reconnecting, disabled {20.000019} non-reconnecting test step 0 [client OK, server OK], FD reg 0 +SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8977 +CLICONN(,r=127.0.0.11:1111<->l=127.0.0.1:8977){CONNECTING} connection established -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ib8f01c3651c13814c212328946415094da39d6a8 Gerrit-Change-Number: 34210 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[L] Change in osmocom-bb[master]: trxcon/l1sched: implement CSD scheduling support

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32922 ) Change subject: trxcon/l1sched: implement CSD scheduling support ...................................................................... trxcon/l1sched: implement CSD scheduling support This patch adds support for TCH/[FH]2.4, TCH/[FH]4.8, TCH/F9.6 and TCH/F14.4 (including FACCH). Additional changes made: * enlarge the maximum TCH burst buffer size to 24 * (2 * 58) bytes; * enlarge per-l1cs UL/DL burst masks to hold up to 32 bits; * enlarge per-l1cs DL meas ring buffer to 24 entries; * enlarge L1SCHED_PRIM_TAILROOM from 256 to 512 bytes; * enlarge L1CTL_LENGTH from 256 to 512 bytes; Change-Id: I0d7389a9a5f7019b9316ab1c0115797ff54a0e41 Depends: libosmocore.git Ib482817b5f6a4e3c7299f6e0b3841143b60fc93d Depends: libosmocore.git I0c7a9c180dcafe64e6aebe53518d3d11e1f29886 Depends: libosmocore.git I4685376c8deb04db670684c9ebf685ad6fc989fa Related: OS#4396, OS#1572 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_lchan_common.c M src/host/trxcon/src/sched_lchan_desc.c M src/host/trxcon/src/sched_lchan_pdtch.c M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c M src/host/trxcon/src/sched_lchan_xcch.c M src/host/trxcon/src/sched_prim.c 10 files changed, 368 insertions(+), 103 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 98282c1..7d9a5b5 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -195,9 +195,9 @@ int8_t rssi; }; -/* Simple ring buffer (up to 8 unique measurements) */ +/* Simple ring buffer (up to 24 unique measurements) */ struct l1sched_lchan_meas_hist { - struct l1sched_meas_set buf[8]; + struct l1sched_meas_set buf[24]; struct l1sched_meas_set *head; }; @@ -213,9 +213,9 @@ /*! Burst type: GMSK or 8PSK */ enum l1sched_burst_type burst_type; /*! Mask of received bursts */ - uint8_t rx_burst_mask; + uint32_t rx_burst_mask; /*! Mask of transmitted bursts */ - uint8_t tx_burst_mask; + uint32_t tx_burst_mask; /*! Burst buffer for RX */ sbit_t *rx_bursts; /*! Burst buffer for TX */ @@ -386,7 +386,7 @@ /* Shared declarations for lchan handlers */ extern const uint8_t l1sched_nb_training_bits[8][26]; -const char *l1sched_burst_mask2str(const uint8_t *mask, int bits); +const char *l1sched_burst_mask2str(const uint32_t *mask, int bits); /* Interleaved TCH/H block TDMA frame mapping */ bool l1sched_tchh_block_map_fn(enum l1sched_lchan_type chan, diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h index 8a7e48e..83c61f0 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h @@ -7,7 +7,7 @@ #include <osmocom/core/timer.h> #include <osmocom/core/msgb.h> -#define L1CTL_LENGTH 256 +#define L1CTL_LENGTH 512 #define L1CTL_HEADROOM 32 /** diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index a45bc2c..0f6bd1b 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -44,7 +44,7 @@ #include <osmocom/bb/trxcon/trxcon.h> #include <osmocom/bb/trxcon/trxcon_fsm.h> -#define L1CTL_LENGTH 256 +#define L1CTL_LENGTH 512 #define L1CTL_HEADROOM 32 /* Logging categories configurable via trxcon_set_log_cfg() */ diff --git a/src/host/trxcon/src/sched_lchan_common.c b/src/host/trxcon/src/sched_lchan_common.c index 2308297..2b1729a 100644 --- a/src/host/trxcon/src/sched_lchan_common.c +++ b/src/host/trxcon/src/sched_lchan_common.c @@ -78,13 +78,12 @@ * Examples: " ****.." (incomplete, 4/6 bursts) * " ****" (complete, all 4 bursts) * "**.***.." (incomplete, 5/8 bursts) */ -const char *l1sched_burst_mask2str(const uint8_t *mask, int bits) +const char *l1sched_burst_mask2str(const uint32_t *mask, int bits) { - /* TODO: CSD is interleaved over 22 bursts, so the mask needs to be extended */ - static char buf[8 + 1]; + static char buf[32 + 1]; char *ptr = buf; - OSMO_ASSERT(bits <= 8 && bits > 0); + OSMO_ASSERT(bits <= 32 && bits > 0); while (--bits >= 0) *(ptr++) = (*mask & (1 << bits)) ? '*' : '.'; diff --git a/src/host/trxcon/src/sched_lchan_desc.c b/src/host/trxcon/src/sched_lchan_desc.c index 4943a71..db5446e 100644 --- a/src/host/trxcon/src/sched_lchan_desc.c +++ b/src/host/trxcon/src/sched_lchan_desc.c @@ -130,7 +130,7 @@ * * The MS shall continuously transmit bursts, even if there is nothing * to send, unless DTX (Discontinuous Transmission) is used. */ - .burst_buf_size = 8 * GSM_NBITS_NB_GMSK_PAYLOAD, + .burst_buf_size = 24 * GSM_NBITS_NB_GMSK_PAYLOAD, .rx_fn = rx_tchf_fn, .tx_fn = tx_tchf_fn, }, @@ -156,7 +156,7 @@ * * The MS shall continuously transmit bursts, even if there is nothing * to send, unless DTX (Discontinuous Transmission) is used. */ - .burst_buf_size = 6 * GSM_NBITS_NB_GMSK_PAYLOAD, + .burst_buf_size = 24 * GSM_NBITS_NB_GMSK_PAYLOAD, .rx_fn = rx_tchh_fn, .tx_fn = tx_tchh_fn, }, @@ -167,7 +167,7 @@ .link_id = L1SCHED_CH_LID_DEDIC, /* Same as for L1SCHED_TCHH_0, see above. */ - .burst_buf_size = 6 * GSM_NBITS_NB_GMSK_PAYLOAD, + .burst_buf_size = 24 * GSM_NBITS_NB_GMSK_PAYLOAD, .rx_fn = rx_tchh_fn, .tx_fn = tx_tchh_fn, }, diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c index 001a2d9..0f8a25f 100644 --- a/src/host/trxcon/src/sched_lchan_pdtch.c +++ b/src/host/trxcon/src/sched_lchan_pdtch.c @@ -36,10 +36,11 @@ int rx_pdtch_fn(struct l1sched_lchan_state *lchan, const struct l1sched_burst_ind *bi) { - uint8_t l2[GPRS_L2_MAX_LEN], *mask; + uint8_t l2[GPRS_L2_MAX_LEN]; int n_errors, n_bits_total, rc; sbit_t *bursts_p, *burst; size_t l2_len; + uint32_t *mask; /* Set up pointers */ mask = &lchan->rx_burst_mask; @@ -125,7 +126,7 @@ { ubit_t *bursts_p, *burst; const uint8_t *tsc; - uint8_t *mask; + uint32_t *mask; int rc; /* Set up pointers */ diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index 12bea57..ac9ee6b 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -3,7 +3,7 @@ * TDMA scheduler: handlers for DL / UL bursts on logical channels * * (C) 2017-2022 by Vadim Yanitskiy <axilirator(a)gmail.com> - * Contributions by sysmocom - s.f.m.c. GmbH + * (C) 2021-2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * All Rights Reserved * @@ -28,6 +28,7 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/gsm0502.h> #include <osmocom/coding/gsm0503_coding.h> #include <osmocom/coding/gsm0503_amr_dtx.h> @@ -36,6 +37,16 @@ #include <osmocom/bb/l1sched/l1sched.h> #include <osmocom/bb/l1sched/logging.h> +/* Burst Payload LENgth (short alias) */ +#define BPLEN GSM_NBITS_NB_GMSK_PAYLOAD + +/* Burst BUFfer capacity (in BPLEN units) */ +#define BUFMAX 24 + +/* Burst BUFfer position macros */ +#define BUFPOS(buf, n) &buf[(n) * BPLEN] +#define BUFTAIL8(buf) BUFPOS(buf, (BUFMAX - 8)) + /* 3GPP TS 45.009, table 3.2.1.3-{1,3}: AMR on Downlink TCH/F. * * +---+---+---+---+---+---+---+---+ @@ -57,14 +68,34 @@ [17] = 1, /* TCH/F: a=17 */ }; +static int decode_fr_facch(struct l1sched_lchan_state *lchan) +{ + uint8_t data[GSM_MACBLOCK_LEN]; + int n_errors, n_bits_total; + int rc; + + rc = gsm0503_tch_fr_facch_decode(&data[0], BUFTAIL8(lchan->rx_bursts), + &n_errors, &n_bits_total); + if (rc != GSM_MACBLOCK_LEN) + return rc; + + /* calculate AVG of the measurements (FACCH/F takes 8 bursts) */ + l1sched_lchan_meas_avg(lchan, 8); + + l1sched_lchan_emit_data_ind(lchan, &data[0], GSM_MACBLOCK_LEN, + n_errors, n_bits_total, false); + + return GSM_MACBLOCK_LEN; +} + int rx_tchf_fn(struct l1sched_lchan_state *lchan, const struct l1sched_burst_ind *bi) { int n_errors = -1, n_bits_total = 0, rc; sbit_t *bursts_p, *burst; - uint8_t tch_data[128]; + uint8_t tch_data[290]; size_t tch_data_len; - uint8_t *mask; + uint32_t *mask; int amr = 0; uint8_t ft; @@ -77,8 +108,8 @@ if (bi->bid == 0) { /* Shift the burst buffer by 4 bursts leftwards */ - memcpy(&bursts_p[0], &bursts_p[464], 464); - memset(&bursts_p[464], 0, 464); + memmove(BUFPOS(bursts_p, 0), BUFPOS(bursts_p, 4), 20 * BPLEN); + memset(BUFPOS(bursts_p, 20), 0, 4 * BPLEN); *mask = *mask << 4; } else { /* Align to the first burst of a block */ @@ -92,8 +123,8 @@ /* Store the measurements */ l1sched_lchan_meas_push(lchan, bi); - /* Copy burst to end of buffer of 8 bursts */ - burst = bursts_p + bi->bid * 116 + 464; + /* Copy burst to end of buffer of 24 bursts */ + burst = BUFPOS(bursts_p, 20 + bi->bid); memcpy(burst, bi->burst + 3, 58); memcpy(burst + 58, bi->burst + 87, 58); @@ -102,7 +133,7 @@ return 0; /* Calculate AVG of the measurements */ - l1sched_lchan_meas_avg(lchan, 8); + l1sched_lchan_meas_avg(lchan, 8); // XXX /* Check for complete set of bursts */ if ((*mask & 0xff) != 0xff) { @@ -115,15 +146,18 @@ } + /* TCH/F: speech and signalling frames are interleaved over 8 bursts, while + * CSD frames are interleaved over 22 bursts. Unless we're in CSD mode, + * decode only the last 8 bursts to avoid introducing additional delays. */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* FR */ - rc = gsm0503_tch_fr_decode(&tch_data[0], bursts_p, - 1, 0, &n_errors, &n_bits_total); + rc = gsm0503_tch_fr_decode(&tch_data[0], BUFTAIL8(bursts_p), + 1, 0, &n_errors, &n_bits_total); break; case GSM48_CMODE_SPEECH_EFR: /* EFR */ - rc = gsm0503_tch_fr_decode(&tch_data[0], bursts_p, - 1, 1, &n_errors, &n_bits_total); + rc = gsm0503_tch_fr_decode(&tch_data[0], BUFTAIL8(bursts_p), + 1, 1, &n_errors, &n_bits_total); break; case GSM48_CMODE_SPEECH_AMR: /* AMR */ /* we store tch_data + 2 header bytes, the amr variable set to @@ -131,7 +165,7 @@ * receive an FACCH frame instead of a voice frame (we do not * know this before we actually decode the frame) */ amr = 2; - rc = gsm0503_tch_afs_decode_dtx(&tch_data[amr], bursts_p, + rc = gsm0503_tch_afs_decode_dtx(&tch_data[amr], BUFTAIL8(bursts_p), !sched_tchf_dl_amr_cmi_map[bi->fn % 26], lchan->amr.codec, lchan->amr.codecs, @@ -156,6 +190,36 @@ "osmo_amr_rtp_enc() returned rc=%d\n", rc); } break; + /* CSD (TCH/F14.4): 14.5 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_14k5: + /* FACCH/F does not steal TCH/F14.4 frames, but only disturbs some bits */ + decode_fr_facch(lchan); + rc = gsm0503_tch_fr144_decode(&tch_data[0], BUFPOS(bursts_p, 0), + &n_errors, &n_bits_total); + break; + /* CSD (TCH/F9.6): 12.0 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_12k0: + /* FACCH/F does not steal TCH/F9.6 frames, but only disturbs some bits */ + decode_fr_facch(lchan); + rc = gsm0503_tch_fr96_decode(&tch_data[0], BUFPOS(bursts_p, 0), + &n_errors, &n_bits_total); + break; + /* CSD (TCH/F4.8): 6.0 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_6k0: + /* FACCH/F does not steal TCH/F4.8 frames, but only disturbs some bits */ + decode_fr_facch(lchan); + rc = gsm0503_tch_fr48_decode(&tch_data[0], BUFPOS(bursts_p, 0), + &n_errors, &n_bits_total); + break; + /* CSD (TCH/F2.4): 3.6 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_3k6: + /* TCH/F2.4 employs the same interleaving as TCH/FS (8 bursts), + * so FACCH/F *does* steal TCH/F2.4 frames completely. */ + if (decode_fr_facch(lchan) == GSM_MACBLOCK_LEN) + return 0; /* TODO: emit BFI? */ + rc = gsm0503_tch_fr24_decode(&tch_data[0], BUFTAIL8(bursts_p), + &n_errors, &n_bits_total); + break; default: LOGP_LCHAND(lchan, LOGL_ERROR, "Invalid TCH mode: %u\n", lchan->tch_mode); return -EINVAL; @@ -188,30 +252,13 @@ n_errors, n_bits_total, true); } -static struct msgb *prim_dequeue_tchf(struct l1sched_lchan_state *lchan) -{ - struct msgb *msg_facch; - struct msgb *msg_tch; - - /* dequeue a pair of TCH and FACCH frames */ - msg_tch = l1sched_lchan_prim_dequeue_tch(lchan, false); - msg_facch = l1sched_lchan_prim_dequeue_tch(lchan, true); - - /* prioritize FACCH over TCH */ - if (msg_facch != NULL) { - msgb_free(msg_tch); /* drop one TCH/FS block */ - return msg_facch; - } - - return msg_tch; -} - int tx_tchf_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br) { + struct msgb *msg_facch, *msg_tch, *msg; ubit_t *bursts_p, *burst; const uint8_t *tsc; - uint8_t *mask; + uint32_t *mask; int rc; /* Set up pointers */ @@ -225,11 +272,15 @@ } /* Shift the burst buffer by 4 bursts leftwards for interleaving */ - memcpy(&bursts_p[0], &bursts_p[464], 464); - memset(&bursts_p[464], 0, 464); + memmove(BUFPOS(bursts_p, 0), BUFPOS(bursts_p, 4), 20 * BPLEN); + memset(BUFPOS(bursts_p, 20), 0, 4 * BPLEN); *mask = *mask << 4; - struct msgb *msg = prim_dequeue_tchf(lchan); + /* dequeue a pair of TCH and FACCH frames */ + msg_tch = l1sched_lchan_prim_dequeue_tch(lchan, false); + msg_facch = l1sched_lchan_prim_dequeue_tch(lchan, true); + /* prioritize FACCH over TCH */ + msg = (msg_facch != NULL) ? msg_facch : msg_tch; /* populate the buffer with bursts */ switch (lchan->tch_mode) { @@ -244,7 +295,7 @@ gsm0503_tch_fr_encode(bursts_p, NULL, 0, 1); goto send_burst; } - rc = gsm0503_tch_fr_encode(bursts_p, + rc = gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), msgb_l2(msg), msgb_l2len(msg), 1); break; @@ -268,7 +319,7 @@ data += 2; } - rc = gsm0503_tch_afs_encode(bursts_p, + rc = gsm0503_tch_afs_encode(BUFPOS(bursts_p, 0), data, data_len, amr_fn_is_cmr, lchan->amr.codec, @@ -277,6 +328,60 @@ lchan->amr.ul_cmr); break; } + /* CSD (TCH/F14.4): 14.5 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_14k5: + if ((msg = msg_tch) != NULL) { + OSMO_ASSERT(msgb_l2len(msg) == 290); + gsm0503_tch_fr144_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + /* Confirm data sending (pass ownership of the msgb/prim) */ + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } /* else: all bits of this frame are set to zero */ + if ((msg = msg_facch) != NULL) { + gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + /* Confirm FACCH sending (pass ownership of the msgb/prim) */ + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } + goto send_burst; + /* CSD (TCH/F9.6): 12.0 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_12k0: + if ((msg = msg_tch) != NULL) { + OSMO_ASSERT(msgb_l2len(msg) == 4 * 60); + gsm0503_tch_fr96_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + /* Confirm data sending (pass ownership of the msgb/prim) */ + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } /* else: all bits of this frame are set to zero */ + if ((msg = msg_facch) != NULL) { + gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + /* Confirm FACCH sending (pass ownership of the msgb/prim) */ + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } + goto send_burst; + /* CSD (TCH/F4.8): 6.0 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_6k0: + if ((msg = msg_tch) != NULL) { + OSMO_ASSERT(msgb_l2len(msg) == 2 * 60); + gsm0503_tch_fr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + /* Confirm data sending (pass ownership of the msgb/prim) */ + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } /* else: all bits of this frame are set to zero */ + if ((msg = msg_facch) != NULL) { + gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + /* Confirm FACCH sending (pass ownership of the msgb/prim) */ + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } + goto send_burst; + /* CSD (TCH/F2.4): 3.6 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_3k6: + if (msg == NULL) + goto send_burst; + if (msg == msg_facch) { + /* FACCH/F does steal a TCH/F2.4 frame completely */ + rc = gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + } else { + OSMO_ASSERT(msgb_l2len(msg) == 2 * 36); + rc = gsm0503_tch_fr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + } + break; default: LOGP_LCHAND(lchan, LOGL_ERROR, "TCH mode %s is unknown or not supported\n", @@ -288,16 +393,18 @@ LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload (len=%u): %s\n", msgb_l2len(msg), msgb_hexdump_l2(msg)); free_bad_msg: - msgb_free(msg); + msgb_free(msg_facch); + msgb_free(msg_tch); return -EINVAL; } /* Confirm data / traffic sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + msgb_free((msg == msg_facch) ? msg_tch : msg_facch); send_burst: /* Determine which burst should be sent */ - burst = bursts_p + br->bid * 116; + burst = BUFPOS(bursts_p, br->bid); /* Update mask */ *mask |= (1 << br->bid); diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index 38aef34..0932cce 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -4,7 +4,7 @@ * * (C) 2018-2022 by Vadim Yanitskiy <axilirator(a)gmail.com> * (C) 2018 by Harald Welte <laforge(a)gnumonks.org> - * Contributions by sysmocom - s.f.m.c. GmbH + * (C) 2020-2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * All Rights Reserved * @@ -31,6 +31,7 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/gsm0502.h> #include <osmocom/coding/gsm0503_coding.h> #include <osmocom/coding/gsm0503_amr_dtx.h> @@ -39,6 +40,16 @@ #include <osmocom/bb/l1sched/l1sched.h> #include <osmocom/bb/l1sched/logging.h> +/* Burst Payload LENgth (short alias) */ +#define BPLEN GSM_NBITS_NB_GMSK_PAYLOAD + +/* Burst BUFfer capacity (in BPLEN units) */ +#define BUFMAX 24 + +/* Burst BUFfer position macros */ +#define BUFPOS(buf, n) &buf[(n) * BPLEN] +#define BUFTAIL8(buf) BUFPOS(buf, (BUFMAX - 8)) + /* 3GPP TS 45.009, table 3.2.1.3-{2,4}: AMR on Downlink TCH/H. * * +---+---+---+---+---+---+ @@ -123,6 +134,41 @@ [7] = 1, /* FACCH/H(1): B2(22,24,1,3,5,7) */ }; +/* 3GPP TS 45.002, table 2 in clause 7: Mapping tables for TCH/H2.4 and TCH/H4.8. + * + * +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ + * | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v | + * +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ + * + * TCH/H(0): B0(0,2,4,6,8,10,13,15,17,19,21,23,0,2,4,6,8,10,13,15,17,19) + * TCH/H(1): B0(1,3,5,7,9,11,14,16,18,20,22,24,1,3,5,7,9,11,14,16,18,20) + * TCH/H(0): B1(8,10,13,15,17,19,21,23,0,2,4,6,8,10,13,15,17,19,21,23,0,2) + * TCH/H(1): B1(9,11,14,16,18,20,22,24,1,3,5,7,9,11,14,16,18,20,22,24,1,3) + * TCH/H(0): B2(17,19,21,23,0,2,4,6,8,10,13,15,17,19,21,23,0,2,4,6,8,10) + * TCH/H(1): B2(18,20,22,24,1,3,5,7,9,11,14,16,18,20,22,24,1,3,5,7,9,11) + * + * TDMA frame number of burst 'a' % 26 is the table index. + * This mapping is valid for both TCH/H(0) and TCH/H(1). */ +static const uint8_t sched_tchh_ul_csd_map[26] = { + [0] = 1, /* TCH/H(0): B0(0 ... 19) */ + [1] = 1, /* TCH/H(1): B0(1 ... 20) */ + [8] = 1, /* TCH/H(0): B1(8 ... 2) */ + [9] = 1, /* TCH/H(1): B1(9 ... 3) */ + [17] = 1, /* TCH/H(0): B2(17 ... 10) */ + [18] = 1, /* TCH/H(1): B2(18 ... 11) */ +}; + +/* TDMA frame number of burst 'v' % 26 is the table index. + * This mapping is valid for both TCH/H(0) and TCH/H(1). */ +static const uint8_t sched_tchh_dl_csd_map[26] = { + [19] = 1, /* TCH/H(0): B0(0 ... 19) */ + [20] = 1, /* TCH/H(1): B0(1 ... 20) */ + [2] = 1, /* TCH/H(0): B1(8 ... 2) */ + [3] = 1, /* TCH/H(1): B1(9 ... 3) */ + [10] = 1, /* TCH/H(0): B2(17 ... 10) */ + [11] = 1, /* TCH/H(1): B2(18 ... 11) */ +}; + /** * Can a TCH/H block transmission be initiated / finished * on a given frame number and a given channel type? @@ -180,14 +226,34 @@ return false; } +static int decode_hr_facch(struct l1sched_lchan_state *lchan) +{ + uint8_t data[GSM_MACBLOCK_LEN]; + int n_errors, n_bits_total; + int rc; + + rc = gsm0503_tch_hr_facch_decode(&data[0], BUFTAIL8(lchan->rx_bursts), + &n_errors, &n_bits_total); + if (rc != GSM_MACBLOCK_LEN) + return rc; + + /* calculate AVG of the measurements (FACCH/H takes 6 bursts) */ + l1sched_lchan_meas_avg(lchan, 6); + + l1sched_lchan_emit_data_ind(lchan, &data[0], GSM_MACBLOCK_LEN, + n_errors, n_bits_total, false); + + return GSM_MACBLOCK_LEN; +} + int rx_tchh_fn(struct l1sched_lchan_state *lchan, const struct l1sched_burst_ind *bi) { int n_errors = -1, n_bits_total = 0, rc; sbit_t *bursts_p, *burst; - uint8_t tch_data[128]; + uint8_t tch_data[240]; size_t tch_data_len; - uint8_t *mask; + uint32_t *mask; int amr = 0; uint8_t ft; @@ -200,9 +266,8 @@ if (bi->bid == 0) { /* Shift the burst buffer by 2 bursts leftwards */ - memcpy(&bursts_p[0], &bursts_p[232], 232); - memcpy(&bursts_p[232], &bursts_p[464], 232); - memset(&bursts_p[464], 0, 232); + memmove(BUFPOS(bursts_p, 0), BUFPOS(bursts_p, 2), 20 * BPLEN); + memset(BUFPOS(bursts_p, 20), 0, 2 * BPLEN); *mask = *mask << 2; } @@ -215,9 +280,6 @@ if (lchan->tch_mode == GSM48_CMODE_SIGN) { if (!l1sched_tchh_facch_start(lchan->type, bi->fn, 0)) return 0; - } else { /* or TCH/H traffic frame */ - if (!l1sched_tchh_traffic_start(lchan->type, bi->fn, 0)) - return 0; } } @@ -227,8 +289,8 @@ /* Store the measurements */ l1sched_lchan_meas_push(lchan, bi); - /* Copy burst to the end of buffer of 6 bursts */ - burst = bursts_p + bi->bid * 116 + 464; + /* Copy burst to the end of buffer of 24 bursts */ + burst = BUFPOS(bursts_p, 20 + bi->bid); memcpy(burst, bi->burst + 3, 58); memcpy(burst + 58, bi->burst + 87, 58); @@ -236,6 +298,28 @@ if (bi->bid != 1) return 0; + /* Wait for complete set of bursts */ + switch (lchan->tch_mode) { + case GSM48_CMODE_SIGN: + /* FACCH/H is interleaved over 6 bursts */ + if ((*mask & 0x3f) != 0x3f) + return 0; + break; + case GSM48_CMODE_DATA_6k0: + case GSM48_CMODE_DATA_3k6: + /* Data (CSD) is interleaved over 22 bursts */ + if ((*mask & 0x3fffff) != 0x3fffff) + return 0; + if (!sched_tchh_dl_csd_map[bi->fn % 26]) + return 0; /* CSD: skip decoding attempt, need 2 more bursts */ + break; + default: + /* Speech is interleaved over 4 bursts */ + if ((*mask & 0x0f) != 0x0f) + return 0; + break; + } + /* Skip decoding attempt in case of FACCH/H */ if (lchan->dl_ongoing_facch) { /* Send BFI (DATA.ind without payload) for the 2nd stolen TCH frame */ @@ -245,17 +329,21 @@ return 0; } + /* TCH/H: speech and signalling frames are interleaved over 4 and 6 bursts, + * respectively, while CSD frames are interleaved over 22 bursts. Unless + * we're in CSD mode, decode only the last 6 bursts to avoid introducing + * additional delays. */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* HR */ - rc = gsm0503_tch_hr_decode(&tch_data[0], bursts_p, + rc = gsm0503_tch_hr_decode(&tch_data[0], BUFTAIL8(bursts_p), !sched_tchh_dl_facch_map[bi->fn % 26], &n_errors, &n_bits_total); break; case GSM48_CMODE_SPEECH_AMR: /* AMR */ /* See comment in function rx_tchf_fn() */ amr = 2; - rc = gsm0503_tch_ahs_decode_dtx(&tch_data[amr], bursts_p, + rc = gsm0503_tch_ahs_decode_dtx(&tch_data[amr], BUFTAIL8(bursts_p), !sched_tchh_dl_facch_map[bi->fn % 26], !sched_tchh_dl_amr_cmi_map[bi->fn % 26], lchan->amr.codec, @@ -281,6 +369,20 @@ "osmo_amr_rtp_enc() returned rc=%d\n", rc); } break; + /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_6k0: + /* FACCH/H does not steal TCH/H4.8 frames, but only disturbs some bits */ + decode_hr_facch(lchan); + rc = gsm0503_tch_hr48_decode(&tch_data[0], BUFPOS(bursts_p, 0), + &n_errors, &n_bits_total); + break; + /* CSD (TCH/H2.4): 3.6 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_3k6: + /* FACCH/H does not steal TCH/H2.4 frames, but only disturbs some bits */ + decode_hr_facch(lchan); + rc = gsm0503_tch_hr24_decode(&tch_data[0], BUFPOS(bursts_p, 0), + &n_errors, &n_bits_total); + break; default: LOGP_LCHAND(lchan, LOGL_ERROR, "Invalid TCH mode: %u\n", lchan->tch_mode); return -EINVAL; @@ -322,33 +424,13 @@ n_errors, n_bits_total, true); } -static struct msgb *prim_dequeue_tchh(struct l1sched_lchan_state *lchan, uint32_t fn) -{ - struct msgb *msg_facch; - struct msgb *msg_tch; - - /* dequeue a pair of TCH and FACCH frames */ - msg_tch = l1sched_lchan_prim_dequeue_tch(lchan, false); - if (l1sched_tchh_facch_start(lchan->type, fn, true)) - msg_facch = l1sched_lchan_prim_dequeue_tch(lchan, true); - else - msg_facch = NULL; - - /* prioritize FACCH over TCH */ - if (msg_facch != NULL) { - msgb_free(msg_tch); /* drop 1st TCH/HS block */ - return msg_facch; - } - - return msg_tch; -} - int tx_tchh_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br) { + struct msgb *msg_facch, *msg_tch, *msg; ubit_t *bursts_p, *burst; const uint8_t *tsc; - uint8_t *mask; + uint32_t *mask; int rc; /* Set up pointers */ @@ -362,16 +444,23 @@ } if (*mask == 0x00) { - /* Align transmission of the first FACCH/H frame */ - if (lchan->tch_mode == GSM48_CMODE_SIGN) + /* Align transmission of the first frame */ + switch (lchan->tch_mode) { + case GSM48_CMODE_SIGN: if (!l1sched_tchh_facch_start(lchan->type, br->fn, 1)) return 0; + break; + case GSM48_CMODE_DATA_6k0: + case GSM48_CMODE_DATA_3k6: + if (!sched_tchh_ul_csd_map[br->fn % 26]) + return 0; + break; + } } /* Shift the burst buffer by 2 bursts leftwards for interleaving */ - memcpy(&bursts_p[0], &bursts_p[232], 232); - memcpy(&bursts_p[232], &bursts_p[464], 232); - memset(&bursts_p[464], 0, 232); + memmove(BUFPOS(bursts_p, 0), BUFPOS(bursts_p, 2), 20 * BPLEN); + memset(BUFPOS(bursts_p, 20), 0, 2 * BPLEN); *mask = *mask << 2; /* If FACCH/H blocks are still pending */ @@ -381,7 +470,23 @@ goto send_burst; } - struct msgb *msg = prim_dequeue_tchh(lchan, br->fn); + switch (lchan->tch_mode) { + case GSM48_CMODE_DATA_6k0: + case GSM48_CMODE_DATA_3k6: + /* CSD: skip dequeueing/encoding, send 2 more bursts */ + if (!sched_tchh_ul_csd_map[br->fn % 26]) + goto send_burst; + break; + } + + /* dequeue a pair of TCH and FACCH frames */ + msg_tch = l1sched_lchan_prim_dequeue_tch(lchan, false); + if (l1sched_tchh_facch_start(lchan->type, br->fn, true)) + msg_facch = l1sched_lchan_prim_dequeue_tch(lchan, true); + else + msg_facch = NULL; + /* prioritize FACCH over TCH */ + msg = (msg_facch != NULL) ? msg_facch : msg_tch; /* populate the buffer with bursts */ switch (lchan->tch_mode) { @@ -397,7 +502,7 @@ gsm0503_tch_hr_encode(bursts_p, NULL, 0); goto send_burst; } - rc = gsm0503_tch_hr_encode(bursts_p, + rc = gsm0503_tch_hr_encode(BUFPOS(bursts_p, 0), msgb_l2(msg), msgb_l2len(msg)); break; @@ -421,7 +526,7 @@ data += 2; } - rc = gsm0503_tch_ahs_encode(bursts_p, + rc = gsm0503_tch_ahs_encode(BUFPOS(bursts_p, 0), data, data_len, amr_fn_is_cmr, lchan->amr.codec, @@ -430,6 +535,34 @@ lchan->amr.ul_cmr); break; } + /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_6k0: + if ((msg = msg_tch) != NULL) { + OSMO_ASSERT(msgb_l2len(msg) == 4 * 60); + gsm0503_tch_hr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + /* Confirm data sending (pass ownership of the msgb/prim) */ + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } /* else: all bits of this frame are set to zero */ + if ((msg = msg_facch) != NULL) { + gsm0503_tch_hr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + /* Confirm FACCH sending (pass ownership of the msgb/prim) */ + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } + goto send_burst; + /* CSD (TCH/H2.4): 3.6 kbit/s radio interface rate */ + case GSM48_CMODE_DATA_3k6: + if ((msg = msg_tch) != NULL) { + OSMO_ASSERT(msgb_l2len(msg) == 4 * 36); + gsm0503_tch_hr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + /* Confirm data sending (pass ownership of the msgb/prim) */ + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } /* else: all bits of this frame are set to zero */ + if ((msg = msg_facch) != NULL) { + gsm0503_tch_hr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + /* Confirm FACCH sending (pass ownership of the msgb/prim) */ + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } + goto send_burst; default: LOGP_LCHAND(lchan, LOGL_ERROR, "TCH mode %s is unknown or not supported\n", @@ -441,7 +574,8 @@ LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload (len=%u): %s\n", msgb_l2len(msg), msgb_hexdump_l2(msg)); free_bad_msg: - msgb_free(msg); + msgb_free(msg_facch); + msgb_free(msg_tch); return -EINVAL; } @@ -450,10 +584,11 @@ /* Confirm data / traffic sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + msgb_free((msg == msg_facch) ? msg_tch : msg_facch); send_burst: /* Determine which burst should be sent */ - burst = bursts_p + br->bid * 116; + burst = BUFPOS(bursts_p, br->bid); /* Update mask */ *mask |= (1 << br->bid); diff --git a/src/host/trxcon/src/sched_lchan_xcch.c b/src/host/trxcon/src/sched_lchan_xcch.c index b3863d5..52b5d1e 100644 --- a/src/host/trxcon/src/sched_lchan_xcch.c +++ b/src/host/trxcon/src/sched_lchan_xcch.c @@ -36,9 +36,10 @@ int rx_data_fn(struct l1sched_lchan_state *lchan, const struct l1sched_burst_ind *bi) { - uint8_t l2[GSM_MACBLOCK_LEN], *mask; + uint8_t l2[GSM_MACBLOCK_LEN]; int n_errors, n_bits_total, rc; sbit_t *bursts_p, *burst; + uint32_t *mask; /* Set up pointers */ mask = &lchan->rx_burst_mask; @@ -124,7 +125,7 @@ { ubit_t *bursts_p, *burst; const uint8_t *tsc; - uint8_t *mask; + uint32_t *mask; int rc; /* Set up pointers */ diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 2597d84..c4c80f8 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -36,7 +36,7 @@ #include <osmocom/bb/l1sched/logging.h> #define L1SCHED_PRIM_HEADROOM 64 -#define L1SCHED_PRIM_TAILROOM 64 +#define L1SCHED_PRIM_TAILROOM 512 osmo_static_assert(sizeof(struct l1sched_prim) <= L1SCHED_PRIM_HEADROOM, l1sched_prim_size); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0d7389a9a5f7019b9316ab1c0115797ff54a0e41 Gerrit-Change-Number: 32922 Gerrit-PatchSet: 13 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[L] Change in osmocom-bb[master]: trxcon/l1sched: implement CSD scheduling support

by fixeria

Attention is currently required from: Hoernchen, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32922 ) Change subject: trxcon/l1sched: implement CSD scheduling support ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0d7389a9a5f7019b9316ab1c0115797ff54a0e41 Gerrit-Change-Number: 32922 Gerrit-PatchSet: 12 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 27 Aug 2023 07:14:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library: L1CTL: add 'start_fn' field to UL/DL TBF CFG.req messages

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34220 ) Change subject: library: L1CTL: add 'start_fn' field to UL/DL TBF CFG.req messages ...................................................................... library: L1CTL: add 'start_fn' field to UL/DL TBF CFG.req messages Change-Id: I800e4813671e92f6010945d58dfe6297302c6f13 Related: osmocom-bb.git Ibb6a05165fe1c81268fb0e3674adae4065e78171 Related: OS#5500, OS#6147 --- M library/L1CTL_Types.ttcn 1 file changed, 29 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/34220/1 diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index fe56459..73e09fc 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -315,7 +315,8 @@ type record L1ctlGprsUlTbfCfgReq { uint8_t tbf_ref, BIT8 slotmask, - OCT2 pad ('0000'O) + OCT2 pad ('0000'O), + uint32_t start_fn /* TBF Starting Time (absolute Fn) */ } with { variant (slotmask) "BITORDER(msb)" }; /* payload of L1CTL_GPRS_DL_TBF_CFG_REQ */ @@ -323,7 +324,8 @@ uint8_t tbf_ref, BIT8 slotmask, uint8_t dl_tfi, - OCT1 pad ('00'O) + OCT1 pad ('00'O), + uint32_t start_fn /* TBF Starting Time (absolute Fn) */ } with { variant (slotmask) "BITORDER(msb)" }; /* part of L1CTL_GPRS_{UL,DL}_BLOCK_{REQ,IND} */ @@ -863,7 +865,8 @@ template (value) L1ctlMessage ts_L1CTL_GPRS_UL_TBF_CFG_REQ(template (value) uint8_t tbf_ref, - template (value) BIT8 slotmask := '00000000'B) := { + template (value) BIT8 slotmask := '00000000'B, + template (value) uint32_t start_fn := c_UINT32_MAX) := { header := ts_L1ctlHeader(L1CTL_GPRS_UL_TBF_CFG_REQ), ul_info := omit, dl_info := omit, @@ -871,13 +874,15 @@ ul_tbf_cfg_req := { tbf_ref := tbf_ref, slotmask := slotmask, - pad := '0000'O + pad := '0000'O, + start_fn := start_fn } } }; template L1ctlMessage tr_L1CTL_GPRS_UL_TBF_CFG_REQ(template (present) uint8_t tbf_ref := ?, - template (present) BIT8 slotmask := ?) := { + template (present) BIT8 slotmask := ?, + template (present) uint32_t start_fn := ?) := { header := tr_L1ctlHeader(L1CTL_GPRS_UL_TBF_CFG_REQ), ul_info := omit, dl_info := omit, @@ -885,7 +890,8 @@ ul_tbf_cfg_req := { tbf_ref := tbf_ref, slotmask := slotmask, - pad := ? + pad := ?, + start_fn := start_fn } } }; @@ -893,6 +899,7 @@ template (value) L1ctlMessage ts_L1CTL_GPRS_DL_TBF_CFG_REQ(template (value) uint8_t tbf_ref, template (value) BIT8 slotmask := '00000000'B, + template (value) uint32_t start_fn := c_UINT32_MAX, template (value) uint5_t dl_tfi := 0) := { header := ts_L1ctlHeader(L1CTL_GPRS_DL_TBF_CFG_REQ), ul_info := omit, @@ -902,13 +909,15 @@ tbf_ref := tbf_ref, slotmask := slotmask, dl_tfi := dl_tfi, - pad := '00'O + pad := '00'O, + start_fn := start_fn } } }; template L1ctlMessage tr_L1CTL_GPRS_DL_TBF_CFG_REQ(template (present) uint8_t tbf_ref := ?, template (present) BIT8 slotmask := ?, + template (present) uint32_t start_fn := ?, template (present) uint5_t dl_tfi := ?) := { header := tr_L1ctlHeader(L1CTL_GPRS_DL_TBF_CFG_REQ), ul_info := omit, @@ -918,7 +927,8 @@ tbf_ref := tbf_ref, slotmask := slotmask, dl_tfi := dl_tfi, - pad := ? + pad := ?, + start_fn := start_fn } } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34220 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: I800e4813671e92f6010945d58dfe6297302c6f13 Gerrit-Change-Number: 34220 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs: Add nightly job for ttcn3-dia2gsup-test

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34214 ) Change subject: jobs: Add nightly job for ttcn3-dia2gsup-test ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icb1a18da0daea1b481b4633eed2de817bfd5a15a Gerrit-Change-Number: 34214 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: Sat, 26 Aug 2023 20:08:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 ) Change subject: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2 ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068/comment/233d6729_c1d3… PS2, Line 15: PCU_IF_SAPI_AGCH_DT Did you mean `PCU_IF_SAPI_AGCH_2` here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 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: Ife67bde444d957822a953391b80d01d49fff064b Gerrit-Change-Number: 34068 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Aug 2023 20:06:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: debian-*-erlang: Install on libsctp-dev to enable sctp support in erl...

by laforge

Attention is currently required from: osmith, pespin, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34200 ) Change subject: debian-*-erlang: Install on libsctp-dev to enable sctp support in erlang apps ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: If this is a runtime dependency on the library itself, then why are we installing the development header files? The former is only required at compile time (of erlang), right? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5ca332f9064c16491116608577b3f68379d840e6 Gerrit-Change-Number: 34200 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Aug 2023 07:28:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: diameter: Fix order of AVPs in tr_DIA_AIA

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34211 ) Change subject: diameter: Fix order of AVPs in tr_DIA_AIA ...................................................................... diameter: Fix order of AVPs in tr_DIA_AIA Put them in the order they are specified and transmitted in the wire. Change-Id: Ib7ced55a5986e4b9b69529622625ae3694a4d44d --- M library/DIAMETER_Templates.ttcn 1 file changed, 14 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index e13e31f..85725fc 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -1408,11 +1408,11 @@ ete_id := ete_id, avps := superset( tr_AVP_SessionId(sess_id), - tr_AVP_ResultCode(DIAMETER_SUCCESS), tr_AVP_AuthSessionState(NO_STATE_MAINTAINED), - tr_AVP_3GPP_AuthInfo(auth_info_contents), tr_AVP_OriginHost(orig_host), - tr_AVP_OriginRealm(orig_realm) + tr_AVP_OriginRealm(orig_realm), + tr_AVP_ResultCode(DIAMETER_SUCCESS), + tr_AVP_3GPP_AuthInfo(auth_info_contents) )); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34211 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: Ib7ced55a5986e4b9b69529622625ae3694a4d44d Gerrit-Change-Number: 34211 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: dia2gsup: Introduce initial testsuite

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34213 ) Change subject: dia2gsup: Introduce initial testsuite ...................................................................... dia2gsup: Introduce initial testsuite This testsuite contains 1 working test so far. Related: OS#5757 Change-Id: Ia3db9fd62249777cd7c63f6c4af1568c79468728 --- M Makefile A dia2gsup/DIA2GSUP_Tests.cfg A dia2gsup/DIA2GSUP_Tests.default A dia2gsup/DIA2GSUP_Tests.ttcn A dia2gsup/gen_links.sh A dia2gsup/regen_makefile.sh 6 files changed, 327 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Makefile b/Makefile index c399714..1d119d1 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ bts \ cbc \ ccid \ + dia2gsup \ fr \ fr-net \ gbproxy \ diff --git a/dia2gsup/DIA2GSUP_Tests.cfg b/dia2gsup/DIA2GSUP_Tests.cfg new file mode 100644 index 0000000..0c166fe --- /dev/null +++ b/dia2gsup/DIA2GSUP_Tests.cfg @@ -0,0 +1,19 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./DIA2GSUP_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +DIA2GSUP_Tests.control diff --git a/dia2gsup/DIA2GSUP_Tests.default b/dia2gsup/DIA2GSUP_Tests.default new file mode 100644 index 0000000..95b42e9 --- /dev/null +++ b/dia2gsup/DIA2GSUP_Tests.default @@ -0,0 +1,8 @@ +[LOGGING] +mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING; // | DEBUG_ENCDEC; + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + +[EXECUTE] diff --git a/dia2gsup/DIA2GSUP_Tests.ttcn b/dia2gsup/DIA2GSUP_Tests.ttcn new file mode 100644 index 0000000..d709512 --- /dev/null +++ b/dia2gsup/DIA2GSUP_Tests.ttcn @@ -0,0 +1,217 @@ +module DIA2GSUP_Tests { + +import from General_Types all; +import from Osmocom_Types all; +import from L3_Common all; + +import from IPA_Emulation all; +import from GSUP_Emulation all; +import from GSUP_Types all; + +import from DIAMETER_Types all; +import from DIAMETER_Templates all; +import from DIAMETER_Emulation all; + +type component MTC_CT { + var DIAMETER_Emulation_CT vc_DIAMETER; + port DIAMETER_PT DIAMETER_UNIT; + port DIAMETEREM_PROC_PT DIAMETER_PROC; + + var GSUP_Emulation_CT vc_GSUP; + var IPA_Emulation_CT vc_GSUP_IPA; + port IPA_CTRL_PT GSUP_IPA_EVENT; + +}; + +type component D2G_ConnHdlr extends DIAMETER_ConnHdlr, GSUP_ConnHdlr { + var D2G_ConnHdlrPars g_pars; + timer g_Tguard := 30.0; +}; + +type record D2G_ConnHdlrPars { + hexstring imsi, + AuthVector vec optional +}; + +private function f_init_pars(integer imsi_suffix) +runs on MTC_CT return D2G_ConnHdlrPars { + var D2G_ConnHdlrPars pars := { + imsi := f_gen_imsi(imsi_suffix), + vec := f_gen_auth_vec_3g() + }; + return pars; +} + + +modulepar { + /* our emulated GSUP HLR */ + charstring mp_hlr_ip := "127.0.0.1"; + integer mp_hlr_port := 4222; + + /* our emulated MME */ + charstring mp_s6_local_ip := "127.0.0.100"; + integer mp_s6_local_port := 3868; + + /* IUT behaving as HSS */ + charstring mp_hss_ip := "127.0.0.4"; + integer mp_hss_port := 3868; + + charstring mp_diam_realm := "localdomain"; +} + +private altstep as_Tguard() runs on D2G_ConnHdlr { + [] g_Tguard.timeout { + setverdict(fail, "Tguard timeout"); + mtc.stop; + } +} + +private function f_init_gsup(charstring id) runs on MTC_CT { + id := id & "-GSUP"; + var GsupOps ops := { + create_cb := refers(GSUP_Emulation.ExpectedCreateCallback) + }; + + vc_GSUP_IPA := IPA_Emulation_CT.create(id & "-IPA"); + vc_GSUP := GSUP_Emulation_CT.create(id); + + map(vc_GSUP_IPA:IPA_PORT, system:IPA_CODEC_PT); + connect(vc_GSUP:GSUP, vc_GSUP_IPA:IPA_GSUP_PORT); + /* we use this hack to get events like ASP_IPA_EVENT_UP */ + connect(vc_GSUP_IPA:IPA_CTRL_PORT, self:GSUP_IPA_EVENT); + + vc_GSUP.start(GSUP_Emulation.main(ops, id)); + vc_GSUP_IPA.start(IPA_Emulation.main_server(mp_hlr_ip, mp_hlr_port)); + + /* wait for incoming connection to GSUP port before proceeding */ + timer T := 10.0; + T.start; + alt { + [] GSUP_IPA_EVENT.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP)) { } + [] T.timeout { + setverdict(fail, "No connection to GSUP Port"); + mtc.stop; + } + } +} + +private function f_init_handler(D2G_ConnHdlrPars pars, float t_guard := 20.0) runs on D2G_ConnHdlr { + g_pars := pars; + activate(as_Tguard()); + g_Tguard.start(t_guard); + + /* tell GSUP dispatcher to send this IMSI to us */ + f_create_gsup_expect(hex2str(g_pars.imsi)); +} + +private type function void_fn(charstring id, D2G_ConnHdlrPars pars) runs on D2G_ConnHdlr; + +private function f_start_handler_with_pars(void_fn fn, D2G_ConnHdlrPars pars) +runs on MTC_CT return D2G_ConnHdlr { + var D2G_ConnHdlr vc_conn; + var charstring id := testcasename(); + + vc_conn := D2G_ConnHdlr.create(id); + + connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); + connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); + + connect(vc_conn:DIAMETER, vc_DIAMETER:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC, vc_DIAMETER:DIAMETER_PROC); + + DIAMETER_UNIT.receive(DiameterCapabilityExchgInd:?); + + vc_conn.start(derefers(fn)(id, pars)); + return vc_conn; +} + +private function DiameterForwardUnitdataCallback(PDU_DIAMETER msg) +runs on DIAMETER_Emulation_CT return template PDU_DIAMETER { + DIAMETER_UNIT.send(msg); + return omit; +} + +private function f_init_diameter(charstring id) runs on MTC_CT { + var DIAMETEROps ops := { + create_cb := refers(DIAMETER_Emulation.ExpectedCreateCallback), + unitdata_cb := refers(DiameterForwardUnitdataCallback), + raw := false /* handler mode (IMSI based routing) */ + }; + var DIAMETER_conn_parameters pars := { + remote_ip := mp_hss_ip, + remote_sctp_port := mp_hss_port, + local_ip := mp_s6_local_ip, + local_sctp_port := mp_s6_local_port, + origin_host := "hss." & mp_diam_realm, + origin_realm := mp_diam_realm, + auth_app_id := omit, + vendor_app_id := c_DIAMETER_3GPP_S6_AID + }; + vc_DIAMETER := DIAMETER_Emulation_CT.create(id); + map(vc_DIAMETER:DIAMETER, system:DIAMETER_CODEC_PT); + connect(vc_DIAMETER:DIAMETER_UNIT, self:DIAMETER_UNIT); + connect(vc_DIAMETER:DIAMETER_PROC, self:DIAMETER_PROC); + vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id)); +} + +private function f_init() runs on MTC_CT { + f_init_gsup(testcasename()); + f_init_diameter(testcasename()); +} + + +private function f_DIA_AI() runs on D2G_ConnHdlr { + var PDU_DIAMETER rx_dia; + var UINT32 hbh_id := f_rnd_octstring(4); + var UINT32 ete_id := f_rnd_octstring(4); + var octetstring sess_id := char2oct("foobar"); + var OCT3 vplmn := '00F110'O; + + /* Unlike AIR, AIA contains no IMSI. Register ete_id in DIAMETER_Emulation, + * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. + */ + f_diameter_expect_eteid(ete_id); + + /* Send AIR to translator; expect it to show up on GSUP side */ + DIAMETER.send(ts_DIA_AIR(g_pars.imsi, vplmn, sess_id, hbh_id := hbh_id, ete_id := ete_id)); + GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); + + /* Send a positive response back to the translator; expect AIA */ + var GSUP_IE auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc, + g_pars.vec.ik, + g_pars.vec.ck, + g_pars.vec.autn, + g_pars.vec.res)); + GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); + + alt { + /* Unlike AIR, AIA contains no IMSI, hence it is received in DIAMETER_UNIT: */ + [] DIAMETER.receive(tr_DIA_AIA) { + setverdict(pass); + } + } +} + +private function f_TC_authinfo_normal(charstring id, D2G_ConnHdlrPars pars) runs on D2G_ConnHdlr { + f_init_handler(pars); + f_DIA_AI(); +} + +testcase TC_authinfo_normal() runs on MTC_CT { + var D2G_ConnHdlrPars pars := f_init_pars(1); + var D2G_ConnHdlr vc_conn; + f_init(); + f_sleep(10.0); + vc_conn := f_start_handler_with_pars(refers(f_TC_authinfo_normal), pars); + vc_conn.done; + setverdict(pass); +} + + +control { + execute ( TC_authinfo_normal() ); +} + +} diff --git a/dia2gsup/gen_links.sh b/dia2gsup/gen_links.sh new file mode 100755 index 0000000..d0002eb --- /dev/null +++ b/dia2gsup/gen_links.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.IPL4asp/src +FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.TELNETasp/src +FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.DIAMETER_ProtocolModule_Generator/src +FILES="DIAMETER_EncDec.cc" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src +#FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn " +#FILES+="SS_DataTypes.asn SS_Errors.asn SS_Operations.asn SS_PDU_Defs.asn SS_Protocol.asn SS_Types.ttcn SS_EncDec.cc" +FILES="MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn " +gen_links $DIR $FILES + + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="Osmocom_CTRL_Types.ttcn " +FILES+="L3_Common.ttcn " +FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn DIAMETER_Templates.ttcn " +FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc +IPA_Emulation.ttcnpp " +FILES+="GSUP_Types.ttcn GSUP_Emulation.ttcn " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/dia2gsup/regen_makefile.sh b/dia2gsup/regen_makefile.sh new file mode 100755 index 0000000..22d8e06 --- /dev/null +++ b/dia2gsup/regen_makefile.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +NAME=DIA2GSUP_Tests + +FILES=" + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc + DIAMETER_EncDec.cc + DIAMETER_CodecPort_CtrlFunctDef.cc +" + +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_GSUP + -DIPA_EMULATION_CTRL +" + +../regen-makefile.sh DIA2GSUP_Tests.ttcn $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34213 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: Ia3db9fd62249777cd7c63f6c4af1568c79468728 Gerrit-Change-Number: 34213 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: DIAMETER_Emulation: Support forwarding messages identified by ete_id ...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34212 ) Change subject: DIAMETER_Emulation: Support forwarding messages identified by ete_id to a client component ...................................................................... DIAMETER_Emulation: Support forwarding messages identified by ete_id to a client component This is useful in the scenarios where the client component submits a IMSI-based transaction such as AIR, but its answer (AIA) contains no IMSI (as per what's specified in TS 29.272 5.2.3.1). As a result, the received AIA message would be enqueued in the DIAMETER_UNIT. With this new feature, the test can create an expect using the End-to-End Identifier of the message it is going to transmit, and receive the answer in the same DIAMETER_CLIENT port the request was transmitted, even if it contains no IMSI. Related: OS#5757 Change-Id: I25e44146d2c49e308c1fb490b499e70ac6045f2f --- M library/DIAMETER_Emulation.ttcn M mme/MME_Tests.ttcn M pgw/PGW_Tests.ttcn 3 files changed, 130 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index 6eb72ad..e7481ca 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -70,6 +70,12 @@ hexstring imsi optional }; +/* represents a single DIAMETER message identified by ete_id field */ +type record ETEIDData { + DIAMETER_ConnHdlr comp_ref, + UINT32 ete_id optional +}; + type component DIAMETER_Emulation_CT { /* Port facing to the UDP SUT */ port DIAMETER_CODEC_PT DIAMETER; @@ -79,6 +85,8 @@ port DIAMETER_Conn_PT DIAMETER_CLIENT; /* currently tracked connections */ var AssociationData DiameterAssocTable[256]; + /* Forward reply messages not containing IMSI to correct client port */ + var ETEIDData DiameterETEIDTable[256]; /* pending expected CRCX */ var ExpectData DiameterExpectTable[256]; /* procedure based port to register for incoming connections */ @@ -202,7 +210,6 @@ mtc.stop; } - private function f_imsi_table_init() runs on DIAMETER_Emulation_CT { for (var integer i := 0; i < sizeof(DiameterAssocTable); i := i+1) { @@ -211,6 +218,67 @@ } } +/* End-to-End ID table matching. */ +private function f_ete_id_known(UINT32 ete_id) +runs on DIAMETER_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(DiameterETEIDTable); i := i+1) { + if (DiameterETEIDTable[i].ete_id == ete_id) { + return true; + } + } + return false; +} + +private function f_comp_by_ete_id(UINT32 ete_id) +runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr { + var integer i; + for (i := 0; i < sizeof(DiameterETEIDTable); i := i+1) { + if (DiameterETEIDTable[i].ete_id == ete_id) { + return DiameterETEIDTable[i].comp_ref; + } + } + setverdict(fail, "DIAMETER ETEID Table not found by ete_id", ete_id); + mtc.stop; +} + +private function f_eteid_table_add(DIAMETER_ConnHdlr comp_ref, UINT32 ete_id) +runs on DIAMETER_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(DiameterETEIDTable); i := i+1) { + if (not isvalue(DiameterETEIDTable[i].ete_id)) { + DiameterETEIDTable[i].ete_id := ete_id; + DiameterETEIDTable[i].comp_ref := comp_ref; + return; + } + } + testcase.stop("DIAMETER ETEID Table full!"); +} + +private function f_eteid_table_del(DIAMETER_ConnHdlr comp_ref, UINT32 ete_id) +runs on DIAMETER_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(DiameterETEIDTable); i := i+1) { + if (DiameterETEIDTable[i].comp_ref == comp_ref and + DiameterETEIDTable[i].ete_id == ete_id) { + DiameterETEIDTable[i].ete_id := omit; + DiameterETEIDTable[i].comp_ref := null; + return; + } + } + setverdict(fail, "DIAMETER ETEID Table: Couldn't find to-be-deleted entry!"); + mtc.stop; +} + + +private function f_eteid_table_init() +runs on DIAMETER_Emulation_CT { + for (var integer i := 0; i < sizeof(DiameterETEIDTable); i := i+1) { + DiameterETEIDTable[i].comp_ref := null; + DiameterETEIDTable[i].ete_id := omit; + } +} + function f_DIAMETER_get_imsi(PDU_DIAMETER pdu) return template (omit) IMSI { var template (omit) AVP imsi_avp; @@ -280,6 +348,7 @@ var Result res; g_diameter_id := id; f_imsi_table_init(); + f_eteid_table_init(); f_expect_table_init(); map(self:DIAMETER, system:DIAMETER_CODEC_PT); @@ -311,6 +380,7 @@ var DIAMETER_ConnHdlr vc_conn; var template IMSI imsi_t; var hexstring imsi; + var UINT32 ete_id; var DIAMETER_RecvFrom mrf; var PDU_DIAMETER msg; var charstring vlr_name, mme_name; @@ -357,7 +427,13 @@ /* DIAMETER from remote peer (IMSI based routing) */ [not ops.raw] DIAMETER.receive(tr_DIAMETER_RecvFrom_R(?)) -> value mrf { imsi_t := f_DIAMETER_get_imsi(mrf.msg); - if (isvalue(imsi_t)) { + ete_id := mrf.msg.end_to_end_id; + if (f_ete_id_known(ete_id)) { + vc_conn := f_comp_by_ete_id(ete_id); + /* The ete_id is a single-time expect: */ + f_eteid_table_del(vc_conn, ete_id); + DIAMETER_CLIENT.send(mrf.msg) to vc_conn; + } else if (isvalue(imsi_t)) { imsi := valueof(imsi_t); if (f_imsi_known(imsi)) { vc_conn := f_comp_by_imsi(imsi); @@ -377,9 +453,13 @@ } [] DIAMETER.receive(tr_SctpAssocChange) { } [] DIAMETER.receive(tr_SctpPeerAddrChange) { } - [] DIAMETER_PROC.getcall(DIAMETEREM_register:{?,?}) -> param(imsi, vc_conn) { + [] DIAMETER_PROC.getcall(DIAMETEREM_register_imsi:{?,?}) -> param(imsi, vc_conn) { f_create_expect(imsi, vc_conn); - DIAMETER_PROC.reply(DIAMETEREM_register:{imsi, vc_conn}) to vc_conn; + DIAMETER_PROC.reply(DIAMETEREM_register_imsi:{imsi, vc_conn}) to vc_conn; + } + [] DIAMETER_PROC.getcall(DIAMETEREM_register_eteid:{?,?}) -> param(ete_id, vc_conn) { + f_eteid_table_add(vc_conn, ete_id); + DIAMETER_PROC.reply(DIAMETEREM_register_eteid:{ete_id, vc_conn}) to vc_conn; } } @@ -387,18 +467,29 @@ } } -/* "Expect" Handling */ +/* "E2E ID Expect" Handling */ +type record ExpectDataE2EID { + UINT32 ete_id optional, + DIAMETER_ConnHdlr vc_conn +} + +signature DIAMETEREM_register_eteid(in UINT32 ete_id, in DIAMETER_ConnHdlr hdlr); + +/* client/conn_hdlr side function to use procedure port to create expect in emulation */ +function f_diameter_expect_eteid(UINT32 ete_id) runs on DIAMETER_ConnHdlr { + DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) { + [] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; + } +} + +/* "IMSI Expect" Handling */ type record ExpectData { hexstring imsi optional, DIAMETER_ConnHdlr vc_conn } -signature DIAMETEREM_register(in hexstring imsi, in DIAMETER_ConnHdlr hdlr); - -type port DIAMETEREM_PROC_PT procedure { - inout DIAMETEREM_register; -} with { extension "internal" }; +signature DIAMETEREM_register_imsi(in hexstring imsi, in DIAMETER_ConnHdlr hdlr); /* Function that can be used as create_cb and will use the expect table */ function ExpectedCreateCallback(PDU_DIAMETER msg, hexstring imsi, charstring id) @@ -446,9 +537,9 @@ } /* client/conn_hdlr side function to use procedure port to create expect in emulation */ -function f_diameter_expect(hexstring imsi) runs on DIAMETER_ConnHdlr { - DIAMETER_PROC.call(DIAMETEREM_register:{imsi, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register:{?,?}) {}; +function f_diameter_expect_imsi(hexstring imsi) runs on DIAMETER_ConnHdlr { + DIAMETER_PROC.call(DIAMETEREM_register_imsi:{imsi, self}) { + [] DIAMETER_PROC.getreply(DIAMETEREM_register_imsi:{?,?}) {}; } } @@ -466,6 +557,10 @@ return omit; } +type port DIAMETEREM_PROC_PT procedure { + inout DIAMETEREM_register_imsi; + inout DIAMETEREM_register_eteid; +} with { extension "internal" }; function f_diameter_wait_capability(DIAMETER_PT pt) { diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 17a4d60..cc75377 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -361,7 +361,7 @@ g_Tguard.start(t_guard); activate(as_Tguard()); if (DIAMETER_PROC.checkstate("Connected")) { - f_diameter_expect(g_pars.ue_pars.imsi); + f_diameter_expect_imsi(g_pars.ue_pars.imsi); } if (SGsAP_PROC.checkstate("Connected")) { /* Route all SGsAP mesages for our IMSIto us */ diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 7bb6910..4730040 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -72,7 +72,7 @@ var PDU_DIAMETER msg; if (DIAMETER_PROC.checkstate("Connected")) { - f_diameter_expect(imsi); + f_diameter_expect_imsi(imsi); } while (true) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34212 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: I25e44146d2c49e308c1fb490b499e70ac6045f2f Gerrit-Change-Number: 34212 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: dia2gsup: Introduce initial testsuite

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34213 ) Change subject: dia2gsup: Introduce initial testsuite ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34213 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: Ia3db9fd62249777cd7c63f6c4af1568c79468728 Gerrit-Change-Number: 34213 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Aug 2023 07:27:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: DIAMETER_Emulation: Support forwarding messages identified by ete_id ...

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34212 ) Change subject: DIAMETER_Emulation: Support forwarding messages identified by ete_id to a client component ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34212 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: I25e44146d2c49e308c1fb490b499e70ac6045f2f Gerrit-Change-Number: 34212 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Aug 2023 07:26:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: diameter: Fix order of AVPs in tr_DIA_AIA

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34211 ) Change subject: diameter: Fix order of AVPs in tr_DIA_AIA ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34211 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: Ib7ced55a5986e4b9b69529622625ae3694a4d44d Gerrit-Change-Number: 34211 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Aug 2023 07:26:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: refactor l1sched_mframe_layout()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34216 ) Change subject: trxcon/l1sched: refactor l1sched_mframe_layout() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1c3679879ef97d42237d6723d1619ac0ef97f6b Gerrit-Change-Number: 34216 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Aug 2023 06:05:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[M] Change in osmo-bts[master]: csd_v110: handle empty/incomplete Uplink frames gracefully

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34219 ) Change subject: csd_v110: handle empty/incomplete Uplink frames gracefully ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7cbf868df3ba5d390cea3d529eef26d18dbe55ab Gerrit-Change-Number: 34219 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Aug 2023 06:04:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: properly set E1/E2/E3 for non-transparent data

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34218 ) Change subject: csd_v110: properly set E1/E2/E3 for non-transparent data ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie38c12e462654cd9fe83a0420bc8ea8b476214b8 Gerrit-Change-Number: 34218 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Aug 2023 06:03:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: fix comments in csd_v110_rtp_{en,de}code()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34217 ) Change subject: csd_v110: fix comments in csd_v110_rtp_{en,de}code() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6fee665e587bfa76058187e13f0cdafaea991940 Gerrit-Change-Number: 34217 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Aug 2023 06:03:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: properly set E1/E2/E3 for non-transparent data

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34218 ) Change subject: csd_v110: properly set E1/E2/E3 for non-transparent data ...................................................................... csd_v110: properly set E1/E2/E3 for non-transparent data Change-Id: Ie38c12e462654cd9fe83a0420bc8ea8b476214b8 Related: OS#1572 --- M src/common/csd_v110.c 1 file changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/34218/1 diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index 8fa4229..230a6a7 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -102,9 +102,17 @@ osmo_csd_3k6_decode_frame(&df, &data[i * 36], 36); /* E1 .. E3 must set by out-of-band knowledge */ - df.e_bits[0] = e1e2e3_map[lchan->csd_mode][0]; - df.e_bits[1] = e1e2e3_map[lchan->csd_mode][1]; - df.e_bits[2] = e1e2e3_map[lchan->csd_mode][2]; + if (lchan->csd_mode == LCHAN_CSD_M_NT) { + /* non-transparent: as per 3GPP TS 48.020, Table 7 */ + df.e_bits[0] = 0; /* E1: as per 15.1.2, shall be set to 0 (for BSS-MSC) */ + df.e_bits[1] = (i >> 1) & 0x01; /* E2: 0 for Q1/Q2, 1 for Q3/Q4 */ + df.e_bits[2] = (i >> 0) & 0x01; /* E3: 0 for Q1/Q3, 1 for Q2/Q4 */ + } else { + /* transparent: as per 3GPP TS 44.021, Figure 4 */ + df.e_bits[0] = e1e2e3_map[lchan->csd_mode][0]; /* E1 */ + df.e_bits[1] = e1e2e3_map[lchan->csd_mode][1]; /* E2 */ + df.e_bits[2] = e1e2e3_map[lchan->csd_mode][2]; /* E3 */ + } osmo_v110_encode_frame(&ra_bits[i * 80], 80, &df); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie38c12e462654cd9fe83a0420bc8ea8b476214b8 Gerrit-Change-Number: 34218 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 1 week

1
0
0 0

[M] Change in osmo-bts[master]: csd_v110: handle empty/incomplete Uplink frames gracefully

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34219 ) Change subject: csd_v110: handle empty/incomplete Uplink frames gracefully ...................................................................... csd_v110: handle empty/incomplete Uplink frames gracefully Change-Id: I7cbf868df3ba5d390cea3d529eef26d18dbe55ab Related: OS#1572 --- M src/common/csd_v110.c M tests/csd/csd_test.c M tests/csd/csd_test.err 3 files changed, 90 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/19/34219/1 diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index 230a6a7..5046d6e 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -87,9 +87,14 @@ if (OSMO_UNLIKELY(desc->num_blocks == 0)) return -ENOTSUP; - /* handle empty/incomplete frames gracefully */ - if (OSMO_UNLIKELY(data_len < (desc->num_blocks * desc->num_bits))) - return -ENODATA; + /* handle empty/incomplete Uplink frames gracefully */ + if (OSMO_UNLIKELY(data_len < (desc->num_blocks * desc->num_bits))) { + /* encode N idle frames as per 3GPP TS 44.021, section 8.1.6 */ + memset(&ra_bits[0], 0x01, sizeof(ra_bits)); + for (unsigned int i = 0; i < desc->num_blocks; i++) + memset(&ra_bits[i * 80], 0x00, 8); /* alignment pattern */ + goto ra1_ra2; + } /* RA1'/RA1: convert from radio rate to an intermediate data rate */ for (unsigned int i = 0; i < desc->num_blocks; i++) { @@ -117,6 +122,7 @@ osmo_v110_encode_frame(&ra_bits[i * 80], 80, &df); } +ra1_ra2: /* RA1/RA2: convert from an intermediate rate to 64 kbit/s */ if (desc->num_blocks == 4) { /* 4 * 80 bits (16 kbit/s) => 2 bits per octet */ diff --git a/tests/csd/csd_test.c b/tests/csd/csd_test.c index f24331d..466ff88 100644 --- a/tests/csd/csd_test.c +++ b/tests/csd/csd_test.c @@ -135,6 +135,17 @@ fprintf(stderr, "[!] Data mismatch @ %03u: D%u vs E%u\n", i, data_dec[i], data_enc[i]); } + + fprintf(stderr, "[i] Testing '%s' (IDLE)\n", tc->name); + + /* encode an idle RTP frame and print it */ + rc = csd_v110_rtp_encode(&lchan, &rtp[0], &data_enc[0], 0); + fprintf(stderr, "[i] csd_v110_rtp_encode() returns %d\n", rc); + if (rc != RFC4040_RTP_PLEN) + return; + /* print the encoded RTP frame (16 bytes per row) */ + for (unsigned int i = 0; i < sizeof(rtp) / 16; i++) + fprintf(stderr, " %s\n", osmo_hexdump(&rtp[i * 16], 16)); } int main(int argc, char **argv) diff --git a/tests/csd/csd_test.err b/tests/csd/csd_test.err index 94505dc..b862324 100644 --- a/tests/csd/csd_test.err +++ b/tests/csd/csd_test.err @@ -12,6 +12,18 @@ ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf ff 7f 7f bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f [i] csd_v110_rtp_decode() returns 240 +[i] Testing 'TCH/F9.6' (IDLE) +[i] csd_v110_rtp_encode() returns 160 + 3f 3f 3f 3f ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff 3f 3f 3f 3f ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + 3f 3f 3f 3f ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff 3f 3f 3f 3f ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff [i] Testing 'TCH/F4.8' (bitnum=120) [i] csd_v110_rtp_encode() returns 160 7f 7f 7f 7f 7f 7f 7f 7f ff 7f ff 7f ff 7f ff 7f @@ -25,6 +37,18 @@ ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff [i] csd_v110_rtp_decode() returns 120 +[i] Testing 'TCH/F4.8' (IDLE) +[i] csd_v110_rtp_encode() returns 160 + 7f 7f 7f 7f 7f 7f 7f 7f ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + 7f 7f 7f 7f 7f 7f 7f 7f ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff [i] Testing 'TCH/H4.8' (bitnum=240) [i] csd_v110_rtp_encode() returns 160 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf @@ -38,6 +62,18 @@ ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf ff 7f 7f bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f [i] csd_v110_rtp_decode() returns 240 +[i] Testing 'TCH/H4.8' (IDLE) +[i] csd_v110_rtp_encode() returns 160 + 3f 3f 3f 3f ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff 3f 3f 3f 3f ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + 3f 3f 3f 3f ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff 3f 3f 3f 3f ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff [i] Testing 'TCH/F2.4' (bitnum=72) [i] csd_v110_rtp_encode() returns 160 7f 7f 7f 7f 7f 7f 7f 7f ff 7f 7f ff ff 7f 7f ff @@ -51,6 +87,18 @@ ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff [i] csd_v110_rtp_decode() returns 72 +[i] Testing 'TCH/F2.4' (IDLE) +[i] csd_v110_rtp_encode() returns 160 + 7f 7f 7f 7f 7f 7f 7f 7f ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + 7f 7f 7f 7f 7f 7f 7f 7f ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff [i] Testing 'TCH/H2.4' (bitnum=144) [i] csd_v110_rtp_encode() returns 160 3f 3f 3f 3f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f @@ -64,3 +112,15 @@ bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f ff 3f 7f 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f [i] csd_v110_rtp_decode() returns 144 +[i] Testing 'TCH/H2.4' (IDLE) +[i] csd_v110_rtp_encode() returns 160 + 3f 3f 3f 3f ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff 3f 3f 3f 3f ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + 3f 3f 3f 3f ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff 3f 3f 3f 3f ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7cbf868df3ba5d390cea3d529eef26d18dbe55ab Gerrit-Change-Number: 34219 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: fix comments in csd_v110_rtp_{en,de}code()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34217 ) Change subject: csd_v110: fix comments in csd_v110_rtp_{en,de}code() ...................................................................... csd_v110: fix comments in csd_v110_rtp_{en,de}code() Change-Id: I6fee665e587bfa76058187e13f0cdafaea991940 Related: OS#1572 --- M src/common/csd_v110.c 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/17/34217/1 diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index 9fc7ad3..8fa4229 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -91,11 +91,11 @@ if (OSMO_UNLIKELY(data_len < (desc->num_blocks * desc->num_bits))) return -ENODATA; - /* RA1'/RA1: convert to an intermediate data rate */ + /* RA1'/RA1: convert from radio rate to an intermediate data rate */ for (unsigned int i = 0; i < desc->num_blocks; i++) { struct osmo_v110_decoded_frame df; - /* convert modified V.110 frames to normal V.110 frames */ + /* convert a V.110 36-/60-bit frame to a V.110 80-bit frame */ if (desc->num_bits == 60) osmo_csd_12k_6k_decode_frame(&df, &data[i * 60], 60); else /* desc->num_bits == 36 */ @@ -158,11 +158,11 @@ ra_bits[i] = (rtp[i] >> 7); } - /* RA1'/RA1: convert to an intermediate data rate */ + /* RA1'/RA1: convert from an intermediate rate to radio rate */ for (unsigned int i = 0; i < desc->num_blocks; i++) { struct osmo_v110_decoded_frame df; - /* convert modified V.110 frames to normal V.110 frames */ + /* convert a V.110 80-bit frame to a V.110 36-/60-bit frame */ osmo_v110_decode_frame(&df, &ra_bits[i * 80], 80); if (desc->num_bits == 60) osmo_csd_12k_6k_encode_frame(&data[i * 60], 60, &df); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6fee665e587bfa76058187e13f0cdafaea991940 Gerrit-Change-Number: 34217 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 1 week

1
0
0 0

[S] Change in libosmo-netif[master]: stream test: Fix test output check

by daniel

Attention is currently required from: arehbein. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34210 ) Change subject: stream test: Fix test output check ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ib8f01c3651c13814c212328946415094da39d6a8 Gerrit-Change-Number: 34210 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Aug 2023 18:48:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[M] Change in osmo-trx[master]: transceiver: add experimental viterbi equalizer support

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33930 ) ( 14 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: transceiver: add experimental viterbi equalizer support ...................................................................... transceiver: add experimental viterbi equalizer support The VA is already being used by the ms side and is part of the original gsm design. It only works for gmsk, 4sps, and needs a bit of rx burst scaling and burst shifting. Change-Id: I9d7a4ff72e323832a94d885d5714fcde01ceeb3d --- M CommonLibs/config_defs.h M CommonLibs/trx_vty.c M Transceiver52M/Makefile.am M Transceiver52M/Transceiver.cpp M Transceiver52M/osmo-trx.cpp M Transceiver52M/radioInterface.h 6 files changed, 131 insertions(+), 12 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/config_defs.h b/CommonLibs/config_defs.h index bf49bcf..07a3981 100644 --- a/CommonLibs/config_defs.h +++ b/CommonLibs/config_defs.h @@ -67,4 +67,5 @@ double ul_gain; double dl_gain; } overrides; + bool use_va; }; diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 55142ef..bd1b0ce 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -339,6 +339,25 @@ return CMD_SUCCESS; } +DEFUN_ATTR(cfg_use_viterbi, cfg_use_viterbi_cmd, + "viterbi-eq (disable|enable)", + "Use viterbi equalizer for gmsk (default=disable)\n" + "Disable VA\n" + "Enable VA\n", + CMD_ATTR_HIDDEN) +{ + struct trx_ctx *trx = trx_from_vty(vty); + + if (strcmp("disable", argv[0]) == 0) + trx->cfg.use_va = false; + else if (strcmp("enable", argv[0]) == 0) + trx->cfg.use_va = true; + else + return CMD_WARNING; + + return CMD_SUCCESS; +} + DEFUN(cfg_swap_channels, cfg_swap_channels_cmd, "swap-channels (disable|enable)", "Swap primary and secondary channels of the PHY (if any)\n" @@ -700,6 +719,8 @@ vty_out(vty, " dl-gain-override %f%s", trx->cfg.overrides.dl_gain, VTY_NEWLINE); if (trx->cfg.overrides.ul_gain_override) vty_out(vty, " ul-gain-override %f%s", trx->cfg.overrides.ul_gain, VTY_NEWLINE); + if (trx->cfg.use_va) + vty_out(vty, " viterbi-eq %s%s", trx->cfg.use_va ? "enable" : "disable", VTY_NEWLINE); trx_rate_ctr_threshold_write_config(vty, " "); for (i = 0; i < trx->cfg.num_chans; i++) { @@ -869,6 +890,7 @@ install_element(TRX_NODE, &cfg_dl_freq_override_cmd); install_element(TRX_NODE, &cfg_ul_gain_override_cmd); install_element(TRX_NODE, &cfg_dl_gain_override_cmd); + install_element(TRX_NODE, &cfg_use_viterbi_cmd); install_node(&chan_node, dummy_config_write); install_element(CHAN_NODE, &cfg_chan_rx_path_cmd); install_element(CHAN_NODE, &cfg_chan_tx_path_cmd); diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index f8556f0..e82111e 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -40,7 +40,9 @@ ChannelizerBase.cpp \ Channelizer.cpp \ Synthesis.cpp \ - proto_trxd.c + proto_trxd.c \ + grgsm_vitac/grgsm_vitac.cpp \ + grgsm_vitac/viterbi_detector.cc libtransceiver_common_la_SOURCES = \ $(COMMON_SOURCES) \ diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index c9894f0..fed4289 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -29,6 +29,7 @@ #include <fstream> #include "Transceiver.h" #include <Logger.h> +#include <grgsm_vitac/grgsm_vitac.h> extern "C" { #include "osmo_signal.h" @@ -208,6 +209,8 @@ return false; } + initvita(); + mDataSockets.resize(mChans, -1); @@ -614,6 +617,44 @@ return mRadioInterface->rssiOffset(chan) + cfg->rssi_offset; } +static SoftVector *demodAnyBurst_va(const signalVector &burst, CorrType type, int sps, int rach_max_toa, int tsc) +{ + auto conved_beg = reinterpret_cast<const std::complex<float> *>(&burst.begin()[0]); + std::complex<float> chan_imp_resp[CHAN_IMP_RESP_LENGTH * d_OSR]; + float ncmax; + const unsigned burst_len_bits = 148 + 8; + char demodded_softbits[burst_len_bits]; + SoftVector *bits = new SoftVector(burst_len_bits); + + if (type == CorrType::TSC) { + auto rach_burst_start = get_norm_chan_imp_resp(conved_beg, chan_imp_resp, &ncmax, tsc); + rach_burst_start = std::max(rach_burst_start, 0); + detect_burst_nb(conved_beg, chan_imp_resp, rach_burst_start, demodded_softbits); + } else { + auto normal_burst_start = get_access_imp_resp(conved_beg, chan_imp_resp, &ncmax, 0); + normal_burst_start = std::max(normal_burst_start, 0); + detect_burst_ab(conved_beg, chan_imp_resp, normal_burst_start, demodded_softbits, rach_max_toa); + } + + float *s = &bits->begin()[0]; + for (unsigned int i = 0; i < 148; i++) + s[i] = demodded_softbits[i] * -1; + for (unsigned int i = 148; i < burst_len_bits; i++) + s[i] = 0; + return bits; +} + +#define USE_VA + +#ifdef USE_VA +// signalvector is owning despite claiming not to, but we can pretend, too.. +static void dummy_free(void *wData){}; +static void *dummy_alloc(size_t newSize) +{ + return 0; +}; +#endif + /* * Pull bursts from the FIFO and handle according to the slot * and burst correlation type. Equalzation is currently disabled. @@ -634,6 +675,9 @@ TransceiverState *state = &mStates[chan]; bool ctr_changed = false; double rssi_offset; + static complex burst_shift_buffer[625]; + static signalVector shift_vec(burst_shift_buffer, 0, 625, dummy_alloc, dummy_free); + signalVector *shvec_ptr = &shift_vec; /* Blocking FIFO read */ radioVector *radio_burst = mReceiveFIFO[chan]->read(); @@ -713,8 +757,15 @@ max_toa = (type == RACH || type == EXT_RACH) ? mMaxExpectedDelayAB : mMaxExpectedDelayNB; + if (cfg->use_va) { + // shifted burst copy to make the old demod and detection happy + std::copy(burst->begin() + 20, burst->end() - 20, shift_vec.begin()); + } else { + shvec_ptr = burst; + } + /* Detect normal or RACH bursts */ - rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, cfg->rx_sps, type, max_toa, &ebp); + rc = detectAnyBurst(*shvec_ptr, mTSC, BURST_THRESH, cfg->rx_sps, type, max_toa, &ebp); if (rc <= 0) { if (rc == -SIGERR_CLIP) { LOGCHAN(chan, DTRXDUL, INFO) << "Clipping detected on received RACH or Normal Burst"; @@ -728,7 +779,13 @@ goto ret_idle; } - rxBurst = demodAnyBurst(*burst, (CorrType) rc, cfg->rx_sps, &ebp); + if (cfg->use_va) { + scaleVector(*burst, { (1. / (float)((1 << 14) - 1)), 0 }); + rxBurst = demodAnyBurst_va(*burst, (CorrType)rc, cfg->rx_sps, max_toa, mTSC); + } else { + rxBurst = demodAnyBurst(*shvec_ptr, (CorrType)rc, cfg->rx_sps, &ebp); + } + bi->toa = ebp.toa; bi->tsc = ebp.tsc; bi->ci = ebp.ci; diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 89a577b..8f5cc85 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -77,6 +77,24 @@ static RadioDevice *usrp; static RadioInterface *radio; +/* adjusts read timestamp offset to make the viterbi equalizer happy by including the start tail bits */ +template <typename B> +class rif_va_wrapper : public B { + bool use_va; + + public: + template <typename... Args> + rif_va_wrapper(bool use_va, Args &&...args) : B(std::forward<Args>(args)...), use_va(use_va) + { + } + bool start() override + { + auto rv = B::start(); + B::readTimestamp -= use_va ? 20 : 0; + return rv; + }; +}; + /* Create radio interface * The interface consists of sample rate changes, frequency shifts, * channel multiplexing, and other conversions. The transceiver core @@ -91,17 +109,17 @@ switch (type) { case RadioDevice::NORMAL: - radio = new RadioInterface(usrp, trx->cfg.tx_sps, - trx->cfg.rx_sps, trx->cfg.num_chans); + radio = new rif_va_wrapper<RadioInterface>(trx->cfg.use_va, usrp, trx->cfg.tx_sps, trx->cfg.rx_sps, + trx->cfg.num_chans); break; case RadioDevice::RESAMP_64M: case RadioDevice::RESAMP_100M: - radio = new RadioInterfaceResamp(usrp, trx->cfg.tx_sps, - trx->cfg.rx_sps); + radio = new rif_va_wrapper<RadioInterfaceResamp>(trx->cfg.use_va, usrp, trx->cfg.tx_sps, + trx->cfg.rx_sps); break; case RadioDevice::MULTI_ARFCN: - radio = new RadioInterfaceMulti(usrp, trx->cfg.tx_sps, - trx->cfg.rx_sps, trx->cfg.num_chans); + radio = new rif_va_wrapper<RadioInterfaceMulti>(trx->cfg.use_va, usrp, trx->cfg.tx_sps, trx->cfg.rx_sps, + trx->cfg.num_chans); break; default: LOG(ALERT) << "Unsupported radio interface configuration"; @@ -465,6 +483,12 @@ return -1; } + if (trx->cfg.use_va && + (trx->cfg.egprs || trx->cfg.multi_arfcn || trx->cfg.tx_sps != 4 || trx->cfg.rx_sps != 4)) { + LOG(ERROR) << "Viterbi equalizer only works for gmsk with 4 tx/rx samples per symbol!"; + return -1; + } + return 0; } diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index cd40ddf..b05af78 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -75,7 +75,7 @@ public: /** start the interface */ - bool start(); + virtual bool start(); bool stop(); /** initialization */ @@ -151,7 +151,7 @@ public: RadioInterfaceResamp(RadioDevice* wDevice, size_t tx_sps, size_t rx_sps); - ~RadioInterfaceResamp(); + virtual ~RadioInterfaceResamp(); bool init(int type); void close(); @@ -184,7 +184,7 @@ public: RadioInterfaceMulti(RadioDevice* radio, size_t tx_sps, size_t rx_sps, size_t chans = 1); - ~RadioInterfaceMulti(); + virtual ~RadioInterfaceMulti(); bool init(int type); void close(); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9d7a4ff72e323832a94d885d5714fcde01ceeb3d Gerrit-Change-Number: 33930 Gerrit-PatchSet: 15 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 1 week

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: refactor l1sched_mframe_layout()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34216 ) Change subject: trxcon/l1sched: refactor l1sched_mframe_layout() ...................................................................... trxcon/l1sched: refactor l1sched_mframe_layout() Change-Id: Ie1c3679879ef97d42237d6723d1619ac0ef97f6b --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_mframe.c 2 files changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/16/34216/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 98282c1..aa5886a 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -327,8 +327,8 @@ }; extern const struct l1sched_lchan_desc l1sched_lchan_desc[_L1SCHED_CHAN_MAX]; -const struct l1sched_tdma_multiframe *l1sched_mframe_layout( - enum gsm_phys_chan_config config, int tn); +const struct l1sched_tdma_multiframe * +l1sched_mframe_layout(enum gsm_phys_chan_config config, uint8_t tn); /* Scheduler management functions */ struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, void *priv); diff --git a/src/host/trxcon/src/sched_mframe.c b/src/host/trxcon/src/sched_mframe.c index 90b7763..0d95e0a 100644 --- a/src/host/trxcon/src/sched_mframe.c +++ b/src/host/trxcon/src/sched_mframe.c @@ -2087,15 +2087,15 @@ }, }; -const struct l1sched_tdma_multiframe *l1sched_mframe_layout( - enum gsm_phys_chan_config config, int tn) +const struct l1sched_tdma_multiframe * +l1sched_mframe_layout(enum gsm_phys_chan_config config, uint8_t tn) { - int i, ts_allowed; - - for (i = 0; i < ARRAY_SIZE(layouts); i++) { - ts_allowed = layouts[i].slotmask & (0x01 << tn); - if (layouts[i].chan_config == config && ts_allowed) - return &layouts[i]; + for (unsigned int i = 0; i < ARRAY_SIZE(layouts); i++) { + if (layouts[i].chan_config != config) + continue; + if (~layouts[i].slotmask & (1 << tn)) + continue; + return &layouts[i]; } return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1c3679879ef97d42237d6723d1619ac0ef97f6b Gerrit-Change-Number: 34216 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 1 week

1
0
0 0

[M] Change in docker-playground[master]: Introduce osmo-dia2gsup-master, ttcn3-dia2gsup-test

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34215 ) Change subject: Introduce osmo-dia2gsup-master, ttcn3-dia2gsup-test ...................................................................... Patch Set 2: (5 comments) File osmo_dia2gsup-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/34215/comment/da478e61_f7d… PS2, Line 19: rebar3 escriptize Maybe copy the resulting `osmo-dia2gsup` to `/usr/local/bin` here, so that it's easier to call it? https://gerrit.osmocom.org/c/docker-playground/+/34215/comment/56786f55_618… PS2, Line 26: --config /data/osmo_dia2gsup.config You're passing the config file twice. Isn't the `ERL_FLAGS` enough? File ttcn3-dia2gsup-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/34215/comment/afabce0e_653… PS2, Line 1: ws File ttcn3-dia2gsup-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/34215/comment/d225df93_13f… PS2, Line 6: debian-bookworm-erlang This looks like a dependency of `osmo_dia2gsup-$IMAGE_SUFFIX`, and should not be listed here if so. This script is not using this image directly. https://gerrit.osmocom.org/c/docker-playground/+/34215/comment/ee96b35a_1d8… PS2, Line 31: /bin/sh -c "ERL_FLAGS='-config /data/osmo_dia2gsup.config' /tmp/osmo_dia2gsup/_build/default/bin/osmo-dia2gsup --config /data/osmo_dia2gsup.config >/data/osmo_dia2gsup.log 2>&1" This line is already specified in `CMD` of the respective Dockerfile, why duplicating it here? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I646096d5a010df02af75aefa33b023b55997a6d7 Gerrit-Change-Number: 34215 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Aug 2023 18:12:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: dia2gsup: Introduce initial testsuite

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34213 ) Change subject: dia2gsup: Introduce initial testsuite ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34213 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: Ia3db9fd62249777cd7c63f6c4af1568c79468728 Gerrit-Change-Number: 34213 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Aug 2023 17:55:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

2024

2023

2022

gerrit-log August 2023