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

Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves: run every day

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29248 ) Change subject: jobs/update-osmo-ci-on-slaves: run every day ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If5c4b3cb87100ab6c44d717a17986a4f0c6570fe Gerrit-Change-Number: 29248 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:52:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: use jenkins-notifications ML

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29247 ) Change subject: jobs/master-builds: use jenkins-notifications ML ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I15a747411d928055c71603cd4475289a77c8e749 Gerrit-Change-Number: 29247 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:52:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: contrib/generate_build_dep.sh: remove erlang bytecode from checkouts

by fixeria

Attention is currently required from: daniel, lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/29241 ) Change subject: contrib/generate_build_dep.sh: remove erlang bytecode from checkouts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/29241 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: I101119392c6d0fad264c2551fded10288c87da5e Gerrit-Change-Number: 29241 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:50:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves: run every day

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29248 ) Change subject: jobs/update-osmo-ci-on-slaves: run every day ...................................................................... jobs/update-osmo-ci-on-slaves: run every day Make sure scripts/osmo-ci-docker-rebuild.sh runs at least once a day on the jenkins nodes, so the docker images are less likely to expire due to being unused. This was the reason for master-osmo-opencm3-projects and gerrit-osmo_dia2gsup failing. Related: https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up Change-Id: If5c4b3cb87100ab6c44d717a17986a4f0c6570fe --- M jobs/update-osmo-ci-on-slaves.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/48/29248/1 diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 36ed922..41181cd 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -35,6 +35,7 @@ - pollscm: cron: "H/5 * * * *" ignore-post-commit-hooks: false + - timed: "H H * * *" builders: - shell: './contrib/jenkins.sh' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If5c4b3cb87100ab6c44d717a17986a4f0c6570fe Gerrit-Change-Number: 29248 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: use jenkins-notifications ML

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29247 ) Change subject: jobs/master-builds: use jenkins-notifications ML ...................................................................... jobs/master-builds: use jenkins-notifications ML I didn't receive mail notifications about failing master-osmo-opencm3-projects jobs. It seems they are not getting through on the gerrit-log mailing list, searching for jenkins gives no results: https://lists.osmocom.org/hyperkitty/search?mlist=gerrit-log%40lists.osmoco… And it seems to be the wrong ML anyway, so change it to jenkins-notifications. Change-Id: I15a747411d928055c71603cd4475289a77c8e749 --- M jobs/master-builds.yml 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/47/29247/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 6ca3e24..7fc306f 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -82,7 +82,7 @@ $MAKE $PARALLEL_MAKE; \ $MAKE distcheck' trigger: master-osmo-gmr - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org 246tnt(a)gmail.com + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org 246tnt(a)gmail.com - libosmo-gprs: # Full triggers would be: @@ -241,7 +241,7 @@ git_base_url: https://github.com/no2fpga docker_img: 'registry.osmocom.org/$USER/fpga-build' cmd: 'docker pull {docker_img} && {docker_run} {docker_img} /build/contrib/jenkins.sh --publish' - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de 246tnt(a)gmail.com + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de 246tnt(a)gmail.com - osmo-fl2k: git_base_url: https://gitea.osmocom.org/sdr @@ -264,7 +264,7 @@ - osmo-gmr: git_base_url: https://gitea.osmocom.org/satellite - email: gerrit-log(a)lists.osmocom.org 246tnt(a)gmail.com + email: jenkins-notifications(a)lists.osmocom.org 246tnt(a)gmail.com - osmo-gsm-manuals: node: 'osmocom-master-debian9' @@ -344,10 +344,10 @@ {docker_img} /build/contrib/jenkins.sh - osmo-sip-connector: - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org holger(a)freyther.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org holger(a)freyther.de - osmo-tetra: - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org 246tnt(a)gmail.com + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org 246tnt(a)gmail.com - osmo-trx: slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-raspbian11] @@ -371,18 +371,18 @@ - osmo-remsim - osmo-asf4-dfu: cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de - osmo-ccid-firmware: cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de - simtrace2: cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - osmo-opencm3-projects: git_base_url: https://gitea.osmocom.org/electronics docker_img: '$USER/debian-bullseye-jenkins' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - osmo-e1d - osmo-cbc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I15a747411d928055c71603cd4475289a77c8e749 Gerrit-Change-Number: 29247 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in osmo-sgsn[master]: Set working directory in systemd service file

by Max

Max has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/29244 ) Change subject: Set working directory in systemd service file ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/29244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I950d84853c6737276d02b3275127b499ae567c38 Gerrit-Change-Number: 29244 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 30 Aug 2022 12:50:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-mgw[master]: Set working directory in systemd service file

by Max

Max has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29245 ) Change subject: Set working directory in systemd service file ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7696cd92953787591e7b4777ee79c2671326b972 Gerrit-Change-Number: 29245 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 30 Aug 2022 12:49:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: update expected-results.xml

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 ) Change subject: bts: update expected-results.xml ...................................................................... Patch Set 2: (1 comment) File bts/expected-results.xml: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216/comment/44ac8801_e13b… PS1, Line 57: > This one is a bit special: the SUT is behaving correctly, but the testcase has wrong expectations. […] Removed xfail for TC_rsl_rf_resource_ind. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 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: Ifcd8601d1aadce78a1b0a0ed814ae9e77e8497aa Gerrit-Change-Number: 29216 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:49:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: update expected-results.xml

by fixeria

Attention is currently required from: laforge. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 to look at the new patch set (#2). Change subject: bts: update expected-results.xml ...................................................................... bts: update expected-results.xml Change-Id: Ifcd8601d1aadce78a1b0a0ed814ae9e77e8497aa --- M bts/expected-results.xml 1 file changed, 67 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/29216/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 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: Ifcd8601d1aadce78a1b0a0ed814ae9e77e8497aa Gerrit-Change-Number: 29216 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: update expected-results.xml

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 ) Change subject: bts: update expected-results.xml ...................................................................... Patch Set 1: (4 comments) File bts/expected-results.xml: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216/comment/3308f27d_6a71… PS1, Line 22: Rx unexpected Downlink DCCH Known bug (no ticket though), needs to be fixed in the SUT. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216/comment/51d6dc19_452c… PS1, Line 57: > do we really expect this test case to fail? This one is a bit special: the SUT is behaving correctly, but the testcase has wrong expectations. From what I remember, it started to fail since I implemented interference reporting for PDCH timeslots. Fixing the testsuite is not trivial, so back then I left this for later. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216/comment/cc002c81_1db0… PS1, Line 84: > likewise here? is this not a real bug or possibly even a regression? I'm very careful with patches […] This one is a real bug (tracked in https://osmocom.org/issues/5242). I introduced TC_ipa_crcx_ack_addr to demonstrate it, and it's expected to fail until it's fixed. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216/comment/ae2f4266_c266… PS1, Line 134: NSVCI { 1234, 0 } does not match { 1234, 5678 } This is also a known bug, but I don't think we have a ticket for it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 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: Ifcd8601d1aadce78a1b0a0ed814ae9e77e8497aa Gerrit-Change-Number: 29216 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:45:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-bsc[master]: Set working directory in systemd service file

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29243 ) Change subject: Set working directory in systemd service file ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5bf2991d8b6507337b864f4d3c43448e54633f37 Gerrit-Change-Number: 29243 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 30 Aug 2022 12:38:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Set working directory in systemd service file

by msuraev

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/29242 to look at the new patch set (#2). Change subject: Set working directory in systemd service file ...................................................................... Set working directory in systemd service file By default systemd will execute service with root directory (or home directory for user instance) which might result in attempts to create files in unexpected place. Let's set it to 'osmocom' subdir of state directory (/var/lib for system instance) instead. Fixes: OS#5661 Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 --- M contrib/systemd/osmo-msc.service 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/29242/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 Gerrit-Change-Number: 29242 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 8 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: contrib/generate_build_dep.sh: remove erlang bytecode from checkouts

by pespin

Attention is currently required from: daniel, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/29241 ) Change subject: contrib/generate_build_dep.sh: remove erlang bytecode from checkouts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/29241 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: I101119392c6d0fad264c2551fded10288c87da5e Gerrit-Change-Number: 29241 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:32:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Set working directory in systemd service file

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29242 ) Change subject: Set working directory in systemd service file ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 Gerrit-Change-Number: 29242 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 30 Aug 2022 12:31:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ggsn[master]: Set working directory in systemd service file

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29223 ) Change subject: Set working directory in systemd service file ...................................................................... Set working directory in systemd service file By default systemd will execute service with root directory (or home directory for user instance) which might result in attempts to create files in unexpected place. Let's set it to 'osmocom' subdir of state directory (/var/lib for system instance) instead. Related: OS#4821 Change-Id: Idffc115c21cac77f6f43356333de538ba549fc6a --- M contrib/systemd/osmo-ggsn.service 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, approved laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/contrib/systemd/osmo-ggsn.service b/contrib/systemd/osmo-ggsn.service index c75325d..1be5463 100644 --- a/contrib/systemd/osmo-ggsn.service +++ b/contrib/systemd/osmo-ggsn.service @@ -5,6 +5,8 @@ [Service] Type=simple Restart=always +StateDirectory=osmocom +WorkingDirectory=%S/osmocom ExecStart=/usr/bin/osmo-ggsn -c /etc/osmocom/osmo-ggsn.cfg RestartSec=2 RestartPreventExitStatus=1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idffc115c21cac77f6f43356333de538ba549fc6a Gerrit-Change-Number: 29223 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-ggsn[master]: Set working directory in systemd service file

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29223 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idffc115c21cac77f6f43356333de538ba549fc6a Gerrit-Change-Number: 29223 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:30:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Build failed in Jenkins: master-osmo-opencm3-projects » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #113

by jenkins＠lists.osmocom.org

See <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…> Changes: ------------------------------------------ Started by upstream project "master-osmo-opencm3-projects" build number 113 originally caused by: Started by timer Running as SYSTEM Building remotely on build2-deb9build-ansible (ttcn3 osmocom-gerrit-debian9 osmocom-master-debian9 repo-install-test coverity) in workspace <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…> The recommended git tool is: NONE No credentials specified > git rev-parse --resolve-git-dir <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…> # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://gitea.osmocom.org/electronics/osmo-opencm3-projects # timeout=10 Fetching upstream changes from https://gitea.osmocom.org/electronics/osmo-opencm3-projects > git --version # timeout=10 > git --version # 'git version 2.11.0' > git fetch --tags --progress -- https://gitea.osmocom.org/electronics/osmo-opencm3-projects +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision 11f0d5e8466c9ebd835a4f06521c1379472375cb (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 11f0d5e8466c9ebd835a4f06521c1379472375cb # timeout=10 Commit message: "contrib/jenkins.sh: Fix missing nvic.h" > git rev-list --no-walk 11f0d5e8466c9ebd835a4f06521c1379472375cb # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule.libopencm3.url # timeout=10 > git config -f .gitmodules --get submodule.libopencm3.path # timeout=10 > git config --get submodule.librfn.url # timeout=10 > git config -f .gitmodules --get submodule.librfn.path # timeout=10 > git submodule update --init --recursive libopencm3 # timeout=10 > git submodule update --init --recursive librfn # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins1136935819080516971.sh + ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store + mkdir -p /home/osmocom-build/jenkins_build_artifact_store + docker run --rm=true --cap-add SYS_PTRACE -e ARTIFACT_STORE=/artifact_store -e ASCIIDOC_WARNINGS_CHECK=1 -e HOME=/build -e JOB_NAME=master-osmo-opencm3-projects/a1=default,a2=default,a3=default,a4=default,label=osmocom-master-debian9 -e MAKE=make -e OSMOPY_DEBUG_TCP_SOCKETS=1 -e OSMO_GSM_MANUALS_DIR=/opt/osmo-gsm-manuals -e PARALLEL_MAKE=-j 8 -e PUBLISH=1 -e WITH_MANUALS=1 -w /build -i -u build -v <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…>:/build -v /home/osmocom-build/jenkins_build_artifact_store:/artifact_store -v /home/osmocom-build/.ssh:/home/build/.ssh:ro osmocom-build/debian-bullseye-jenkins /build/contrib/jenkins.sh --publish Unable to find image 'osmocom-build/debian-bullseye-jenkins:latest' locally docker: Error response from daemon: pull access denied for osmocom-build/debian-bullseye-jenkins, repository does not exist or may require 'docker login': denied: requested access to the resource is denied. See 'docker run --help'. Build step 'Execute shell' marked build as failure Archiving artifacts

1 year, 8 months

1
3
0 0

Change in ...osmo_dia2gsup[master]: contrib/generate_build_dep.sh: remove erlang bytecode from checkouts

by osmith

Attention is currently required from: lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/29241 ) Change subject: contrib/generate_build_dep.sh: remove erlang bytecode from checkouts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/29241 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: I101119392c6d0fad264c2551fded10288c87da5e Gerrit-Change-Number: 29241 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:25:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-hlr[master]: Set working directory in systemd service file

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/29225 ) Change subject: Set working directory in systemd service file ...................................................................... Set working directory in systemd service file By default systemd will execute service with root directory (or home directory for user instance) which might result in attempts to create files in unexpected place. Let's set it to 'osmocom' subdir of state directory (/var/lib for system instance) instead. Related: OS#4821 Change-Id: I40b5d50470cb55ca94af5e17f21658181a02d4c2 --- M contrib/systemd/osmo-hlr.service M debian/osmo-hlr.install 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve msuraev: Looks good to me, approved diff --git a/contrib/systemd/osmo-hlr.service b/contrib/systemd/osmo-hlr.service index 2eea0c4..aa2f281 100644 --- a/contrib/systemd/osmo-hlr.service +++ b/contrib/systemd/osmo-hlr.service @@ -5,6 +5,8 @@ [Service] Type=simple Restart=always +StateDirectory=osmocom +WorkingDirectory=%S/osmocom ExecStart=/usr/bin/osmo-hlr -c /etc/osmocom/osmo-hlr.cfg -l /var/lib/osmocom/hlr.db RestartSec=2 diff --git a/debian/osmo-hlr.install b/debian/osmo-hlr.install index 421d5f4..8b4039f 100644 --- a/debian/osmo-hlr.install +++ b/debian/osmo-hlr.install @@ -6,4 +6,3 @@ /usr/share/doc/osmo-hlr/sql/hlr_data.sql /usr/share/doc/osmo-hlr/examples/osmo-hlr.cfg /usr/share/osmocom/osmo-hlr-post-upgrade.sh -/var/lib/osmocom -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/29225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I40b5d50470cb55ca94af5e17f21658181a02d4c2 Gerrit-Change-Number: 29225 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-hlr[master]: Set working directory in systemd service file

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/29225 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/29225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I40b5d50470cb55ca94af5e17f21658181a02d4c2 Gerrit-Change-Number: 29225 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:22:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in libosmo-netif[master]: Properly handle send() return code

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29178 ) Change subject: Properly handle send() return code ...................................................................... Patch Set 1: (1 comment) File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/29178/comment/6af91c18_62c99515 PS1, Line 1334: LOGP(DLINP, LOGL_ERROR, "error to send: %s\n", (ret == -1) ? strerror(errno) : strerror(-ret)); > I'm not terribly concerned with such a system (see "errno -l") - feel free to pull me in as reviewer […] why do you say you don't care about such systems? Do you know the code errors can change even within linux system running on different platforms? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If9b80e855b740254d5414ea50b4ce594855da8e9 Gerrit-Change-Number: 29178 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:15:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in libosmo-netif[master]: Properly handle send() return code

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29178 ) Change subject: Properly handle send() return code ...................................................................... Patch Set 1: (1 comment) File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/29178/comment/73972e9c_307528e9 PS1, Line 1334: LOGP(DLINP, LOGL_ERROR, "error to send: %s\n", (ret == -1) ? strerror(errno) : strerror(-ret)); > Ack I'm not terribly concerned with such a system (see "errno -l") - feel free to pull me in as reviewer if you produce the patch before I do. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If9b80e855b740254d5414ea50b4ce594855da8e9 Gerrit-Change-Number: 29178 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:11:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-hlr[master]: Set working directory in systemd service file

by osmith

Attention is currently required from: msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/29225 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: diff looks good! since we don't have a CI check that verifies this works *before* merging, make sure you tested that it works locally -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/29225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I40b5d50470cb55ca94af5e17f21658181a02d4c2 Gerrit-Change-Number: 29225 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:11:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: contrib/generate_build_dep.sh: remove erlang bytecode from checkouts

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/29241 ) Change subject: contrib/generate_build_dep.sh: remove erlang bytecode from checkouts ...................................................................... contrib/generate_build_dep.sh: remove erlang bytecode from checkouts The checkout directory should only contains source and no erlang bytecode. Otherwise it might not compile when creating the build_dep.tar.gz on a machine with newer erlang and try to build the package on a system with older erlang. Change-Id: I101119392c6d0fad264c2551fded10288c87da5e --- M contrib/generate_build_dep.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/41/29241/1 diff --git a/contrib/generate_build_dep.sh b/contrib/generate_build_dep.sh index 2c0dc81..44b7b4d 100755 --- a/contrib/generate_build_dep.sh +++ b/contrib/generate_build_dep.sh @@ -14,4 +14,6 @@ mkdir _checkouts mv ./_build/default/lib/* _checkouts/ mv ./_build/default/plugins/* _checkouts/ +# delete erlang bytecode +find _checkouts/ -iname '*beam' -delete tar czf build_dep.tar.gz ./_checkouts -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/29241 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: I101119392c6d0fad264c2551fded10288c87da5e Gerrit-Change-Number: 29241 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac/ts_44_018: add missing M_PADDING_BITS to SI_13_t

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29204 ) Change subject: rlcmac/ts_44_018: add missing M_PADDING_BITS to SI_13_t ...................................................................... rlcmac/ts_44_018: add missing M_PADDING_BITS to SI_13_t According to table 10.5.2.37b.1, SI 13 Rest Octets IE does contain spare padding. Adding M_PADDING_BITS fixes decoder warnings about unhandled remaining bits. Change-Id: I44fb7e2a60da022ee99f1a6cd4f2635bef2bfe1e --- M src/rlcmac/ts_44_018.c M tests/ts_44_018/ts_44_018_test.err 2 files changed, 6 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/ts_44_018.c index c9e63e7..288fa6c 100644 --- a/src/rlcmac/ts_44_018.c +++ b/src/rlcmac/ts_44_018.c @@ -437,6 +437,7 @@ M_NEXT_EXIST_OR_NULL_LH(SI_13_t, Exist_AdditionsR99, 1), M_TYPE (SI_13_t, AdditionsR99, SI13_AdditionR99), + M_PADDING_BITS (SI_13_t), CSN_DESCR_END (SI_13_t) /* Enhanced Measurement Report */ diff --git a/tests/ts_44_018/ts_44_018_test.err b/tests/ts_44_018/ts_44_018_test.err index ebea6e0..ebed024 100644 --- a/tests/ts_44_018/ts_44_018_test.err +++ b/tests/ts_44_018/ts_44_018_test.err @@ -1,10 +1,5 @@ -DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 0 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 3 | T3192 = 2 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 15 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 1 | PAN_MAX = 7 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 11 | Extension_Info = 212 | Extension_Info = 6 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 0 | T_AVG_W = 16 | T_AVG_T = 16 | PC_MEAS_CHAN = 0 | N_AVG_I = 8 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 0 | : End AdditionsR99 | -DLGLOBAL NOTICE SI13 Rest Octets: 69 remaining bits unhandled by decoder -DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 2 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 0 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 3 | T3192 = 2 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 15 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 1 | PAN_MAX = 7 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 6 | Extension_Info = 6 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 0 | T_AVG_W = 16 | T_AVG_T = 16 | PC_MEAS_CHAN = 0 | N_AVG_I = 8 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 0 | : End AdditionsR99 | -DLGLOBAL NOTICE SI13 Rest Octets: 74 remaining bits unhandled by decoder -DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 7 | DRX_TIMER_MAX = 7 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 6 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 16 | Extension_Info = 148 | Extension_Info = 104 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 12 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 1 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | -DLGLOBAL NOTICE SI13 Rest Octets: 62 remaining bits unhandled by decoder -DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 7 | DRX_TIMER_MAX = 7 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 6 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 16 | Extension_Info = 148 | Extension_Info = 40 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 12 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 0 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | -DLGLOBAL NOTICE SI13 Rest Octets: 62 remaining bits unhandled by decoder -DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 3 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 0 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 0 | BS_CV_MAX = 10 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 11 | Extension_Info = 212 | Extension_Info = 7 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 10 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 1 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | -DLGLOBAL NOTICE SI13 Rest Octets: 67 remaining bits unhandled by decoder +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 0 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 3 | T3192 = 2 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 15 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 1 | PAN_MAX = 7 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 11 | Extension_Info = 212 | Extension_Info = 6 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 0 | T_AVG_W = 16 | T_AVG_T = 16 | PC_MEAS_CHAN = 0 | N_AVG_I = 8 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 0 | : End AdditionsR99 | Padding = 5|101|101|101|101|101|101|101|-22| +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 2 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 0 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 3 | T3192 = 2 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 15 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 1 | PAN_MAX = 7 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 6 | Extension_Info = 6 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 0 | T_AVG_W = 16 | T_AVG_T = 16 | PC_MEAS_CHAN = 0 | N_AVG_I = 8 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 0 | : End AdditionsR99 | Padding = 0|172|172|172|172|172|172|172|172|-22| +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 7 | DRX_TIMER_MAX = 7 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 6 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 16 | Extension_Info = 148 | Extension_Info = 104 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 12 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 1 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | Padding = 10|202|202|202|202|202|202|-22| +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 7 | DRX_TIMER_MAX = 7 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 6 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 16 | Extension_Info = 148 | Extension_Info = 40 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 12 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 0 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | Padding = 10|202|202|202|202|202|202|-22| +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 3 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 0 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 0 | BS_CV_MAX = 10 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 11 | Extension_Info = 212 | Extension_Info = 7 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 10 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 1 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | Padding = 1|89|89|89|89|89|89|89|-22| 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I44fb7e2a60da022ee99f1a6cd4f2635bef2bfe1e Gerrit-Change-Number: 29204 Gerrit-PatchSet: 4 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-MessageType: merged

1 year, 8 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: split ts_24_008.c out of ts_44_060.c

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29194 ) Change subject: rlcmac: split ts_24_008.c out of ts_44_060.c ...................................................................... rlcmac: split ts_24_008.c out of ts_44_060.c Change-Id: Idedf52423fef18b929e8096fbe4e130b5a6c7d2c --- M .checkpatch.conf M src/rlcmac/Makefile.am A src/rlcmac/ts_24_008.c M src/rlcmac/ts_44_060.c 4 files changed, 400 insertions(+), 363 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf index a7876ae..eab03bf 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -1,6 +1,7 @@ --exclude ^src/csn1/csn1.c$ --exclude ^src/csn1/csn1_(enc|dec).c$ --exclude ^include/osmocom/csn1/csn1.h$ +--exclude ^src/rlcmac/ts_24_008.c$ --exclude ^src/rlcmac/ts_44_018.c$ --exclude ^src/rlcmac/ts_44_060.c$ --exclude ^include/osmocom/gprs/rlcmac/gprs_rlcmac.h$ diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am index dabfa02..8aa8dc2 100644 --- a/src/rlcmac/Makefile.am +++ b/src/rlcmac/Makefile.am @@ -22,6 +22,7 @@ $(NULL) libosmo_gprs_rlcmac_la_SOURCES = \ + ts_24_008.c \ ts_44_018.c \ ts_44_060.c \ misc.c \ diff --git a/src/rlcmac/ts_24_008.c b/src/rlcmac/ts_24_008.c new file mode 100644 index 0000000..6531173 --- /dev/null +++ b/src/rlcmac/ts_24_008.c @@ -0,0 +1,396 @@ +/* + * CSN.1 definitions from 3GPP TS 24.008. + * + * By Vincent Helfre, based on original code by Jari Sassi + * with the gracious authorization of STE + * Copyright (c) 2011 ST-Ericsson + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald(a)wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <assert.h> +#include <arpa/inet.h> + +#include <osmocom/core/utils.h> +#include <osmocom/core/bitvec.h> +#include <osmocom/core/logging.h> + +#include <osmocom/csn1/csn1.h> +#include <osmocom/gprs/rlcmac/gprs_rlcmac.h> + +extern int g_log_cat; + +/*< MS Classmark 3 IE >*/ +#if 0 +static const +CSN_DESCR_BEGIN(ARC_t) + M_UINT (ARC_t, A5_Bits, 4), + M_UINT (ARC_t, Arc2_Spare, 4), + M_UINT (ARC_t, Arc1, 4), +CSN_DESCR_END (ARC_t) +#endif + +#if 0 +static const +CSN_ChoiceElement_t MultibandChoice[] = +{ + {3, 0x00, 0, M_UINT(Multiband_t, u.A5_Bits, 4)}, + {3, 0x05, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x06, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x01, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x02, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x04, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, +}; +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(Multiband_t) + M_CHOICE (Multiband_t, Multiband, MultibandChoice, ElementsOf(MultibandChoice)), +CSN_DESCR_END (Multiband_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(EDGE_RF_Pwr_t) + M_NEXT_EXIST (EDGE_RF_Pwr_t, ExistEDGE_RF_PwrCap1, 1), + M_UINT (EDGE_RF_Pwr_t, EDGE_RF_PwrCap1, 2), + + M_NEXT_EXIST (EDGE_RF_Pwr_t, ExistEDGE_RF_PwrCap2, 1), + M_UINT (EDGE_RF_Pwr_t, EDGE_RF_PwrCap2, 2), +CSN_DESCR_END (EDGE_RF_Pwr_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(MS_Class3_Unpacked_t) + M_UINT (MS_Class3_Unpacked_t, Spare1, 1), + M_TYPE (MS_Class3_Unpacked_t, Multiband, Multiband_t), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_R_Support, 1), + M_UINT (MS_Class3_Unpacked_t, R_GSM_Arc, 3), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MultiSlotCapability, 1), + M_UINT (MS_Class3_Unpacked_t, MultiSlotClass, 5), + + M_UINT (MS_Class3_Unpacked_t, UCS2, 1), + M_UINT (MS_Class3_Unpacked_t, ExtendedMeasurementCapability, 1), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MS_MeasurementCapability, 2), + M_UINT (MS_Class3_Unpacked_t, SMS_VALUE, 4), + M_UINT (MS_Class3_Unpacked_t, SM_VALUE, 4), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MS_PositioningMethodCapability, 1), + M_UINT (MS_Class3_Unpacked_t, MS_PositioningMethod, 5), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_EDGE_MultiSlotCapability, 1), + M_UINT (MS_Class3_Unpacked_t, EDGE_MultiSlotClass, 5), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_EDGE_Struct, 2), + M_UINT (MS_Class3_Unpacked_t, ModulationCapability, 1), + M_TYPE (MS_Class3_Unpacked_t, EDGE_RF_PwrCaps, EDGE_RF_Pwr_t), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM400_Info, 2), + M_UINT (MS_Class3_Unpacked_t, GSM400_Bands, 2), + M_UINT (MS_Class3_Unpacked_t, GSM400_Arc, 4), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM850_Arc, 1), + M_UINT (MS_Class3_Unpacked_t, GSM850_Arc, 4), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_PCS1900_Arc, 1), + M_UINT (MS_Class3_Unpacked_t, PCS1900_Arc, 4), + + M_UINT (MS_Class3_Unpacked_t, UMTS_FDD_Radio_Access_Technology_Capability, 1), + M_UINT (MS_Class3_Unpacked_t, UMTS_384_TDD_Radio_Access_Technology_Capability, 1), + M_UINT (MS_Class3_Unpacked_t, CDMA2000_Radio_Access_Technology_Capability, 1), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_DTM_GPRS_multislot_class, 3), + M_UINT (MS_Class3_Unpacked_t, DTM_GPRS_multislot_class, 2), + M_UINT (MS_Class3_Unpacked_t, Single_Slot_DTM, 1), + M_TYPE (MS_Class3_Unpacked_t, DTM_EGPRS_Params, DTM_EGPRS_t), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_SingleBandSupport, 1), + M_UINT (MS_Class3_Unpacked_t, GSM_Band, 4), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM_700_Associated_Radio_Capability, 1), + M_UINT (MS_Class3_Unpacked_t, GSM_700_Associated_Radio_Capability, 4), + + M_UINT (MS_Class3_Unpacked_t, UMTS_128_TDD_Radio_Access_Technology_Capability, 1), + M_UINT (MS_Class3_Unpacked_t, GERAN_Feature_Package_1, 1), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_Extended_DTM_multislot_class, 2), + M_UINT (MS_Class3_Unpacked_t, Extended_DTM_GPRS_multislot_class, 2), + M_UINT (MS_Class3_Unpacked_t, Extended_DTM_EGPRS_multislot_class, 2), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_HighMultislotCapability, 1), + M_UINT (MS_Class3_Unpacked_t, HighMultislotCapability, 2), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GERAN_lu_ModeCapability, 1), + M_UINT (MS_Class3_Unpacked_t, GERAN_lu_ModeCapability, 4), + + M_UINT (MS_Class3_Unpacked_t, GERAN_FeaturePackage_2, 1), + + M_UINT (MS_Class3_Unpacked_t, GMSK_MultislotPowerProfile, 2), + M_UINT (MS_Class3_Unpacked_t, EightPSK_MultislotProfile, 2), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_TGSM_400_Bands, 2), + M_UINT (MS_Class3_Unpacked_t, TGSM_400_BandsSupported, 2), + M_UINT (MS_Class3_Unpacked_t, TGSM_400_AssociatedRadioCapability, 4), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_TGSM_900_AssociatedRadioCapability, 1), + M_UINT (MS_Class3_Unpacked_t, TGSM_900_AssociatedRadioCapability, 4), + + M_UINT (MS_Class3_Unpacked_t, DownlinkAdvancedReceiverPerformance, 2), + M_UINT (MS_Class3_Unpacked_t, DTM_EnhancementsCapability, 1), + + M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_DTM_GPRS_HighMultislotClass, 3), + M_UINT (MS_Class3_Unpacked_t, DTM_GPRS_HighMultislotClass, 3), + M_UINT (MS_Class3_Unpacked_t, OffsetRequired, 1), + M_TYPE (MS_Class3_Unpacked_t, DTM_EGPRS_HighMultislotClass, DTM_EGPRS_HighMultislotClass_t), + + M_UINT (MS_Class3_Unpacked_t, RepeatedSACCH_Capability, 1), + M_UINT (MS_Class3_Unpacked_t, Spare2, 1), +CSN_DESCR_END (MS_Class3_Unpacked_t) +#endif + +/*< MS Radio Access capability IE >*/ +static const +CSN_DESCR_BEGIN (DTM_EGPRS_t) + M_NEXT_EXIST (DTM_EGPRS_t, Exist_DTM_EGPRS_multislot_class, 1), + M_UINT (DTM_EGPRS_t, DTM_EGPRS_multislot_class, 2), +CSN_DESCR_END (DTM_EGPRS_t) + +static const +CSN_DESCR_BEGIN (DTM_EGPRS_HighMultislotClass_t) + M_NEXT_EXIST (DTM_EGPRS_HighMultislotClass_t, Exist_DTM_EGPRS_HighMultislotClass, 1), + M_UINT (DTM_EGPRS_HighMultislotClass_t, DTM_EGPRS_HighMultislotClass, 3), +CSN_DESCR_END (DTM_EGPRS_HighMultislotClass_t) + +static const +CSN_DESCR_BEGIN (DownlinkDualCarrierCapability_r7_t) + M_UINT (DownlinkDualCarrierCapability_r7_t, MultislotCapabilityReductionForDL_DualCarrier, 3), + M_UINT (DownlinkDualCarrierCapability_r7_t, DL_DualCarrierForDTM, 1), +CSN_DESCR_END (DownlinkDualCarrierCapability_r7_t) + +static const +CSN_DESCR_BEGIN (Multislot_capability_t) + M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_HSCSD_multislot_class, 1), + M_UINT (Multislot_capability_t, HSCSD_multislot_class, 5), + + M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_GPRS_multislot_class, 2), + M_UINT (Multislot_capability_t, GPRS_multislot_class, 5), + M_UINT (Multislot_capability_t, GPRS_Extended_Dynamic_Allocation_Capability, 1), + + M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_SM, 2), + M_UINT (Multislot_capability_t, SMS_VALUE, 4), + M_UINT (Multislot_capability_t, SM_VALUE, 4), + + M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_ECSD_multislot_class, 1), + M_UINT (Multislot_capability_t, ECSD_multislot_class, 5), + + M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_EGPRS_multislot_class, 2), + M_UINT (Multislot_capability_t, EGPRS_multislot_class, 5), + M_UINT (Multislot_capability_t, EGPRS_Extended_Dynamic_Allocation_Capability, 1), + + M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_DTM_GPRS_multislot_class, 3), + M_UINT (Multislot_capability_t, DTM_GPRS_multislot_class, 2), + M_UINT (Multislot_capability_t, Single_Slot_DTM, 1), + M_TYPE (Multislot_capability_t, DTM_EGPRS_Params, DTM_EGPRS_t), +CSN_DESCR_END (Multislot_capability_t) + +static const +CSN_DESCR_BEGIN (Content_t) + M_UINT (Content_t, RF_Power_Capability, 3), + + M_NEXT_EXIST_OR_NULL(Content_t, Exist_A5_bits, 1), + M_UINT_OR_NULL (Content_t, A5_bits, 7), + + M_UINT_OR_NULL (Content_t, ES_IND, 1), + M_UINT_OR_NULL (Content_t, PS, 1), + M_UINT_OR_NULL (Content_t, VGCS, 1), + M_UINT_OR_NULL (Content_t, VBS, 1), + + M_NEXT_EXIST_OR_NULL(Content_t, Exist_Multislot_capability, 1), + M_TYPE (Content_t, Multislot_capability, Multislot_capability_t), + + M_NEXT_EXIST_OR_NULL(Content_t, Exist_Eight_PSK_Power_Capability, 1), + M_UINT (Content_t, Eight_PSK_Power_Capability, 2), + + M_UINT_OR_NULL (Content_t, COMPACT_Interference_Measurement_Capability, 1), + M_UINT_OR_NULL (Content_t, Revision_Level_Indicator, 1), + M_UINT_OR_NULL (Content_t, UMTS_FDD_Radio_Access_Technology_Capability, 1), + M_UINT_OR_NULL (Content_t, UMTS_384_TDD_Radio_Access_Technology_Capability, 1), + M_UINT_OR_NULL (Content_t, CDMA2000_Radio_Access_Technology_Capability, 1), + + M_UINT_OR_NULL (Content_t, UMTS_128_TDD_Radio_Access_Technology_Capability, 1), + M_UINT_OR_NULL (Content_t, GERAN_Feature_Package_1, 1), + + M_NEXT_EXIST_OR_NULL(Content_t, Exist_Extended_DTM_multislot_class, 2), + M_UINT (Content_t, Extended_DTM_GPRS_multislot_class, 2), + M_UINT (Content_t, Extended_DTM_EGPRS_multislot_class, 2), + + M_UINT_OR_NULL (Content_t, Modulation_based_multislot_class_support, 1), + + M_NEXT_EXIST_OR_NULL(Content_t, Exist_HighMultislotCapability, 1), + M_UINT (Content_t, HighMultislotCapability, 2), + + M_NEXT_EXIST_OR_NULL(Content_t, Exist_GERAN_lu_ModeCapability, 1), + M_UINT (Content_t, GERAN_lu_ModeCapability, 4), + + M_UINT_OR_NULL (Content_t, GMSK_MultislotPowerProfile, 2), + M_UINT_OR_NULL (Content_t, EightPSK_MultislotProfile, 2), + + M_UINT_OR_NULL (Content_t, MultipleTBF_Capability, 1), + M_UINT_OR_NULL (Content_t, DownlinkAdvancedReceiverPerformance, 2), + M_UINT_OR_NULL (Content_t, ExtendedRLC_MAC_ControlMessageSegmentionsCapability, 1), + M_UINT_OR_NULL (Content_t, DTM_EnhancementsCapability, 1), + + M_NEXT_EXIST_OR_NULL(Content_t, Exist_DTM_GPRS_HighMultislotClass, 2), + M_UINT (Content_t, DTM_GPRS_HighMultislotClass, 3), + M_TYPE (Content_t, DTM_EGPRS_HighMultislotClass, DTM_EGPRS_HighMultislotClass_t), + + M_UINT_OR_NULL (Content_t, PS_HandoverCapability, 1), + + /* additions in release 7 */ + M_UINT_OR_NULL (Content_t, DTM_Handover_Capability, 1), + M_NEXT_EXIST_OR_NULL(Content_t, Exist_DownlinkDualCarrierCapability_r7, 1), + M_TYPE_OR_NULL (Content_t, DownlinkDualCarrierCapability_r7, DownlinkDualCarrierCapability_r7_t), + + M_UINT_OR_NULL (Content_t, FlexibleTimeslotAssignment, 1), + M_UINT_OR_NULL (Content_t, GAN_PS_HandoverCapability, 1), + M_UINT_OR_NULL (Content_t, RLC_Non_persistentMode, 1), + M_UINT_OR_NULL (Content_t, ReducedLatencyCapability, 1), + M_UINT_OR_NULL (Content_t, UplinkEGPRS2, 2), + M_UINT_OR_NULL (Content_t, DownlinkEGPRS2, 2), + + /* additions in release 8 */ + M_UINT_OR_NULL (Content_t, EUTRA_FDD_Support, 1), + M_UINT_OR_NULL (Content_t, EUTRA_TDD_Support, 1), + M_UINT_OR_NULL (Content_t, GERAN_To_EUTRAN_supportInGERAN_PTM, 2), + M_UINT_OR_NULL (Content_t, PriorityBasedReselectionSupport, 1), + +CSN_DESCR_END (Content_t) + +static gint16 Content_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) +{ + if (ar->direction == 0) + { + return osmo_csn1_stream_encode(ar, CSNDESCR(Content_t), vector, readIndex, data); + } + else + { + return osmo_csn1_stream_decode(ar, CSNDESCR(Content_t), vector, readIndex, data); + } +} + +static const +CSN_DESCR_BEGIN (Additional_access_technologies_struct_t) + M_UINT (Additional_access_technologies_struct_t, Access_Technology_Type, 4), + M_UINT (Additional_access_technologies_struct_t, GMSK_Power_class, 3), + M_UINT (Additional_access_technologies_struct_t, Eight_PSK_Power_class, 2), +CSN_DESCR_END (Additional_access_technologies_struct_t) + +static const +CSN_DESCR_BEGIN (Additional_access_technologies_t) + M_REC_TARRAY (Additional_access_technologies_t, Additional_access_technologies, Additional_access_technologies_struct_t, Count_additional_access_technologies), +CSN_DESCR_END (Additional_access_technologies_t) + +static gint16 Additional_access_technologies_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) +{ + if (ar->direction == 0) + { + return osmo_csn1_stream_encode(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data); + } + else + { + return osmo_csn1_stream_decode(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data); + } +} + +static const +CSN_ChoiceElement_t MS_RA_capability_value_Choice[] = +{ + {4, AccTech_GSMP, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSME, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMR, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM1800, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM1900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM450, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM480, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM850, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM750, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMT830, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMT410, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMT900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM710, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMT810, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMOther, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Additional_access_technologies, 7, Additional_access_technologies_Dissector)}, /* Short Form */ +}; + +const +CSN_DESCR_BEGIN(MS_RA_capability_value_t) + M_CHOICE (MS_RA_capability_value_t, IndexOfAccTech, MS_RA_capability_value_Choice, ElementsOf(MS_RA_capability_value_Choice)), +CSN_DESCR_END (MS_RA_capability_value_t) + +static const +CSN_DESCR_BEGIN (MS_Radio_Access_capability_t) + M_REC_TARRAY_1(MS_Radio_Access_capability_t, MS_RA_capability_value, MS_RA_capability_value_t, Count_MS_RA_capability_value), + M_PADDING_BITS(MS_Radio_Access_capability_t), +CSN_DESCR_END (MS_Radio_Access_capability_t) + +int osmo_gprs_rlcmac_decode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t *data) +{ + csnStream_t ar; + int ret; + unsigned readIndex = 0; + + osmo_csn1_stream_init(&ar, 0, 8 * vector->data_len); + + /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere, so we need to start the log somewhere... */ + LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_decode (RAcap): "); + ret = osmo_csn1_stream_decode(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &readIndex, data); + + /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere without trailing + newline, so as a caller we are responisble for submitting it */ + LOGPC(DLCSN1, LOGL_INFO, "\n"); + + if (ret > 0) { + LOGP(g_log_cat, LOGL_NOTICE, "RAcap: Got %d remaining bits unhandled by decoder at the end of bitvec\n", ret); + ret = 0; + } + return ret; +} + +int osmo_gprs_rlcmac_encode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t *data) +{ + unsigned writeIndex = 0; + csnStream_t ar; + int ret; + + osmo_csn1_stream_init(&ar, 0, vector->data_len * 8); + + /* recursive osmo_csn1_stream_encode call uses LOGPC everywhere, so we need to start the log somewhere... */ + LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_encode (RAcap): "); + ret = osmo_csn1_stream_encode(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &writeIndex, data); + LOGPC(DLCSN1, LOGL_INFO, "\n"); + + if (ret > 0 || ret == CSN_ERROR_NEED_MORE_BITS_TO_UNPACK) { + LOGP(g_log_cat, LOGL_ERROR, "Failed to encode MS RA Capability IE: not enough bits " + "in the output buffer (rc=%d)\n", ret); + ret = CSN_ERROR_NEED_MORE_BITS_TO_UNPACK; + } + + return ret; +} diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/ts_44_060.c index 80e182e..e07d737 100644 --- a/src/rlcmac/ts_44_060.c +++ b/src/rlcmac/ts_44_060.c @@ -40,6 +40,8 @@ #define PAYLOAD_TYPE_CTRL_OPT_OCTET 2 #define PAYLOAD_TYPE_RESERVED 3 +CSN_DESCR_EXTERN(MS_RA_capability_value_t); + /* CSN1 structures */ /*(not all parts of CSN_DESCR structure are always initialized.)*/ static const @@ -412,330 +414,12 @@ CSN_DESCR_END (Receive_N_PDU_Number_list_t) #endif -/*< MS Radio Access capability IE >*/ -static const -CSN_DESCR_BEGIN (DTM_EGPRS_t) - M_NEXT_EXIST (DTM_EGPRS_t, Exist_DTM_EGPRS_multislot_class, 1), - M_UINT (DTM_EGPRS_t, DTM_EGPRS_multislot_class, 2), -CSN_DESCR_END (DTM_EGPRS_t) - -static const -CSN_DESCR_BEGIN (DTM_EGPRS_HighMultislotClass_t) - M_NEXT_EXIST (DTM_EGPRS_HighMultislotClass_t, Exist_DTM_EGPRS_HighMultislotClass, 1), - M_UINT (DTM_EGPRS_HighMultislotClass_t, DTM_EGPRS_HighMultislotClass, 3), -CSN_DESCR_END (DTM_EGPRS_HighMultislotClass_t) - -static const -CSN_DESCR_BEGIN (DownlinkDualCarrierCapability_r7_t) - M_UINT (DownlinkDualCarrierCapability_r7_t, MultislotCapabilityReductionForDL_DualCarrier, 3), - M_UINT (DownlinkDualCarrierCapability_r7_t, DL_DualCarrierForDTM, 1), -CSN_DESCR_END (DownlinkDualCarrierCapability_r7_t) - -static const -CSN_DESCR_BEGIN (Multislot_capability_t) - M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_HSCSD_multislot_class, 1), - M_UINT (Multislot_capability_t, HSCSD_multislot_class, 5), - - M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_GPRS_multislot_class, 2), - M_UINT (Multislot_capability_t, GPRS_multislot_class, 5), - M_UINT (Multislot_capability_t, GPRS_Extended_Dynamic_Allocation_Capability, 1), - - M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_SM, 2), - M_UINT (Multislot_capability_t, SMS_VALUE, 4), - M_UINT (Multislot_capability_t, SM_VALUE, 4), - - M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_ECSD_multislot_class, 1), - M_UINT (Multislot_capability_t, ECSD_multislot_class, 5), - - M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_EGPRS_multislot_class, 2), - M_UINT (Multislot_capability_t, EGPRS_multislot_class, 5), - M_UINT (Multislot_capability_t, EGPRS_Extended_Dynamic_Allocation_Capability, 1), - - M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_DTM_GPRS_multislot_class, 3), - M_UINT (Multislot_capability_t, DTM_GPRS_multislot_class, 2), - M_UINT (Multislot_capability_t, Single_Slot_DTM, 1), - M_TYPE (Multislot_capability_t, DTM_EGPRS_Params, DTM_EGPRS_t), -CSN_DESCR_END (Multislot_capability_t) - -static const -CSN_DESCR_BEGIN (Content_t) - M_UINT (Content_t, RF_Power_Capability, 3), - - M_NEXT_EXIST_OR_NULL(Content_t, Exist_A5_bits, 1), - M_UINT_OR_NULL (Content_t, A5_bits, 7), - - M_UINT_OR_NULL (Content_t, ES_IND, 1), - M_UINT_OR_NULL (Content_t, PS, 1), - M_UINT_OR_NULL (Content_t, VGCS, 1), - M_UINT_OR_NULL (Content_t, VBS, 1), - - M_NEXT_EXIST_OR_NULL(Content_t, Exist_Multislot_capability, 1), - M_TYPE (Content_t, Multislot_capability, Multislot_capability_t), - - M_NEXT_EXIST_OR_NULL(Content_t, Exist_Eight_PSK_Power_Capability, 1), - M_UINT (Content_t, Eight_PSK_Power_Capability, 2), - - M_UINT_OR_NULL (Content_t, COMPACT_Interference_Measurement_Capability, 1), - M_UINT_OR_NULL (Content_t, Revision_Level_Indicator, 1), - M_UINT_OR_NULL (Content_t, UMTS_FDD_Radio_Access_Technology_Capability, 1), - M_UINT_OR_NULL (Content_t, UMTS_384_TDD_Radio_Access_Technology_Capability, 1), - M_UINT_OR_NULL (Content_t, CDMA2000_Radio_Access_Technology_Capability, 1), - - M_UINT_OR_NULL (Content_t, UMTS_128_TDD_Radio_Access_Technology_Capability, 1), - M_UINT_OR_NULL (Content_t, GERAN_Feature_Package_1, 1), - - M_NEXT_EXIST_OR_NULL(Content_t, Exist_Extended_DTM_multislot_class, 2), - M_UINT (Content_t, Extended_DTM_GPRS_multislot_class, 2), - M_UINT (Content_t, Extended_DTM_EGPRS_multislot_class, 2), - - M_UINT_OR_NULL (Content_t, Modulation_based_multislot_class_support, 1), - - M_NEXT_EXIST_OR_NULL(Content_t, Exist_HighMultislotCapability, 1), - M_UINT (Content_t, HighMultislotCapability, 2), - - M_NEXT_EXIST_OR_NULL(Content_t, Exist_GERAN_lu_ModeCapability, 1), - M_UINT (Content_t, GERAN_lu_ModeCapability, 4), - - M_UINT_OR_NULL (Content_t, GMSK_MultislotPowerProfile, 2), - M_UINT_OR_NULL (Content_t, EightPSK_MultislotProfile, 2), - - M_UINT_OR_NULL (Content_t, MultipleTBF_Capability, 1), - M_UINT_OR_NULL (Content_t, DownlinkAdvancedReceiverPerformance, 2), - M_UINT_OR_NULL (Content_t, ExtendedRLC_MAC_ControlMessageSegmentionsCapability, 1), - M_UINT_OR_NULL (Content_t, DTM_EnhancementsCapability, 1), - - M_NEXT_EXIST_OR_NULL(Content_t, Exist_DTM_GPRS_HighMultislotClass, 2), - M_UINT (Content_t, DTM_GPRS_HighMultislotClass, 3), - M_TYPE (Content_t, DTM_EGPRS_HighMultislotClass, DTM_EGPRS_HighMultislotClass_t), - - M_UINT_OR_NULL (Content_t, PS_HandoverCapability, 1), - - /* additions in release 7 */ - M_UINT_OR_NULL (Content_t, DTM_Handover_Capability, 1), - M_NEXT_EXIST_OR_NULL(Content_t, Exist_DownlinkDualCarrierCapability_r7, 1), - M_TYPE_OR_NULL (Content_t, DownlinkDualCarrierCapability_r7, DownlinkDualCarrierCapability_r7_t), - - M_UINT_OR_NULL (Content_t, FlexibleTimeslotAssignment, 1), - M_UINT_OR_NULL (Content_t, GAN_PS_HandoverCapability, 1), - M_UINT_OR_NULL (Content_t, RLC_Non_persistentMode, 1), - M_UINT_OR_NULL (Content_t, ReducedLatencyCapability, 1), - M_UINT_OR_NULL (Content_t, UplinkEGPRS2, 2), - M_UINT_OR_NULL (Content_t, DownlinkEGPRS2, 2), - - /* additions in release 8 */ - M_UINT_OR_NULL (Content_t, EUTRA_FDD_Support, 1), - M_UINT_OR_NULL (Content_t, EUTRA_TDD_Support, 1), - M_UINT_OR_NULL (Content_t, GERAN_To_EUTRAN_supportInGERAN_PTM, 2), - M_UINT_OR_NULL (Content_t, PriorityBasedReselectionSupport, 1), - -CSN_DESCR_END (Content_t) - -static gint16 Content_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) -{ - if (ar->direction == 0) - { - return osmo_csn1_stream_encode(ar, CSNDESCR(Content_t), vector, readIndex, data); - } - else - { - return osmo_csn1_stream_decode(ar, CSNDESCR(Content_t), vector, readIndex, data); - } -} - -static const -CSN_DESCR_BEGIN (Additional_access_technologies_struct_t) - M_UINT (Additional_access_technologies_struct_t, Access_Technology_Type, 4), - M_UINT (Additional_access_technologies_struct_t, GMSK_Power_class, 3), - M_UINT (Additional_access_technologies_struct_t, Eight_PSK_Power_class, 2), -CSN_DESCR_END (Additional_access_technologies_struct_t) - -static const -CSN_DESCR_BEGIN (Additional_access_technologies_t) - M_REC_TARRAY (Additional_access_technologies_t, Additional_access_technologies, Additional_access_technologies_struct_t, Count_additional_access_technologies), -CSN_DESCR_END (Additional_access_technologies_t) - -static gint16 Additional_access_technologies_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) -{ - if (ar->direction == 0) - { - return osmo_csn1_stream_encode(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data); - } - else - { - return osmo_csn1_stream_decode(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data); - } -} - -static const -CSN_ChoiceElement_t MS_RA_capability_value_Choice[] = -{ - {4, AccTech_GSMP, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSME, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSMR, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM1800, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM1900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM450, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM480, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM850, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM750, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSMT830, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSMT410, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSMT900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM710, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSMT810, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSMOther, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Additional_access_technologies, 7, Additional_access_technologies_Dissector)}, /* Short Form */ -}; - -static const -CSN_DESCR_BEGIN(MS_RA_capability_value_t) - M_CHOICE (MS_RA_capability_value_t, IndexOfAccTech, MS_RA_capability_value_Choice, ElementsOf(MS_RA_capability_value_Choice)), -CSN_DESCR_END (MS_RA_capability_value_t) - -static const -CSN_DESCR_BEGIN (MS_Radio_Access_capability_t) - M_REC_TARRAY_1(MS_Radio_Access_capability_t, MS_RA_capability_value, MS_RA_capability_value_t, Count_MS_RA_capability_value), - M_PADDING_BITS(MS_Radio_Access_capability_t), -CSN_DESCR_END (MS_Radio_Access_capability_t) - /* TS44.060 section 12.30 "MS Radio Access Capability 2". Same as above but without spare bits */ static const CSN_DESCR_BEGIN (MS_Radio_Access_capability2_t) M_REC_TARRAY_1(MS_Radio_Access_capability_t, MS_RA_capability_value, MS_RA_capability_value_t, Count_MS_RA_capability_value), CSN_DESCR_END (MS_Radio_Access_capability2_t) -/*< MS Classmark 3 IE >*/ -#if 0 -static const -CSN_DESCR_BEGIN(ARC_t) - M_UINT (ARC_t, A5_Bits, 4), - M_UINT (ARC_t, Arc2_Spare, 4), - M_UINT (ARC_t, Arc1, 4), -CSN_DESCR_END (ARC_t) -#endif - -#if 0 -static const -CSN_ChoiceElement_t MultibandChoice[] = -{ - {3, 0x00, 0, M_UINT(Multiband_t, u.A5_Bits, 4)}, - {3, 0x05, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x06, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x01, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x02, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x04, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, -}; -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(Multiband_t) - M_CHOICE (Multiband_t, Multiband, MultibandChoice, ElementsOf(MultibandChoice)), -CSN_DESCR_END (Multiband_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(EDGE_RF_Pwr_t) - M_NEXT_EXIST (EDGE_RF_Pwr_t, ExistEDGE_RF_PwrCap1, 1), - M_UINT (EDGE_RF_Pwr_t, EDGE_RF_PwrCap1, 2), - - M_NEXT_EXIST (EDGE_RF_Pwr_t, ExistEDGE_RF_PwrCap2, 1), - M_UINT (EDGE_RF_Pwr_t, EDGE_RF_PwrCap2, 2), -CSN_DESCR_END (EDGE_RF_Pwr_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(MS_Class3_Unpacked_t) - M_UINT (MS_Class3_Unpacked_t, Spare1, 1), - M_TYPE (MS_Class3_Unpacked_t, Multiband, Multiband_t), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_R_Support, 1), - M_UINT (MS_Class3_Unpacked_t, R_GSM_Arc, 3), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MultiSlotCapability, 1), - M_UINT (MS_Class3_Unpacked_t, MultiSlotClass, 5), - - M_UINT (MS_Class3_Unpacked_t, UCS2, 1), - M_UINT (MS_Class3_Unpacked_t, ExtendedMeasurementCapability, 1), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MS_MeasurementCapability, 2), - M_UINT (MS_Class3_Unpacked_t, SMS_VALUE, 4), - M_UINT (MS_Class3_Unpacked_t, SM_VALUE, 4), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MS_PositioningMethodCapability, 1), - M_UINT (MS_Class3_Unpacked_t, MS_PositioningMethod, 5), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_EDGE_MultiSlotCapability, 1), - M_UINT (MS_Class3_Unpacked_t, EDGE_MultiSlotClass, 5), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_EDGE_Struct, 2), - M_UINT (MS_Class3_Unpacked_t, ModulationCapability, 1), - M_TYPE (MS_Class3_Unpacked_t, EDGE_RF_PwrCaps, EDGE_RF_Pwr_t), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM400_Info, 2), - M_UINT (MS_Class3_Unpacked_t, GSM400_Bands, 2), - M_UINT (MS_Class3_Unpacked_t, GSM400_Arc, 4), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM850_Arc, 1), - M_UINT (MS_Class3_Unpacked_t, GSM850_Arc, 4), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_PCS1900_Arc, 1), - M_UINT (MS_Class3_Unpacked_t, PCS1900_Arc, 4), - - M_UINT (MS_Class3_Unpacked_t, UMTS_FDD_Radio_Access_Technology_Capability, 1), - M_UINT (MS_Class3_Unpacked_t, UMTS_384_TDD_Radio_Access_Technology_Capability, 1), - M_UINT (MS_Class3_Unpacked_t, CDMA2000_Radio_Access_Technology_Capability, 1), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_DTM_GPRS_multislot_class, 3), - M_UINT (MS_Class3_Unpacked_t, DTM_GPRS_multislot_class, 2), - M_UINT (MS_Class3_Unpacked_t, Single_Slot_DTM, 1), - M_TYPE (MS_Class3_Unpacked_t, DTM_EGPRS_Params, DTM_EGPRS_t), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_SingleBandSupport, 1), - M_UINT (MS_Class3_Unpacked_t, GSM_Band, 4), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM_700_Associated_Radio_Capability, 1), - M_UINT (MS_Class3_Unpacked_t, GSM_700_Associated_Radio_Capability, 4), - - M_UINT (MS_Class3_Unpacked_t, UMTS_128_TDD_Radio_Access_Technology_Capability, 1), - M_UINT (MS_Class3_Unpacked_t, GERAN_Feature_Package_1, 1), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_Extended_DTM_multislot_class, 2), - M_UINT (MS_Class3_Unpacked_t, Extended_DTM_GPRS_multislot_class, 2), - M_UINT (MS_Class3_Unpacked_t, Extended_DTM_EGPRS_multislot_class, 2), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_HighMultislotCapability, 1), - M_UINT (MS_Class3_Unpacked_t, HighMultislotCapability, 2), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GERAN_lu_ModeCapability, 1), - M_UINT (MS_Class3_Unpacked_t, GERAN_lu_ModeCapability, 4), - - M_UINT (MS_Class3_Unpacked_t, GERAN_FeaturePackage_2, 1), - - M_UINT (MS_Class3_Unpacked_t, GMSK_MultislotPowerProfile, 2), - M_UINT (MS_Class3_Unpacked_t, EightPSK_MultislotProfile, 2), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_TGSM_400_Bands, 2), - M_UINT (MS_Class3_Unpacked_t, TGSM_400_BandsSupported, 2), - M_UINT (MS_Class3_Unpacked_t, TGSM_400_AssociatedRadioCapability, 4), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_TGSM_900_AssociatedRadioCapability, 1), - M_UINT (MS_Class3_Unpacked_t, TGSM_900_AssociatedRadioCapability, 4), - - M_UINT (MS_Class3_Unpacked_t, DownlinkAdvancedReceiverPerformance, 2), - M_UINT (MS_Class3_Unpacked_t, DTM_EnhancementsCapability, 1), - - M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_DTM_GPRS_HighMultislotClass, 3), - M_UINT (MS_Class3_Unpacked_t, DTM_GPRS_HighMultislotClass, 3), - M_UINT (MS_Class3_Unpacked_t, OffsetRequired, 1), - M_TYPE (MS_Class3_Unpacked_t, DTM_EGPRS_HighMultislotClass, DTM_EGPRS_HighMultislotClass_t), - - M_UINT (MS_Class3_Unpacked_t, RepeatedSACCH_Capability, 1), - M_UINT (MS_Class3_Unpacked_t, Spare2, 1), -CSN_DESCR_END (MS_Class3_Unpacked_t) -#endif - static const CSN_DESCR_BEGIN(Channel_Request_Description_t) M_UINT (Channel_Request_Description_t, PEAK_THROUGHPUT_CLASS, 4), @@ -5579,51 +5263,6 @@ } } -int osmo_gprs_rlcmac_decode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t *data) -{ - csnStream_t ar; - int ret; - unsigned readIndex = 0; - - osmo_csn1_stream_init(&ar, 0, 8 * vector->data_len); - - /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere, so we need to start the log somewhere... */ - LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_decode (RAcap): "); - ret = osmo_csn1_stream_decode(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &readIndex, data); - - /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere without trailing - newline, so as a caller we are responisble for submitting it */ - LOGPC(DLCSN1, LOGL_INFO, "\n"); - - if (ret > 0) { - LOGP(g_log_cat, LOGL_NOTICE, "RAcap: Got %d remaining bits unhandled by decoder at the end of bitvec\n", ret); - ret = 0; - } - return ret; -} - -int osmo_gprs_rlcmac_encode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t *data) -{ - unsigned writeIndex = 0; - csnStream_t ar; - int ret; - - osmo_csn1_stream_init(&ar, 0, vector->data_len * 8); - - /* recursive osmo_csn1_stream_encode call uses LOGPC everywhere, so we need to start the log somewhere... */ - LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_encode (RAcap): "); - ret = osmo_csn1_stream_encode(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &writeIndex, data); - LOGPC(DLCSN1, LOGL_INFO, "\n"); - - if (ret > 0 || ret == CSN_ERROR_NEED_MORE_BITS_TO_UNPACK) { - LOGP(g_log_cat, LOGL_ERROR, "Failed to encode MS RA Capability IE: not enough bits " - "in the output buffer (rc=%d)\n", ret); - ret = CSN_ERROR_NEED_MORE_BITS_TO_UNPACK; - } - - return ret; -} - const struct value_string osmo_gprs_rlcmac_egprs_pkt_ch_req_type_names[] = { { EGPRS_PKT_CHAN_REQ_ONE_PHASE, "One Phase Access" }, { EGPRS_PKT_CHAN_REQ_SHORT, "Short Access" }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Idedf52423fef18b929e8096fbe4e130b5a6c7d2c Gerrit-Change-Number: 29194 Gerrit-PatchSet: 5 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

1 year, 8 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: add osmo_gprs_rlcmac_decode_si13ro()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29195 ) Change subject: rlcmac: add osmo_gprs_rlcmac_decode_si13ro() ...................................................................... rlcmac: add osmo_gprs_rlcmac_decode_si13ro() Change-Id: Ic8446509ef474b8496e5557aab3d2a9e94e11897 --- M configure.ac M include/osmocom/gprs/rlcmac/gprs_rlcmac.h M src/rlcmac/ts_44_018.c M src/rlcmac/ts_44_060.c M tests/Makefile.am M tests/testsuite.at A tests/ts_44_018/Makefile.am A tests/ts_44_018/ts_44_018_test.c A tests/ts_44_018/ts_44_018_test.err A tests/ts_44_018/ts_44_018_test.ok 10 files changed, 189 insertions(+), 12 deletions(-) Approvals: fixeria: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 0606cf5..0275362 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,7 @@ src/csn1/Makefile src/rlcmac/Makefile tests/Makefile + tests/ts_44_018/Makefile tests/ts_44_060/Makefile Makefile contrib/libosmo-gprs.spec]) diff --git a/include/osmocom/gprs/rlcmac/gprs_rlcmac.h b/include/osmocom/gprs/rlcmac/gprs_rlcmac.h index 7163b7e..81410ef 100644 --- a/include/osmocom/gprs/rlcmac/gprs_rlcmac.h +++ b/include/osmocom/gprs/rlcmac/gprs_rlcmac.h @@ -5377,4 +5377,7 @@ int osmo_gprs_rlcmac_encode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t * data); int osmo_gprs_rlcmac_decode_egprs_pkt_ch_req(guint16 ra, EGPRS_PacketChannelRequest_t *data); +int osmo_gprs_rlcmac_decode_si13ro(SI_13_t *storage, + const uint8_t *data, size_t data_len); + void osmo_gprs_rlcmac_set_log_cat(int cat); diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/ts_44_018.c index 10ff872..c9e63e7 100644 --- a/src/rlcmac/ts_44_018.c +++ b/src/rlcmac/ts_44_018.c @@ -30,6 +30,13 @@ #include <osmocom/csn1/csn1.h> #include <osmocom/gprs/rlcmac/gprs_rlcmac.h> +extern int g_log_cat; + +CSN_DESCR_EXTERN(GPRS_Mobile_Allocation_t); +CSN_DESCR_EXTERN(PBCCH_Not_present_t); +CSN_DESCR_EXTERN(PBCCH_present_t); +CSN_DESCR_EXTERN(StartingTime_t); + /*<P1 Rest Octets>*/ /*<P2 Rest Octets>*/ #if 0 @@ -392,34 +399,27 @@ CSN_DESCR_END (IA_PacketAssignment_t) #endif -#if 0 static const CSN_DESCR_BEGIN(SI13_AdditionsR6) M_NEXT_EXIST (SI13_AdditionsR6, Exist_LB_MS_TXPWR_MAX_CCH, 1), M_UINT (SI13_AdditionsR6, LB_MS_TXPWR_MAX_CCH, 5), M_UINT (SI13_AdditionsR6, SI2n_SUPPORT, 2), CSN_DESCR_END (SI13_AdditionsR6) -#endif -#if 0 static const CSN_DESCR_BEGIN(SI13_AdditionsR4) M_UINT (SI13_AdditionsR4, SI_STATUS_IND, 1), M_NEXT_EXIST_OR_NULL_LH (SI13_AdditionsR4, Exist_AdditionsR6, 1), M_TYPE (SI13_AdditionsR4, AdditionsR6, SI13_AdditionsR6), CSN_DESCR_END (SI13_AdditionsR4) -#endif -#if 0 static const CSN_DESCR_BEGIN(SI13_AdditionR99) M_UINT (SI13_AdditionR99, SGSNR, 1), M_NEXT_EXIST_OR_NULL_LH (SI13_AdditionR99, Exist_AdditionsR4, 1), M_TYPE (SI13_AdditionR99, AdditionsR4, SI13_AdditionsR4), CSN_DESCR_END (SI13_AdditionR99) -#endif -#if 0 static const CSN_DESCR_BEGIN (SI_13_t) M_THIS_EXIST_LH (SI_13_t), @@ -438,7 +438,6 @@ M_NEXT_EXIST_OR_NULL_LH(SI_13_t, Exist_AdditionsR99, 1), M_TYPE (SI_13_t, AdditionsR99, SI13_AdditionR99), CSN_DESCR_END (SI_13_t) -#endif /* Enhanced Measurement Report */ #if 0 @@ -607,3 +606,43 @@ M_VAR_TARRAY (EnhancedMeasurementReport_t, REPORTING_QUANTITY_Instances, REPORTING_QUANTITY_Instance_t, Count_REPORTING_QUANTITY_Instances), CSN_DESCR_END (EnhancedMeasurementReport_t) #endif + +static int _osmo_gprs_rlcmac_decode(void *storage, + const CSN_DESCR *descr, + const char *descr_name, + const uint8_t *data, + size_t data_len) +{ + unsigned int readIndex = 0; + csnStream_t ar; + int ret; + + osmo_csn1_stream_init(&ar, 0, 8 * data_len); + + struct bitvec bv = { + .data = (uint8_t *)data, + .data_len = data_len, + }; + + LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_decode (%s): ", descr_name); + ret = osmo_csn1_stream_decode(&ar, descr, &bv, &readIndex, storage); + LOGPC(DLCSN1, LOGL_INFO, "\n"); + + if (ret > 0) { + LOGP(g_log_cat, LOGL_NOTICE, + "%s: %d remaining bits unhandled by decoder\n", + descr_name, ret); + ret = 0; + } + + return ret; +} + +int osmo_gprs_rlcmac_decode_si13ro(SI_13_t *storage, + const uint8_t *data, size_t data_len) +{ + return _osmo_gprs_rlcmac_decode(storage, + CSNDESCR(SI_13_t), + "SI13 Rest Octets", + data, data_len); +} diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/ts_44_060.c index e07d737..e557ae8 100644 --- a/src/rlcmac/ts_44_060.c +++ b/src/rlcmac/ts_44_060.c @@ -54,7 +54,7 @@ M_UINT (PLMN_t, MNC1, 4), CSN_DESCR_END (PLMN_t) -static const +const CSN_DESCR_BEGIN(StartingTime_t) M_UINT (StartingTime_t, N32, 5), M_UINT (StartingTime_t, N51, 6), @@ -242,7 +242,7 @@ M_REC_ARRAY (ARFCN_index_list_t, ARFCN_INDEX, ElementsOf_ARFCN_INDEX, 6), CSN_DESCR_END (ARFCN_index_list_t) -static const +const CSN_DESCR_BEGIN(GPRS_Mobile_Allocation_t) M_UINT (GPRS_Mobile_Allocation_t, HSN, 6), M_REC_ARRAY (GPRS_Mobile_Allocation_t, RFL_NUMBER, ElementsOf_RFL_NUMBER, 4), @@ -277,7 +277,7 @@ M_TYPE (GPRS_Cell_Options_t, Extension_Bits, Extension_Bits_t), CSN_DESCR_END (GPRS_Cell_Options_t) -static const +const CSN_DESCR_BEGIN(PBCCH_Not_present_t) M_UINT (PBCCH_Not_present_t, RAC, 8), M_UINT (PBCCH_Not_present_t, SPGC_CCCH_SUP, 1), @@ -304,7 +304,7 @@ M_CHOICE (PBCCH_Description_t, UnionType, SI13_PBCCH_Description_Channel, ElementsOf(SI13_PBCCH_Description_Channel)), CSN_DESCR_END (PBCCH_Description_t) -static const +const CSN_DESCR_BEGIN(PBCCH_present_t) M_UINT (PBCCH_present_t, PSI1_REPEAT_PERIOD, 4), M_TYPE (PBCCH_present_t, PBCCH_Description, PBCCH_Description_t), diff --git a/tests/Makefile.am b/tests/Makefile.am index bcde16f..f4b4dbf 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ + ts_44_018 \ ts_44_060 \ $(NULL) diff --git a/tests/testsuite.at b/tests/testsuite.at index 1aee874..53e5ab2 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,6 +1,13 @@ AT_INIT AT_BANNER([Regression tests]) +AT_SETUP([rlcmac/ts_44_018]) +AT_KEYWORDS([rlcmac ts_44_018]) +cat $abs_srcdir/ts_44_018/ts_44_018_test.ok > expout +cat $abs_srcdir/ts_44_018/ts_44_018_test.err > experr +AT_CHECK([$abs_top_builddir/tests/ts_44_018/ts_44_018_test], [0], [expout], [experr]) +AT_CLEANUP + AT_SETUP([rlcmac/ts_44_060]) AT_KEYWORDS([rlcmac ts_44_060]) cat $abs_srcdir/ts_44_060/ts_44_060_test.ok > expout diff --git a/tests/ts_44_018/Makefile.am b/tests/ts_44_018/Makefile.am new file mode 100644 index 0000000..13c0afa --- /dev/null +++ b/tests/ts_44_018/Makefile.am @@ -0,0 +1,25 @@ +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + -I$(top_srcdir)/include/ \ + $(NULL) + +AM_LDFLAGS = \ + -no-install \ + $(NULL) + +check_PROGRAMS = \ + ts_44_018_test \ + $(NULL) + +EXTRA_DIST = \ + ts_44_018_test.ok \ + ts_44_018_test.err \ + $(NULL) + +ts_44_018_test_SOURCES = ts_44_018_test.c +ts_44_018_test_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(top_builddir)/src/csn1/libosmo-csn1.la \ + $(top_builddir)/src/rlcmac/libosmo-gprs-rlcmac.la \ + $(NULL) diff --git a/tests/ts_44_018/ts_44_018_test.c b/tests/ts_44_018/ts_44_018_test.c new file mode 100644 index 0000000..dd6f4f7 --- /dev/null +++ b/tests/ts_44_018/ts_44_018_test.c @@ -0,0 +1,80 @@ +/* RLCMACTest.c + * + * Copyright (C) 2011 Ivan Klyuchnikov + * Contributions by sysmocom - s.f.m.c. GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <stdint.h> +#include <stdio.h> + +#include <osmocom/core/application.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/msgb.h> + +#include <osmocom/csn1/csn1.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gprs/rlcmac/gprs_rlcmac.h> + +static void *tall_ctx = NULL; + +static void test_si13ro(void) +{ + printf("*** %s ***\n", __func__); + + static const char *testData[] = { + "9000185a6fc9f2b5304208eb2b2b2b2b2b2b2b2b", // osmo-pcu, with EGPRS + "a000185a6fc9f14608411b2b2b2b2b2b2b2b2b2b", // osmo-pcu, without EGPRS + "90005847eb4a93e51a218a16ab2b2b2b2b2b2b2b", // real network (Iran, Tehran) + "90005847eb4a93e50a218a162b2b2b2b2b2b2b2b", // real network (Turkey, Istanbul) + "b0005840654a92b53c2942db2b2b2b2b2b2b2b2b", // real network (Turkey, Trabzon) + }; + + for (unsigned int i = 0; i < ARRAY_SIZE(testData); i++) { + uint8_t buf[GSM_MACBLOCK_LEN - 3]; + SI_13_t si13ro = { 0 }; + int rc; + + printf("testData[%d] = %s\n", i, testData[i]); + + rc = osmo_hexparse(testData[i], &buf[0], sizeof(buf)); + OSMO_ASSERT(rc == sizeof(buf)); + + rc = osmo_gprs_rlcmac_decode_si13ro(&si13ro, &buf[0], sizeof(buf)); + printf("osmo_gprs_rlcmac_decode_si13ro() returns %d\n", rc); + } +} + +static const struct log_info_cat test_log_categories[] = { }; +static const struct log_info test_log_info = { + .cat = test_log_categories, + .num_cat = ARRAY_SIZE(test_log_categories), +}; + +int main(int argc, char *argv[]) +{ + tall_ctx = talloc_named_const(NULL, 1, __FILE__); + + osmo_init_logging2(tall_ctx, &test_log_info); + log_parse_category_mask(osmo_stderr_target, "DLGLOBAL,1:DLCSN1,1:"); + + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); + + test_si13ro(); + + talloc_free(tall_ctx); +} diff --git a/tests/ts_44_018/ts_44_018_test.err b/tests/ts_44_018/ts_44_018_test.err new file mode 100644 index 0000000..ebea6e0 --- /dev/null +++ b/tests/ts_44_018/ts_44_018_test.err @@ -0,0 +1,10 @@ +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 0 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 3 | T3192 = 2 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 15 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 1 | PAN_MAX = 7 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 11 | Extension_Info = 212 | Extension_Info = 6 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 0 | T_AVG_W = 16 | T_AVG_T = 16 | PC_MEAS_CHAN = 0 | N_AVG_I = 8 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 0 | : End AdditionsR99 | +DLGLOBAL NOTICE SI13 Rest Octets: 69 remaining bits unhandled by decoder +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 2 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 0 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 3 | T3192 = 2 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 15 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 1 | PAN_MAX = 7 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 6 | Extension_Info = 6 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 0 | T_AVG_W = 16 | T_AVG_T = 16 | PC_MEAS_CHAN = 0 | N_AVG_I = 8 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 0 | : End AdditionsR99 | +DLGLOBAL NOTICE SI13 Rest Octets: 74 remaining bits unhandled by decoder +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 7 | DRX_TIMER_MAX = 7 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 6 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 16 | Extension_Info = 148 | Extension_Info = 104 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 12 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 1 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | +DLGLOBAL NOTICE SI13 Rest Octets: 62 remaining bits unhandled by decoder +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 7 | DRX_TIMER_MAX = 7 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 6 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 16 | Extension_Info = 148 | Extension_Info = 40 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 12 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 0 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | +DLGLOBAL NOTICE SI13 Rest Octets: 62 remaining bits unhandled by decoder +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 3 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 0 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 0 | BS_CV_MAX = 10 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 11 | Extension_Info = 212 | Extension_Info = 7 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 10 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 1 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | +DLGLOBAL NOTICE SI13 Rest Octets: 67 remaining bits unhandled by decoder diff --git a/tests/ts_44_018/ts_44_018_test.ok b/tests/ts_44_018/ts_44_018_test.ok new file mode 100644 index 0000000..864e03c --- /dev/null +++ b/tests/ts_44_018/ts_44_018_test.ok @@ -0,0 +1,11 @@ +*** test_si13ro *** +testData[0] = 9000185a6fc9f2b5304208eb2b2b2b2b2b2b2b2b +osmo_gprs_rlcmac_decode_si13ro() returns 0 +testData[1] = a000185a6fc9f14608411b2b2b2b2b2b2b2b2b2b +osmo_gprs_rlcmac_decode_si13ro() returns 0 +testData[2] = 90005847eb4a93e51a218a16ab2b2b2b2b2b2b2b +osmo_gprs_rlcmac_decode_si13ro() returns 0 +testData[3] = 90005847eb4a93e50a218a162b2b2b2b2b2b2b2b +osmo_gprs_rlcmac_decode_si13ro() returns 0 +testData[4] = b0005840654a92b53c2942db2b2b2b2b2b2b2b2b +osmo_gprs_rlcmac_decode_si13ro() returns 0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic8446509ef474b8496e5557aab3d2a9e94e11897 Gerrit-Change-Number: 29195 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: make logging category configurable

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29207 ) Change subject: rlcmac: make logging category configurable ...................................................................... rlcmac: make logging category configurable Change-Id: Icfef6de126304da81120f1d7b212992ead3409aa --- M include/osmocom/gprs/rlcmac/gprs_rlcmac.h M src/rlcmac/Makefile.am M src/rlcmac/gprs_rlcmac.c A src/rlcmac/misc.c 4 files changed, 79 insertions(+), 52 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/rlcmac/gprs_rlcmac.h b/include/osmocom/gprs/rlcmac/gprs_rlcmac.h index f83a3f9..7163b7e 100644 --- a/include/osmocom/gprs/rlcmac/gprs_rlcmac.h +++ b/include/osmocom/gprs/rlcmac/gprs_rlcmac.h @@ -5376,3 +5376,5 @@ int osmo_gprs_rlcmac_decode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t * data); int osmo_gprs_rlcmac_encode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t * data); int osmo_gprs_rlcmac_decode_egprs_pkt_ch_req(guint16 ra, EGPRS_PacketChannelRequest_t *data); + +void osmo_gprs_rlcmac_set_log_cat(int cat); diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am index 51e9ec1..d484a6f 100644 --- a/src/rlcmac/Makefile.am +++ b/src/rlcmac/Makefile.am @@ -23,6 +23,7 @@ libosmo_gprs_rlcmac_la_SOURCES = \ gprs_rlcmac.c \ + misc.c \ $(NULL) libosmo_gprs_rlcmac_la_LDFLAGS = \ diff --git a/src/rlcmac/gprs_rlcmac.c b/src/rlcmac/gprs_rlcmac.c index 80b399b..b0b7ca8 100644 --- a/src/rlcmac/gprs_rlcmac.c +++ b/src/rlcmac/gprs_rlcmac.c @@ -35,8 +35,7 @@ #include <osmocom/csn1/csn1.h> #include <osmocom/gprs/rlcmac/gprs_rlcmac.h> -/* FIXME: configurable logging category */ -#define DRLCMACDATA DLGLOBAL +extern int g_log_cat; /* Payload type as defined in TS 44.060 / 10.4.7 */ #define PAYLOAD_TYPE_DATA 0 @@ -5377,12 +5376,12 @@ if (payload_type == PAYLOAD_TYPE_DATA) { - LOGP(DRLCMACDATA, LOGL_NOTICE, "Payload Type: DATA (0), not implemented\n"); + LOGP(g_log_cat, LOGL_NOTICE, "Payload Type: DATA (0), not implemented\n"); return CSN_ERROR_GENERAL; } else if (payload_type == PAYLOAD_TYPE_RESERVED) { - LOGP(DRLCMACDATA, LOGL_NOTICE, "Payload Type: RESERVED (3)\n"); + LOGP(g_log_cat, LOGL_NOTICE, "Payload Type: RESERVED (3)\n"); return CSN_ERROR_GENERAL; } @@ -5484,7 +5483,7 @@ LOGPC(DLCSN1, LOGL_INFO, "\n"); if (ret > 0) { - LOGP(DRLCMACDATA, LOGL_NOTICE, "%s: Got %d remaining bits unhandled by decoder at the end of bitvec\n", msg_type_name, ret); + LOGP(g_log_cat, LOGL_NOTICE, "%s: Got %d remaining bits unhandled by decoder at the end of bitvec\n", msg_type_name, ret); ret = 0; } @@ -5509,12 +5508,12 @@ if (data->PAYLOAD_TYPE == PAYLOAD_TYPE_DATA) { - LOGP(DRLCMACDATA, LOGL_NOTICE, "Payload Type: DATA (0), not implemented\n"); + LOGP(g_log_cat, LOGL_NOTICE, "Payload Type: DATA (0), not implemented\n"); return CSN_ERROR_GENERAL; } else if (data->PAYLOAD_TYPE == PAYLOAD_TYPE_RESERVED) { - LOGP(DRLCMACDATA, LOGL_NOTICE, "Payload Type: RESERVED (3)\n"); + LOGP(g_log_cat, LOGL_NOTICE, "Payload Type: RESERVED (3)\n"); return CSN_ERROR_GENERAL; } /* We can decode the message */ @@ -5696,7 +5695,7 @@ LOGPC(DLCSN1, LOGL_INFO, "\n"); if (ret > 0) { - LOGP(DRLCMACDATA, LOGL_NOTICE, "%s: Got %d remaining bits unhandled by decoder at the end of bitvec\n", msg_type_name, ret); + LOGP(g_log_cat, LOGL_NOTICE, "%s: Got %d remaining bits unhandled by decoder at the end of bitvec\n", msg_type_name, ret); ret = 0; } @@ -5807,8 +5806,8 @@ LOGPC(DLCSN1, LOGL_INFO, "\n"); if (ret > 0 || ret == CSN_ERROR_NEED_MORE_BITS_TO_UNPACK) { - LOGP(DRLCMACDATA, LOGL_ERROR, "Failed to encode an Uplink block: not enough bits " - "in the output buffer (rc=%d)\n", ret); + LOGP(g_log_cat, LOGL_ERROR, "Failed to encode an Uplink block: not enough bits " + "in the output buffer (rc=%d)\n", ret); ret = CSN_ERROR_NEED_MORE_BITS_TO_UNPACK; } @@ -5828,12 +5827,12 @@ if (data->PAYLOAD_TYPE == PAYLOAD_TYPE_DATA) { - LOGP(DRLCMACDATA, LOGL_NOTICE, "Payload Type: DATA (0), not implemented\n"); + LOGP(g_log_cat, LOGL_NOTICE, "Payload Type: DATA (0), not implemented\n"); return CSN_ERROR_GENERAL; } else if (data->PAYLOAD_TYPE == PAYLOAD_TYPE_RESERVED) { - LOGP(DRLCMACDATA, LOGL_NOTICE, "Payload Type: RESERVED (3)\n"); + LOGP(g_log_cat, LOGL_NOTICE, "Payload Type: RESERVED (3)\n"); return CSN_ERROR_GENERAL; } /* We can encode the message */ @@ -6017,8 +6016,8 @@ LOGPC(DLCSN1, LOGL_INFO, "\n"); if (ret > 0 || ret == CSN_ERROR_NEED_MORE_BITS_TO_UNPACK) { - LOGP(DRLCMACDATA, LOGL_ERROR, "Failed to encode a Downlink block: not enough bits " - "in the output buffer (rc=%d)\n", ret); + LOGP(g_log_cat, LOGL_ERROR, "Failed to encode a Downlink block: not enough bits " + "in the output buffer (rc=%d)\n", ret); ret = CSN_ERROR_NEED_MORE_BITS_TO_UNPACK; } @@ -6039,25 +6038,25 @@ data->CV = bitvec_read_field(vector, &readIndex, 4); data->SI = bitvec_read_field(vector, &readIndex, 1); data->R = bitvec_read_field(vector, &readIndex, 1); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "PAYLOAD_TYPE = %u ", (unsigned)(data->PAYLOAD_TYPE)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "CV = %u ", (unsigned)(data->CV)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "SI = %u ", (unsigned)(data->SI)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "R = %u ", (unsigned)(data->R)); + LOGPC(g_log_cat, LOGL_NOTICE, "PAYLOAD_TYPE = %u ", (unsigned)(data->PAYLOAD_TYPE)); + LOGPC(g_log_cat, LOGL_NOTICE, "CV = %u ", (unsigned)(data->CV)); + LOGPC(g_log_cat, LOGL_NOTICE, "SI = %u ", (unsigned)(data->SI)); + LOGPC(g_log_cat, LOGL_NOTICE, "R = %u ", (unsigned)(data->R)); // Octet 1 data->spare = bitvec_read_field(vector, &readIndex, 1); data->PI = bitvec_read_field(vector, &readIndex, 1); data->TFI = bitvec_read_field(vector, &readIndex, 5); data->TI = bitvec_read_field(vector, &readIndex, 1); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "spare = %u ", (unsigned)(data->spare)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "PI = %u ", (unsigned)(data->PI)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "TFI = %u ", (unsigned)(data->TFI)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "TI = %u ", (unsigned)(data->TI)); + LOGPC(g_log_cat, LOGL_NOTICE, "spare = %u ", (unsigned)(data->spare)); + LOGPC(g_log_cat, LOGL_NOTICE, "PI = %u ", (unsigned)(data->PI)); + LOGPC(g_log_cat, LOGL_NOTICE, "TFI = %u ", (unsigned)(data->TFI)); + LOGPC(g_log_cat, LOGL_NOTICE, "TI = %u ", (unsigned)(data->TI)); // Octet 2 data->BSN = bitvec_read_field(vector, &readIndex, 7); data->E_1 = bitvec_read_field(vector, &readIndex, 1); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "BSN = %u ", (unsigned)(data->BSN)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "E_1 = %u ", (unsigned)(data->E_1)); + LOGPC(g_log_cat, LOGL_NOTICE, "BSN = %u ", (unsigned)(data->BSN)); + LOGPC(g_log_cat, LOGL_NOTICE, "E_1 = %u ", (unsigned)(data->E_1)); if (data->E_1 == 0) // Extension octet follows immediately @@ -6069,37 +6068,37 @@ data->LENGTH_INDICATOR[i] = bitvec_read_field(vector, &readIndex, 6); data->M[i] = bitvec_read_field(vector, &readIndex, 1); data->E[i] = bitvec_read_field(vector, &readIndex, 1); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "LENGTH_INDICATOR[%u] = %u ", i, (unsigned)(data->LENGTH_INDICATOR[i])); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "M[%u] = %u ", i, (unsigned)(data->M[i])); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "E[%u] = %u ", i, (unsigned)(data->E[i])); + LOGPC(g_log_cat, LOGL_NOTICE, "LENGTH_INDICATOR[%u] = %u ", i, (unsigned)(data->LENGTH_INDICATOR[i])); + LOGPC(g_log_cat, LOGL_NOTICE, "M[%u] = %u ", i, (unsigned)(data->M[i])); + LOGPC(g_log_cat, LOGL_NOTICE, "E[%u] = %u ", i, (unsigned)(data->E[i])); i++; } while((data->M[i-1] == 1)&&(data->E[i-1] == 0)); } if (data->TI == 1) // TLLI field is present { data->TLLI = bitvec_read_field(vector, &readIndex, 32); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "TLLI = %08x ", data->TLLI); + LOGPC(g_log_cat, LOGL_NOTICE, "TLLI = %08x ", data->TLLI); if (data->PI == 1) // PFI is present if TI field indicates presence of TLLI { data->PFI = bitvec_read_field(vector, &readIndex, 7); data->E_2 = bitvec_read_field(vector, &readIndex, 1); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "PFI = %u ", (unsigned)(data->PFI)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "E_2 = %u ", (unsigned)(data->E_2)); + LOGPC(g_log_cat, LOGL_NOTICE, "PFI = %u ", (unsigned)(data->PFI)); + LOGPC(g_log_cat, LOGL_NOTICE, "E_2 = %u ", (unsigned)(data->E_2)); } } unsigned dataLen = 23 - readIndex/8; - LOGPC(DRLCMACDATA, LOGL_NOTICE, "DATA[%u] = ", dataLen); + LOGPC(g_log_cat, LOGL_NOTICE, "DATA[%u] = ", dataLen); assert(dataLen <= 20); for (i = 0; i < dataLen; i++) { data->RLC_DATA[i] = bitvec_read_field(vector, &readIndex, 8); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "%02x", (unsigned)(data->RLC_DATA[i])); + LOGPC(g_log_cat, LOGL_NOTICE, "%02x", (unsigned)(data->RLC_DATA[i])); } - LOGPC(DRLCMACDATA, LOGL_NOTICE, "\n"); + LOGPC(g_log_cat, LOGL_NOTICE, "\n"); } else { - LOGP(DRLCMACDATA, LOGL_NOTICE, "Payload Type: RESERVED (3)\n"); + LOGP(g_log_cat, LOGL_NOTICE, "Payload Type: RESERVED (3)\n"); return; } } @@ -6116,24 +6115,24 @@ bitvec_write_field(vector, &writeIndex, data->RRBP, 2); bitvec_write_field(vector, &writeIndex, data->SP, 1); bitvec_write_field(vector, &writeIndex, data->USF, 3); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "PAYLOAD_TYPE = %u ", (unsigned)(data->PAYLOAD_TYPE)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "RRBP = %u ", (unsigned)(data->RRBP)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "SP = %u ", (unsigned)(data->SP)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "USF = %u ", (unsigned)(data->USF)); + LOGPC(g_log_cat, LOGL_NOTICE, "PAYLOAD_TYPE = %u ", (unsigned)(data->PAYLOAD_TYPE)); + LOGPC(g_log_cat, LOGL_NOTICE, "RRBP = %u ", (unsigned)(data->RRBP)); + LOGPC(g_log_cat, LOGL_NOTICE, "SP = %u ", (unsigned)(data->SP)); + LOGPC(g_log_cat, LOGL_NOTICE, "USF = %u ", (unsigned)(data->USF)); // Octet 1 bitvec_write_field(vector, &writeIndex, data->PR, 2); bitvec_write_field(vector, &writeIndex, data->TFI, 5); bitvec_write_field(vector, &writeIndex, data->FBI, 1); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "PR = %u ", (unsigned)(data->PR)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "TFI = %u ", (unsigned)(data->TFI)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "FBI = %u ", (unsigned)(data->FBI)); + LOGPC(g_log_cat, LOGL_NOTICE, "PR = %u ", (unsigned)(data->PR)); + LOGPC(g_log_cat, LOGL_NOTICE, "TFI = %u ", (unsigned)(data->TFI)); + LOGPC(g_log_cat, LOGL_NOTICE, "FBI = %u ", (unsigned)(data->FBI)); // Octet 2 bitvec_write_field(vector, &writeIndex, data->BSN, 7); bitvec_write_field(vector, &writeIndex, data->E_1, 1); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "BSN = %u ", (unsigned)(data->BSN)); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "E_1 = %u ", (unsigned)(data->E_1)); + LOGPC(g_log_cat, LOGL_NOTICE, "BSN = %u ", (unsigned)(data->BSN)); + LOGPC(g_log_cat, LOGL_NOTICE, "E_1 = %u ", (unsigned)(data->E_1)); // Octet 3 (optional) if (data->E_1 == 0) @@ -6144,22 +6143,22 @@ bitvec_write_field(vector, &writeIndex, data->LENGTH_INDICATOR[i], 6); bitvec_write_field(vector, &writeIndex, data->M[i], 1); bitvec_write_field(vector, &writeIndex, data->E[i], 1); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "LENGTH_INDICATOR[%u] = %u ", i, (unsigned)(data->LENGTH_INDICATOR[i])); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "M[%u] = %u ", i, (unsigned)(data->M[i])); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "E[%u] = %u ", i, (unsigned)(data->E[i])); + LOGPC(g_log_cat, LOGL_NOTICE, "LENGTH_INDICATOR[%u] = %u ", i, (unsigned)(data->LENGTH_INDICATOR[i])); + LOGPC(g_log_cat, LOGL_NOTICE, "M[%u] = %u ", i, (unsigned)(data->M[i])); + LOGPC(g_log_cat, LOGL_NOTICE, "E[%u] = %u ", i, (unsigned)(data->E[i])); i++; } while ((data->M[i-1] == 1) && (data->E[i-1] == 0)); } unsigned dataNumOctets = 23 - writeIndex/8; - LOGPC(DRLCMACDATA, LOGL_NOTICE, "DATA[%u] = ", dataNumOctets); + LOGPC(g_log_cat, LOGL_NOTICE, "DATA[%u] = ", dataNumOctets); assert(dataNumOctets <= 20); for (i = 0; i < dataNumOctets; i++) { bitvec_write_field(vector, &writeIndex, data->RLC_DATA[i], 8); - LOGPC(DRLCMACDATA, LOGL_NOTICE, "%02x", (unsigned)(data->RLC_DATA[i])); + LOGPC(g_log_cat, LOGL_NOTICE, "%02x", (unsigned)(data->RLC_DATA[i])); } - LOGPC(DRLCMACDATA, LOGL_NOTICE, "\n"); + LOGPC(g_log_cat, LOGL_NOTICE, "\n"); } } @@ -6180,7 +6179,7 @@ LOGPC(DLCSN1, LOGL_INFO, "\n"); if (ret > 0) { - LOGP(DRLCMACDATA, LOGL_NOTICE, "RAcap: Got %d remaining bits unhandled by decoder at the end of bitvec\n", ret); + LOGP(g_log_cat, LOGL_NOTICE, "RAcap: Got %d remaining bits unhandled by decoder at the end of bitvec\n", ret); ret = 0; } return ret; @@ -6200,8 +6199,8 @@ LOGPC(DLCSN1, LOGL_INFO, "\n"); if (ret > 0 || ret == CSN_ERROR_NEED_MORE_BITS_TO_UNPACK) { - LOGP(DRLCMACDATA, LOGL_ERROR, "Failed to encode MS RA Capability IE: not enough bits " - "in the output buffer (rc=%d)\n", ret); + LOGP(g_log_cat, LOGL_ERROR, "Failed to encode MS RA Capability IE: not enough bits " + "in the output buffer (rc=%d)\n", ret); ret = CSN_ERROR_NEED_MORE_BITS_TO_UNPACK; } diff --git a/src/rlcmac/misc.c b/src/rlcmac/misc.c new file mode 100644 index 0000000..0aecbfd --- /dev/null +++ b/src/rlcmac/misc.c @@ -0,0 +1,25 @@ +/* + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <osmocom/core/logging.h> + +int g_log_cat = DLGLOBAL; + +void osmo_gprs_rlcmac_set_log_cat(int cat) +{ + g_log_cat = cat; +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icfef6de126304da81120f1d7b212992ead3409aa Gerrit-Change-Number: 29207 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29193 ) Change subject: rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c ...................................................................... rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c Change-Id: I2b941f06a70a25e92ba3fd2638f87360a5aa5435 --- M .checkpatch.conf M configure.ac M src/rlcmac/Makefile.am A src/rlcmac/ts_44_018.c R src/rlcmac/ts_44_060.c M tests/Makefile.am M tests/testsuite.at R tests/ts_44_060/Makefile.am R tests/ts_44_060/ts_44_060_test.c R tests/ts_44_060/ts_44_060_test.err R tests/ts_44_060/ts_44_060_test.ok 11 files changed, 627 insertions(+), 599 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf index 701455e..a7876ae 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -1,5 +1,6 @@ --exclude ^src/csn1/csn1.c$ --exclude ^src/csn1/csn1_(enc|dec).c$ --exclude ^include/osmocom/csn1/csn1.h$ ---exclude ^src/rlcmac/gprs_rlcmac.c$ +--exclude ^src/rlcmac/ts_44_018.c$ +--exclude ^src/rlcmac/ts_44_060.c$ --exclude ^include/osmocom/gprs/rlcmac/gprs_rlcmac.h$ diff --git a/configure.ac b/configure.ac index 1e3e896..0606cf5 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ src/csn1/Makefile src/rlcmac/Makefile tests/Makefile - tests/rlcmac/Makefile + tests/ts_44_060/Makefile Makefile contrib/libosmo-gprs.spec]) AC_OUTPUT diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am index d484a6f..dabfa02 100644 --- a/src/rlcmac/Makefile.am +++ b/src/rlcmac/Makefile.am @@ -22,7 +22,8 @@ $(NULL) libosmo_gprs_rlcmac_la_SOURCES = \ - gprs_rlcmac.c \ + ts_44_018.c \ + ts_44_060.c \ misc.c \ $(NULL) diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/ts_44_018.c new file mode 100644 index 0000000..10ff872 --- /dev/null +++ b/src/rlcmac/ts_44_018.c @@ -0,0 +1,609 @@ +/* + * CSN.1 definitions from 3GPP TS 44.018. + * + * By Vincent Helfre, based on original code by Jari Sassi + * with the gracious authorization of STE + * Copyright (c) 2011 ST-Ericsson + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald(a)wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <assert.h> +#include <arpa/inet.h> + +#include <osmocom/core/utils.h> +#include <osmocom/core/bitvec.h> +#include <osmocom/core/logging.h> + +#include <osmocom/csn1/csn1.h> +#include <osmocom/gprs/rlcmac/gprs_rlcmac.h> + +/*<P1 Rest Octets>*/ +/*<P2 Rest Octets>*/ +#if 0 +static const +CSN_DESCR_BEGIN(MobileAllocationIE_t) + M_UINT (MobileAllocationIE_t, Length, 8), + M_VAR_ARRAY (MobileAllocationIE_t, MA, Length, 0), +CSN_DESCR_END (MobileAllocationIE_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(SingleRFChannel_t) + M_UINT (SingleRFChannel_t, spare, 2), + M_UINT (SingleRFChannel_t, ARFCN, 10), +CSN_DESCR_END (SingleRFChannel_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(RFHoppingChannel_t) + M_UINT (RFHoppingChannel_t, MAIO, 6), + M_UINT (RFHoppingChannel_t, HSN, 6), +CSN_DESCR_END (RFHoppingChannel_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(MobileAllocation_or_Frequency_Short_List_t) + M_UNION (MobileAllocation_or_Frequency_Short_List_t, 2), + M_BITMAP (MobileAllocation_or_Frequency_Short_List_t, u.Frequency_Short_List, 64), + M_TYPE (MobileAllocation_or_Frequency_Short_List_t, u.MA, MobileAllocationIE_t), +CSN_DESCR_END (MobileAllocation_or_Frequency_Short_List_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(Channel_Description_t) + M_UINT (Channel_Description_t, Channel_type_and_TDMA_offset, 5), + M_UINT (Channel_Description_t, TN, 3), + M_UINT (Channel_Description_t, TSC, 3), + + M_UNION (Channel_Description_t, 2), + M_TYPE (Channel_Description_t, u.SingleRFChannel, SingleRFChannel_t), + M_TYPE (Channel_Description_t, u.RFHoppingChannel, RFHoppingChannel_t), +CSN_DESCR_END(Channel_Description_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(Group_Channel_Description_t) + M_TYPE (Group_Channel_Description_t, Channel_Description, Channel_Description_t), + + M_NEXT_EXIST (Group_Channel_Description_t, Exist_Hopping, 1), + M_TYPE (Group_Channel_Description_t, MA_or_Frequency_Short_List, MobileAllocation_or_Frequency_Short_List_t), +CSN_DESCR_END (Group_Channel_Description_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(Group_Call_Reference_t) + M_UINT (Group_Call_Reference_t, value, 27), + M_UINT (Group_Call_Reference_t, SF, 1), + M_UINT (Group_Call_Reference_t, AF, 1), + M_UINT (Group_Call_Reference_t, call_priority, 3), + M_UINT (Group_Call_Reference_t, Ciphering_information, 4), +CSN_DESCR_END (Group_Call_Reference_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(Group_Call_information_t) + M_TYPE (Group_Call_information_t, Group_Call_Reference, Group_Call_Reference_t), + + M_NEXT_EXIST (Group_Call_information_t, Exist_Group_Channel_Description, 1), + M_TYPE (Group_Call_information_t, Group_Channel_Description, Group_Channel_Description_t), +CSN_DESCR_END (Group_Call_information_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (P1_Rest_Octets_t) + M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_NLN_PCH_and_NLN_status, 2), + M_UINT (P1_Rest_Octets_t, NLN_PCH, 2), + M_UINT (P1_Rest_Octets_t, NLN_status, 1), + + M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Priority1, 1), + M_UINT (P1_Rest_Octets_t, Priority1, 3), + + M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Priority2, 1), + M_UINT (P1_Rest_Octets_t, Priority2, 3), + + M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Group_Call_information, 1), + M_TYPE (P1_Rest_Octets_t, Group_Call_information, Group_Call_information_t), + + M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_1, 1), + M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_2, 1), +CSN_DESCR_END (P1_Rest_Octets_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (P2_Rest_Octets_t) + M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_CN3, 1), + M_UINT (P2_Rest_Octets_t, CN3, 2), + + M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_NLN_and_status, 2), + M_UINT (P2_Rest_Octets_t, NLN, 2), + M_UINT (P2_Rest_Octets_t, NLN_status, 1), + + M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority1, 1), + M_UINT (P2_Rest_Octets_t, Priority1, 3), + + M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority2, 1), + M_UINT (P2_Rest_Octets_t, Priority2, 3), + + M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority3, 1), + M_UINT (P2_Rest_Octets_t, Priority3, 3), + + M_UINT_LH (P2_Rest_Octets_t, Packet_Page_Indication_3, 1), +CSN_DESCR_END (P2_Rest_Octets_t) +#endif + +/* <IA Rest Octets> + * Note!! + * - first two bits skipped and frequencyparameters skipped + * - additions for R99 and EGPRS added + */ +#if 0 +static const +CSN_DESCR_BEGIN(DynamicAllocation_t) + M_UINT (DynamicAllocation_t, USF, 3), + M_UINT (DynamicAllocation_t, USF_GRANULARITY, 1), + + M_NEXT_EXIST (DynamicAllocation_t, Exist_P0_PR_MODE, 2), + M_UINT (DynamicAllocation_t, P0, 4), + M_UINT (DynamicAllocation_t, PR_MODE, 1), +CSN_DESCR_END (DynamicAllocation_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(EGPRS_TwoPhaseAccess_t) + M_NEXT_EXIST (EGPRS_TwoPhaseAccess_t, Exist_ALPHA, 1), + M_UINT (EGPRS_TwoPhaseAccess_t, ALPHA, 4), + + M_UINT (EGPRS_TwoPhaseAccess_t, GAMMA, 5), + M_TYPE (EGPRS_TwoPhaseAccess_t, TBF_STARTING_TIME, StartingTime_t), + M_UINT (EGPRS_TwoPhaseAccess_t, NR_OF_RADIO_BLOCKS_ALLOCATED, 2), + + M_NEXT_EXIST (EGPRS_TwoPhaseAccess_t, Exist_P0_BTS_PWR_CTRL_PR_MODE, 3), + M_UINT (EGPRS_TwoPhaseAccess_t, P0, 4), + M_UINT (EGPRS_TwoPhaseAccess_t, BTS_PWR_CTRL_MODE, 1), + M_UINT (EGPRS_TwoPhaseAccess_t, PR_MODE, 1), +CSN_DESCR_END (EGPRS_TwoPhaseAccess_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(EGPRS_OnePhaseAccess_t) + M_UINT (EGPRS_OnePhaseAccess_t, TFI_ASSIGNMENT, 5), + M_UINT (EGPRS_OnePhaseAccess_t, POLLING, 1), + + M_UNION (EGPRS_OnePhaseAccess_t, 2), + M_TYPE (EGPRS_OnePhaseAccess_t, Allocation.DynamicAllocation, DynamicAllocation_t), + CSN_ERROR (EGPRS_OnePhaseAccess_t, "1 <Fixed Allocation>", CSN_ERROR_STREAM_NOT_SUPPORTED), + + M_UINT (EGPRS_OnePhaseAccess_t, EGPRS_CHANNEL_CODING_COMMAND, 4), + M_UINT (EGPRS_OnePhaseAccess_t, TLLI_BLOCK_CHANNEL_CODING, 1), + + M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_BEP_PERIOD2, 1), + M_UINT (EGPRS_OnePhaseAccess_t, BEP_PERIOD2, 4), + + M_UINT (EGPRS_OnePhaseAccess_t, RESEGMENT, 1), + M_UINT (EGPRS_OnePhaseAccess_t, EGPRS_WindowSize, 5), + + M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_ALPHA, 1), + M_UINT (EGPRS_OnePhaseAccess_t, ALPHA, 4), + + M_UINT (EGPRS_OnePhaseAccess_t, GAMMA, 5), + + M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_TIMING_ADVANCE_INDEX, 1), + M_UINT (EGPRS_OnePhaseAccess_t, TIMING_ADVANCE_INDEX, 4), + + M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_TBF_STARTING_TIME, 1), + M_TYPE (EGPRS_OnePhaseAccess_t, TBF_STARTING_TIME, StartingTime_t), +CSN_DESCR_END (EGPRS_OnePhaseAccess_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(IA_EGPRS_00_t) + M_UINT (IA_EGPRS_00_t, ExtendedRA, 5), + + M_REC_ARRAY (IA_EGPRS_00_t, AccessTechnologyType, NrOfAccessTechnologies, 4), + + M_UNION (IA_EGPRS_00_t, 2), + M_TYPE (IA_EGPRS_00_t, Access.TwoPhaseAccess, EGPRS_TwoPhaseAccess_t), + M_TYPE (IA_EGPRS_00_t, Access.OnePhaseAccess, EGPRS_OnePhaseAccess_t), +CSN_DESCR_END (IA_EGPRS_00_t) +#endif + +#if 0 +static const +CSN_ChoiceElement_t IA_EGPRS_Choice[] = +{ + {2, 0x00, 0, M_TYPE (IA_EGPRS_t, u.IA_EGPRS_PUA, IA_EGPRS_00_t)}, + {2, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "01 <IA_EGPRS>", CSN_ERROR_STREAM_NOT_SUPPORTED)}, + {1, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "1 <IA_EGPRS>", CSN_ERROR_STREAM_NOT_SUPPORTED)} +}; +#endif + +/* Please observe the double usage of UnionType element. + * First, it is used to store the second bit of LL/LH identification of EGPRS contents. + * Thereafter, UnionType will be used to store the index to detected choice. + */ +#if 0 +static const +CSN_DESCR_BEGIN(IA_EGPRS_t) + M_UINT (IA_EGPRS_t, UnionType , 1 ), + M_CHOICE (IA_EGPRS_t, UnionType, IA_EGPRS_Choice, ElementsOf(IA_EGPRS_Choice)), +CSN_DESCR_END (IA_EGPRS_t) + +static const +CSN_DESCR_BEGIN(IA_FreqParamsBeforeTime_t) + M_UINT (IA_FreqParamsBeforeTime_t, Length, 6), + M_UINT (IA_FreqParamsBeforeTime_t, MAIO, 6), + M_VAR_ARRAY (IA_FreqParamsBeforeTime_t, MobileAllocation, Length, 8), +CSN_DESCR_END (IA_FreqParamsBeforeTime_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (GPRS_SingleBlockAllocation_t) + M_NEXT_EXIST (GPRS_SingleBlockAllocation_t, Exist_ALPHA, 1), + M_UINT (GPRS_SingleBlockAllocation_t, ALPHA, 4), + + M_UINT (GPRS_SingleBlockAllocation_t, GAMMA, 5), + M_FIXED (GPRS_SingleBlockAllocation_t, 2, 0x01), + M_TYPE (GPRS_SingleBlockAllocation_t, TBF_STARTING_TIME, StartingTime_t), /*bit(16)*/ + + M_NEXT_EXIST_LH(GPRS_SingleBlockAllocation_t, Exist_P0_BTS_PWR_CTRL_PR_MODE, 3), + M_UINT (GPRS_SingleBlockAllocation_t, P0, 4), + M_UINT (GPRS_SingleBlockAllocation_t, BTS_PWR_CTRL_MODE, 1), + M_UINT (GPRS_SingleBlockAllocation_t, PR_MODE, 1), +CSN_DESCR_END (GPRS_SingleBlockAllocation_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (GPRS_DynamicOrFixedAllocation_t) + M_UINT (GPRS_DynamicOrFixedAllocation_t, TFI_ASSIGNMENT, 5), + M_UINT (GPRS_DynamicOrFixedAllocation_t, POLLING, 1), + + M_UNION (GPRS_DynamicOrFixedAllocation_t, 2), + M_TYPE (GPRS_DynamicOrFixedAllocation_t, Allocation.DynamicAllocation, DynamicAllocation_t), + CSN_ERROR (GPRS_DynamicOrFixedAllocation_t, "1 <Fixed Allocation>", CSN_ERROR_STREAM_NOT_SUPPORTED), + + M_UINT (GPRS_DynamicOrFixedAllocation_t, CHANNEL_CODING_COMMAND, 2), + M_UINT (GPRS_DynamicOrFixedAllocation_t, TLLI_BLOCK_CHANNEL_CODING, 1), + + M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_ALPHA, 1), + M_UINT (GPRS_DynamicOrFixedAllocation_t, ALPHA, 4), + + M_UINT (GPRS_DynamicOrFixedAllocation_t, GAMMA, 5), + + M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_TIMING_ADVANCE_INDEX, 1), + M_UINT (GPRS_DynamicOrFixedAllocation_t, TIMING_ADVANCE_INDEX, 4), + + M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_TBF_STARTING_TIME, 1), + M_TYPE (GPRS_DynamicOrFixedAllocation_t, TBF_STARTING_TIME, StartingTime_t), +CSN_DESCR_END (GPRS_DynamicOrFixedAllocation_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(PU_IA_AdditionsR99_t) + M_NEXT_EXIST (PU_IA_AdditionsR99_t, Exist_ExtendedRA, 1), + M_UINT (PU_IA_AdditionsR99_t, ExtendedRA, 5), +CSN_DESCR_END (PU_IA_AdditionsR99_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (Packet_Uplink_ImmAssignment_t) + M_UNION (Packet_Uplink_ImmAssignment_t, 2), + M_TYPE (Packet_Uplink_ImmAssignment_t, Access.SingleBlockAllocation, GPRS_SingleBlockAllocation_t), + M_TYPE (Packet_Uplink_ImmAssignment_t, Access.DynamicOrFixedAllocation, GPRS_DynamicOrFixedAllocation_t), + + M_NEXT_EXIST_OR_NULL_LH(Packet_Uplink_ImmAssignment_t, Exist_AdditionsR99, 1), + M_TYPE (Packet_Uplink_ImmAssignment_t, AdditionsR99, PU_IA_AdditionsR99_t), +CSN_DESCR_END (Packet_Uplink_ImmAssignment_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(PD_IA_AdditionsR99_t) + M_UINT (PD_IA_AdditionsR99_t, EGPRS_WindowSize, 5), + M_UINT (PD_IA_AdditionsR99_t, LINK_QUALITY_MEASUREMENT_MODE, 2), + + M_NEXT_EXIST (PD_IA_AdditionsR99_t, Exist_BEP_PERIOD2, 1), + M_UINT (PD_IA_AdditionsR99_t, BEP_PERIOD2, 4), +CSN_DESCR_END (PD_IA_AdditionsR99_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(Packet_Downlink_ImmAssignment_t) + M_UINT (Packet_Downlink_ImmAssignment_t, TLLI, 32), + + M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TFI_to_TA_VALID, 6 + 1), + M_UINT (Packet_Downlink_ImmAssignment_t, TFI_ASSIGNMENT, 5), + M_UINT (Packet_Downlink_ImmAssignment_t, RLC_MODE, 1), + M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_ALPHA, 1), + M_UINT (Packet_Downlink_ImmAssignment_t, ALPHA, 4), + M_UINT (Packet_Downlink_ImmAssignment_t, GAMMA, 5), + M_UINT (Packet_Downlink_ImmAssignment_t, POLLING, 1), + M_UINT (Packet_Downlink_ImmAssignment_t, TA_VALID, 1), + + M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TIMING_ADVANCE_INDEX, 1), + M_UINT (Packet_Downlink_ImmAssignment_t, TIMING_ADVANCE_INDEX, 4), + + M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TBF_STARTING_TIME, 1), + M_TYPE (Packet_Downlink_ImmAssignment_t, TBF_STARTING_TIME, StartingTime_t), + + M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_P0_PR_MODE, 3), + M_UINT (Packet_Downlink_ImmAssignment_t, P0, 4), + M_UINT (Packet_Downlink_ImmAssignment_t, BTS_PWR_CTRL_MODE, 1), + M_UINT (Packet_Downlink_ImmAssignment_t, PR_MODE, 1), + + M_NEXT_EXIST_OR_NULL_LH(Packet_Downlink_ImmAssignment_t, Exist_AdditionsR99, 1), + M_TYPE (Packet_Downlink_ImmAssignment_t, AdditionsR99, PD_IA_AdditionsR99_t), +CSN_DESCR_END (Packet_Downlink_ImmAssignment_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (Second_Part_Packet_Assignment_t) + M_NEXT_EXIST_OR_NULL_LH(Second_Part_Packet_Assignment_t, Exist_SecondPart, 2), + M_NEXT_EXIST (Second_Part_Packet_Assignment_t, Exist_ExtendedRA, 1), + M_UINT (Second_Part_Packet_Assignment_t, ExtendedRA, 5), +CSN_DESCR_END (Second_Part_Packet_Assignment_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(IA_PacketAssignment_UL_DL_t) + M_UNION (IA_PacketAssignment_UL_DL_t, 2), + M_TYPE (IA_PacketAssignment_UL_DL_t, ul_dl.Packet_Uplink_ImmAssignment, Packet_Uplink_ImmAssignment_t), + M_TYPE (IA_PacketAssignment_UL_DL_t, ul_dl.Packet_Downlink_ImmAssignment, Packet_Downlink_ImmAssignment_t), +CSN_DESCR_END (IA_PacketAssignment_UL_DL_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(IA_PacketAssignment_t) + M_UNION (IA_PacketAssignment_t, 2), + M_TYPE (IA_PacketAssignment_t, u.UplinkDownlinkAssignment, IA_PacketAssignment_UL_DL_t), + M_TYPE (IA_PacketAssignment_t, u.UplinkDownlinkAssignment, Second_Part_Packet_Assignment_t), +CSN_DESCR_END (IA_PacketAssignment_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(SI13_AdditionsR6) + M_NEXT_EXIST (SI13_AdditionsR6, Exist_LB_MS_TXPWR_MAX_CCH, 1), + M_UINT (SI13_AdditionsR6, LB_MS_TXPWR_MAX_CCH, 5), + M_UINT (SI13_AdditionsR6, SI2n_SUPPORT, 2), +CSN_DESCR_END (SI13_AdditionsR6) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(SI13_AdditionsR4) + M_UINT (SI13_AdditionsR4, SI_STATUS_IND, 1), + M_NEXT_EXIST_OR_NULL_LH (SI13_AdditionsR4, Exist_AdditionsR6, 1), + M_TYPE (SI13_AdditionsR4, AdditionsR6, SI13_AdditionsR6), +CSN_DESCR_END (SI13_AdditionsR4) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(SI13_AdditionR99) + M_UINT (SI13_AdditionR99, SGSNR, 1), + M_NEXT_EXIST_OR_NULL_LH (SI13_AdditionR99, Exist_AdditionsR4, 1), + M_TYPE (SI13_AdditionR99, AdditionsR4, SI13_AdditionsR4), +CSN_DESCR_END (SI13_AdditionR99) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (SI_13_t) + M_THIS_EXIST_LH (SI_13_t), + + M_UINT (SI_13_t, BCCH_CHANGE_MARK, 3), + M_UINT (SI_13_t, SI_CHANGE_FIELD, 4), + + M_NEXT_EXIST (SI_13_t, Exist_MA, 2), + M_UINT (SI_13_t, SI13_CHANGE_MARK, 2), + M_TYPE (SI_13_t, GPRS_Mobile_Allocation, GPRS_Mobile_Allocation_t), + + M_UNION (SI_13_t, 2), + M_TYPE (SI_13_t, u.PBCCH_Not_present, PBCCH_Not_present_t), + M_TYPE (SI_13_t, u.PBCCH_present, PBCCH_present_t), + + M_NEXT_EXIST_OR_NULL_LH(SI_13_t, Exist_AdditionsR99, 1), + M_TYPE (SI_13_t, AdditionsR99, SI13_AdditionR99), +CSN_DESCR_END (SI_13_t) +#endif + +/* Enhanced Measurement Report */ +#if 0 +static const +CSN_DESCR_BEGIN (ServingCellData_t) + M_UINT (ServingCellData_t, RXLEV_SERVING_CELL, 6), + M_FIXED (ServingCellData_t, 1, 0), +CSN_DESCR_END (ServingCellData_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (Repeated_Invalid_BSIC_Info_t) + M_UINT (Repeated_Invalid_BSIC_Info_t, BCCH_FREQ_NCELL, 5), + M_UINT (Repeated_Invalid_BSIC_Info_t, BSIC, 6), + M_UINT (Repeated_Invalid_BSIC_Info_t, RXLEV_NCELL, 5), +CSN_DESCR_END (Repeated_Invalid_BSIC_Info_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (REPORTING_QUANTITY_t) + M_NEXT_EXIST (REPORTING_QUANTITY_t, Exist_REPORTING_QUANTITY, 1), + M_UINT (REPORTING_QUANTITY_t, REPORTING_QUANTITY, 6), +CSN_DESCR_END (REPORTING_QUANTITY_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (NC_MeasurementReport_t) + M_UINT (NC_MeasurementReport_t, NC_MODE, 1), + M_UNION (NC_MeasurementReport_t, 2), + M_TYPE (NC_MeasurementReport_t, u.BA_USED, BA_USED_t), + M_UINT (NC_MeasurementReport_t, u.PSI3_CHANGE_MARK, 2), + M_UINT (NC_MeasurementReport_t, PMO_USED, 1), + M_UINT (NC_MeasurementReport_t, SCALE, 1), + + M_NEXT_EXIST (NC_MeasurementReport_t, Exist_ServingCellData, 1), + M_TYPE (NC_MeasurementReport_t, ServingCellData, ServingCellData_t), + + M_REC_TARRAY (NC_MeasurementReport_t, Repeated_Invalid_BSIC_Info, Repeated_Invalid_BSIC_Info_t, Count_Repeated_Invalid_BSIC_Info), + + M_NEXT_EXIST (NC_MeasurementReport_t, Exist_Repeated_REPORTING_QUANTITY, 1), + M_VAR_TARRAY (NC_MeasurementReport_t, Repeated_REPORTING_QUANTITY, REPORTING_QUANTITY_t, Count_Repeated_Reporting_Quantity), +CSN_DESCR_END (NC_MeasurementReport_t) +#endif + +/* SI1_RestOctet_t */ +#if 0 +static const +CSN_DESCR_BEGIN (SI1_RestOctet_t) + M_NEXT_EXIST_LH(SI1_RestOctet_t, Exist_NCH_Position, 1), + M_UINT (SI1_RestOctet_t, NCH_Position, 5), + + M_UINT_LH (SI1_RestOctet_t, BandIndicator, 1), +CSN_DESCR_END (SI1_RestOctet_t) +#endif + +/* SI3_Rest_Octet_t */ +#if 0 +static const +CSN_DESCR_BEGIN(Selection_Parameters_t) + M_UINT (Selection_Parameters_t, CBQ, 1), + M_UINT (Selection_Parameters_t, CELL_RESELECT_OFFSET, 6), + M_UINT (Selection_Parameters_t, TEMPORARY_OFFSET, 3), + M_UINT (Selection_Parameters_t, PENALTY_TIME, 5), +CSN_DESCR_END (Selection_Parameters_t) + +static const +CSN_DESCR_BEGIN (SI3_Rest_Octet_t) + M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_Selection_Parameters, 1), + M_TYPE (SI3_Rest_Octet_t, Selection_Parameters, Selection_Parameters_t), + + M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_Power_Offset, 1), + M_UINT (SI3_Rest_Octet_t, Power_Offset, 2), + + M_UINT_LH (SI3_Rest_Octet_t, System_Information_2ter_Indicator, 1), + M_UINT_LH (SI3_Rest_Octet_t, Early_Classmark_Sending_Control, 1), + + M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_WHERE, 1), + M_UINT (SI3_Rest_Octet_t, WHERE, 3), + + M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_GPRS_Indicator, 2), + M_UINT (SI3_Rest_Octet_t, RA_COLOUR, 3), + M_UINT (SI3_Rest_Octet_t, SI13_POSITION, 1), + + M_UINT_LH (SI3_Rest_Octet_t, ECS_Restriction3G, 1), + + M_NEXT_EXIST_LH(SI3_Rest_Octet_t, ExistSI2quaterIndicator, 1), + M_UINT (SI3_Rest_Octet_t, SI2quaterIndicator, 1), +CSN_DESCR_END (SI3_Rest_Octet_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (SI4_Rest_Octet_t) + M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_Selection_Parameters, 1), + M_TYPE (SI4_Rest_Octet_t, Selection_Parameters, Selection_Parameters_t), + + M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_Power_Offset, 1), + M_UINT (SI4_Rest_Octet_t, Power_Offset, 2), + + M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_GPRS_Indicator, 2), + M_UINT (SI4_Rest_Octet_t, RA_COLOUR, 3), + M_UINT (SI4_Rest_Octet_t, SI13_POSITION, 1), +CSN_DESCR_END (SI4_Rest_Octet_t) +#endif + +/* SI6_RestOctet_t */ + +#if 0 +static const +CSN_DESCR_BEGIN(PCH_and_NCH_Info_t) + M_UINT (PCH_and_NCH_Info_t, PagingChannelRestructuring, 1), + M_UINT (PCH_and_NCH_Info_t, NLN_SACCH, 2), + + M_NEXT_EXIST (PCH_and_NCH_Info_t, Exist_CallPriority, 1), + M_UINT (PCH_and_NCH_Info_t, CallPriority, 3), + + M_UINT (PCH_and_NCH_Info_t, NLN_Status, 1), +CSN_DESCR_END (PCH_and_NCH_Info_t) + +static const +CSN_DESCR_BEGIN (SI6_RestOctet_t) + M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_PCH_and_NCH_Info, 1), + M_TYPE (SI6_RestOctet_t, PCH_and_NCH_Info, PCH_and_NCH_Info_t), + + M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_VBS_VGCS_Options, 1), + M_UINT (SI6_RestOctet_t, VBS_VGCS_Options, 2), + + M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_DTM_Support, 2), + M_UINT (SI6_RestOctet_t, RAC, 8), + M_UINT (SI6_RestOctet_t, MAX_LAPDm, 3), + + M_UINT_LH (SI6_RestOctet_t, BandIndicator, 1), +CSN_DESCR_END (SI6_RestOctet_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN(EMR_ServingCell_t) + /*CSN_MEMBER_BIT (EMR_ServingCell_t, DTX_USED),*/ + M_UINT (EMR_ServingCell_t, DTX_USED, 1), + M_UINT (EMR_ServingCell_t, RXLEV_VAL, 6), + M_UINT (EMR_ServingCell_t, RX_QUAL_FULL, 3), + M_UINT (EMR_ServingCell_t, MEAN_BEP, 5), + M_UINT (EMR_ServingCell_t, CV_BEP, 3), + M_UINT (EMR_ServingCell_t, NBR_RCVD_BLOCKS, 5), +CSN_DESCR_END(EMR_ServingCell_t) +#endif + +#if 0 +static const +CSN_DESCR_BEGIN (EnhancedMeasurementReport_t) + M_UINT (EnhancedMeasurementReport_t, RR_Short_PD, 1), + M_UINT (EnhancedMeasurementReport_t, MESSAGE_TYPE, 5), + M_UINT (EnhancedMeasurementReport_t, ShortLayer2_Header, 2), + M_TYPE (EnhancedMeasurementReport_t, BA_USED, BA_USED_t), + M_UINT (EnhancedMeasurementReport_t, BSIC_Seen, 1), + M_UINT (EnhancedMeasurementReport_t, SCALE, 1), + M_NEXT_EXIST (EnhancedMeasurementReport_t, Exist_ServingCellData, 1), + M_TYPE (EnhancedMeasurementReport_t, ServingCellData, EMR_ServingCell_t), + M_REC_TARRAY (EnhancedMeasurementReport_t, RepeatedInvalid_BSIC_Info, RepeatedInvalid_BSIC_Info_t, + Count_RepeatedInvalid_BSIC_Info), + M_NEXT_EXIST (EnhancedMeasurementReport_t, Exist_ReportBitmap, 1), + M_VAR_TARRAY (EnhancedMeasurementReport_t, REPORTING_QUANTITY_Instances, REPORTING_QUANTITY_Instance_t, Count_REPORTING_QUANTITY_Instances), +CSN_DESCR_END (EnhancedMeasurementReport_t) +#endif diff --git a/src/rlcmac/gprs_rlcmac.c b/src/rlcmac/ts_44_060.c similarity index 91% rename from src/rlcmac/gprs_rlcmac.c rename to src/rlcmac/ts_44_060.c index b0b7ca8..80e182e 100644 --- a/src/rlcmac/gprs_rlcmac.c +++ b/src/rlcmac/ts_44_060.c @@ -1,6 +1,5 @@ -/* gsm_rlcmac.c - * Routines for GSM RLC MAC control plane message dissection in wireshark. - * TS 44.060 and 24.008 +/* + * CSN.1 definitions from 3GPP TS 44.060. * * Copyright (C) 2011 Ivan Klyuchnikov * @@ -8,8 +7,6 @@ * with the gracious authorization of STE * Copyright (c) 2011 ST-Ericsson * - * $Id: packet-gsm_rlcmac.c 39164 2011-09-27 12:05:32Z etxrab $ - * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald(a)wireshark.org> * Copyright 1998 Gerald Combs @@ -208,368 +205,6 @@ M_TYPE (EGPRS_AckNack_t, Desc, EGPRS_AckNack_w_len_t), CSN_DESCR_END (EGPRS_AckNack_t) -/*<P1 Rest Octets>*/ -/*<P2 Rest Octets>*/ -#if 0 -static const -CSN_DESCR_BEGIN(MobileAllocationIE_t) - M_UINT (MobileAllocationIE_t, Length, 8), - M_VAR_ARRAY (MobileAllocationIE_t, MA, Length, 0), -CSN_DESCR_END (MobileAllocationIE_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(SingleRFChannel_t) - M_UINT (SingleRFChannel_t, spare, 2), - M_UINT (SingleRFChannel_t, ARFCN, 10), -CSN_DESCR_END (SingleRFChannel_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(RFHoppingChannel_t) - M_UINT (RFHoppingChannel_t, MAIO, 6), - M_UINT (RFHoppingChannel_t, HSN, 6), -CSN_DESCR_END (RFHoppingChannel_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(MobileAllocation_or_Frequency_Short_List_t) - M_UNION (MobileAllocation_or_Frequency_Short_List_t, 2), - M_BITMAP (MobileAllocation_or_Frequency_Short_List_t, u.Frequency_Short_List, 64), - M_TYPE (MobileAllocation_or_Frequency_Short_List_t, u.MA, MobileAllocationIE_t), -CSN_DESCR_END (MobileAllocation_or_Frequency_Short_List_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(Channel_Description_t) - M_UINT (Channel_Description_t, Channel_type_and_TDMA_offset, 5), - M_UINT (Channel_Description_t, TN, 3), - M_UINT (Channel_Description_t, TSC, 3), - - M_UNION (Channel_Description_t, 2), - M_TYPE (Channel_Description_t, u.SingleRFChannel, SingleRFChannel_t), - M_TYPE (Channel_Description_t, u.RFHoppingChannel, RFHoppingChannel_t), -CSN_DESCR_END(Channel_Description_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(Group_Channel_Description_t) - M_TYPE (Group_Channel_Description_t, Channel_Description, Channel_Description_t), - - M_NEXT_EXIST (Group_Channel_Description_t, Exist_Hopping, 1), - M_TYPE (Group_Channel_Description_t, MA_or_Frequency_Short_List, MobileAllocation_or_Frequency_Short_List_t), -CSN_DESCR_END (Group_Channel_Description_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(Group_Call_Reference_t) - M_UINT (Group_Call_Reference_t, value, 27), - M_UINT (Group_Call_Reference_t, SF, 1), - M_UINT (Group_Call_Reference_t, AF, 1), - M_UINT (Group_Call_Reference_t, call_priority, 3), - M_UINT (Group_Call_Reference_t, Ciphering_information, 4), -CSN_DESCR_END (Group_Call_Reference_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(Group_Call_information_t) - M_TYPE (Group_Call_information_t, Group_Call_Reference, Group_Call_Reference_t), - - M_NEXT_EXIST (Group_Call_information_t, Exist_Group_Channel_Description, 1), - M_TYPE (Group_Call_information_t, Group_Channel_Description, Group_Channel_Description_t), -CSN_DESCR_END (Group_Call_information_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (P1_Rest_Octets_t) - M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_NLN_PCH_and_NLN_status, 2), - M_UINT (P1_Rest_Octets_t, NLN_PCH, 2), - M_UINT (P1_Rest_Octets_t, NLN_status, 1), - - M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Priority1, 1), - M_UINT (P1_Rest_Octets_t, Priority1, 3), - - M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Priority2, 1), - M_UINT (P1_Rest_Octets_t, Priority2, 3), - - M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Group_Call_information, 1), - M_TYPE (P1_Rest_Octets_t, Group_Call_information, Group_Call_information_t), - - M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_1, 1), - M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_2, 1), -CSN_DESCR_END (P1_Rest_Octets_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (P2_Rest_Octets_t) - M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_CN3, 1), - M_UINT (P2_Rest_Octets_t, CN3, 2), - - M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_NLN_and_status, 2), - M_UINT (P2_Rest_Octets_t, NLN, 2), - M_UINT (P2_Rest_Octets_t, NLN_status, 1), - - M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority1, 1), - M_UINT (P2_Rest_Octets_t, Priority1, 3), - - M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority2, 1), - M_UINT (P2_Rest_Octets_t, Priority2, 3), - - M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority3, 1), - M_UINT (P2_Rest_Octets_t, Priority3, 3), - - M_UINT_LH (P2_Rest_Octets_t, Packet_Page_Indication_3, 1), -CSN_DESCR_END (P2_Rest_Octets_t) -#endif - -/* <IA Rest Octets> - * Note!! - * - first two bits skipped and frequencyparameters skipped - * - additions for R99 and EGPRS added - */ -#if 0 -static const -CSN_DESCR_BEGIN(DynamicAllocation_t) - M_UINT (DynamicAllocation_t, USF, 3), - M_UINT (DynamicAllocation_t, USF_GRANULARITY, 1), - - M_NEXT_EXIST (DynamicAllocation_t, Exist_P0_PR_MODE, 2), - M_UINT (DynamicAllocation_t, P0, 4), - M_UINT (DynamicAllocation_t, PR_MODE, 1), -CSN_DESCR_END (DynamicAllocation_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(EGPRS_TwoPhaseAccess_t) - M_NEXT_EXIST (EGPRS_TwoPhaseAccess_t, Exist_ALPHA, 1), - M_UINT (EGPRS_TwoPhaseAccess_t, ALPHA, 4), - - M_UINT (EGPRS_TwoPhaseAccess_t, GAMMA, 5), - M_TYPE (EGPRS_TwoPhaseAccess_t, TBF_STARTING_TIME, StartingTime_t), - M_UINT (EGPRS_TwoPhaseAccess_t, NR_OF_RADIO_BLOCKS_ALLOCATED, 2), - - M_NEXT_EXIST (EGPRS_TwoPhaseAccess_t, Exist_P0_BTS_PWR_CTRL_PR_MODE, 3), - M_UINT (EGPRS_TwoPhaseAccess_t, P0, 4), - M_UINT (EGPRS_TwoPhaseAccess_t, BTS_PWR_CTRL_MODE, 1), - M_UINT (EGPRS_TwoPhaseAccess_t, PR_MODE, 1), -CSN_DESCR_END (EGPRS_TwoPhaseAccess_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(EGPRS_OnePhaseAccess_t) - M_UINT (EGPRS_OnePhaseAccess_t, TFI_ASSIGNMENT, 5), - M_UINT (EGPRS_OnePhaseAccess_t, POLLING, 1), - - M_UNION (EGPRS_OnePhaseAccess_t, 2), - M_TYPE (EGPRS_OnePhaseAccess_t, Allocation.DynamicAllocation, DynamicAllocation_t), - CSN_ERROR (EGPRS_OnePhaseAccess_t, "1 <Fixed Allocation>", CSN_ERROR_STREAM_NOT_SUPPORTED), - - M_UINT (EGPRS_OnePhaseAccess_t, EGPRS_CHANNEL_CODING_COMMAND, 4), - M_UINT (EGPRS_OnePhaseAccess_t, TLLI_BLOCK_CHANNEL_CODING, 1), - - M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_BEP_PERIOD2, 1), - M_UINT (EGPRS_OnePhaseAccess_t, BEP_PERIOD2, 4), - - M_UINT (EGPRS_OnePhaseAccess_t, RESEGMENT, 1), - M_UINT (EGPRS_OnePhaseAccess_t, EGPRS_WindowSize, 5), - - M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_ALPHA, 1), - M_UINT (EGPRS_OnePhaseAccess_t, ALPHA, 4), - - M_UINT (EGPRS_OnePhaseAccess_t, GAMMA, 5), - - M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_TIMING_ADVANCE_INDEX, 1), - M_UINT (EGPRS_OnePhaseAccess_t, TIMING_ADVANCE_INDEX, 4), - - M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_TBF_STARTING_TIME, 1), - M_TYPE (EGPRS_OnePhaseAccess_t, TBF_STARTING_TIME, StartingTime_t), -CSN_DESCR_END (EGPRS_OnePhaseAccess_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(IA_EGPRS_00_t) - M_UINT (IA_EGPRS_00_t, ExtendedRA, 5), - - M_REC_ARRAY (IA_EGPRS_00_t, AccessTechnologyType, NrOfAccessTechnologies, 4), - - M_UNION (IA_EGPRS_00_t, 2), - M_TYPE (IA_EGPRS_00_t, Access.TwoPhaseAccess, EGPRS_TwoPhaseAccess_t), - M_TYPE (IA_EGPRS_00_t, Access.OnePhaseAccess, EGPRS_OnePhaseAccess_t), -CSN_DESCR_END (IA_EGPRS_00_t) -#endif - -#if 0 -static const -CSN_ChoiceElement_t IA_EGPRS_Choice[] = -{ - {2, 0x00, 0, M_TYPE (IA_EGPRS_t, u.IA_EGPRS_PUA, IA_EGPRS_00_t)}, - {2, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "01 <IA_EGPRS>", CSN_ERROR_STREAM_NOT_SUPPORTED)}, - {1, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "1 <IA_EGPRS>", CSN_ERROR_STREAM_NOT_SUPPORTED)} -}; -#endif - -/* Please observe the double usage of UnionType element. - * First, it is used to store the second bit of LL/LH identification of EGPRS contents. - * Thereafter, UnionType will be used to store the index to detected choice. - */ -#if 0 -static const -CSN_DESCR_BEGIN(IA_EGPRS_t) - M_UINT (IA_EGPRS_t, UnionType , 1 ), - M_CHOICE (IA_EGPRS_t, UnionType, IA_EGPRS_Choice, ElementsOf(IA_EGPRS_Choice)), -CSN_DESCR_END (IA_EGPRS_t) - -static const -CSN_DESCR_BEGIN(IA_FreqParamsBeforeTime_t) - M_UINT (IA_FreqParamsBeforeTime_t, Length, 6), - M_UINT (IA_FreqParamsBeforeTime_t, MAIO, 6), - M_VAR_ARRAY (IA_FreqParamsBeforeTime_t, MobileAllocation, Length, 8), -CSN_DESCR_END (IA_FreqParamsBeforeTime_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (GPRS_SingleBlockAllocation_t) - M_NEXT_EXIST (GPRS_SingleBlockAllocation_t, Exist_ALPHA, 1), - M_UINT (GPRS_SingleBlockAllocation_t, ALPHA, 4), - - M_UINT (GPRS_SingleBlockAllocation_t, GAMMA, 5), - M_FIXED (GPRS_SingleBlockAllocation_t, 2, 0x01), - M_TYPE (GPRS_SingleBlockAllocation_t, TBF_STARTING_TIME, StartingTime_t), /*bit(16)*/ - - M_NEXT_EXIST_LH(GPRS_SingleBlockAllocation_t, Exist_P0_BTS_PWR_CTRL_PR_MODE, 3), - M_UINT (GPRS_SingleBlockAllocation_t, P0, 4), - M_UINT (GPRS_SingleBlockAllocation_t, BTS_PWR_CTRL_MODE, 1), - M_UINT (GPRS_SingleBlockAllocation_t, PR_MODE, 1), -CSN_DESCR_END (GPRS_SingleBlockAllocation_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (GPRS_DynamicOrFixedAllocation_t) - M_UINT (GPRS_DynamicOrFixedAllocation_t, TFI_ASSIGNMENT, 5), - M_UINT (GPRS_DynamicOrFixedAllocation_t, POLLING, 1), - - M_UNION (GPRS_DynamicOrFixedAllocation_t, 2), - M_TYPE (GPRS_DynamicOrFixedAllocation_t, Allocation.DynamicAllocation, DynamicAllocation_t), - CSN_ERROR (GPRS_DynamicOrFixedAllocation_t, "1 <Fixed Allocation>", CSN_ERROR_STREAM_NOT_SUPPORTED), - - M_UINT (GPRS_DynamicOrFixedAllocation_t, CHANNEL_CODING_COMMAND, 2), - M_UINT (GPRS_DynamicOrFixedAllocation_t, TLLI_BLOCK_CHANNEL_CODING, 1), - - M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_ALPHA, 1), - M_UINT (GPRS_DynamicOrFixedAllocation_t, ALPHA, 4), - - M_UINT (GPRS_DynamicOrFixedAllocation_t, GAMMA, 5), - - M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_TIMING_ADVANCE_INDEX, 1), - M_UINT (GPRS_DynamicOrFixedAllocation_t, TIMING_ADVANCE_INDEX, 4), - - M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_TBF_STARTING_TIME, 1), - M_TYPE (GPRS_DynamicOrFixedAllocation_t, TBF_STARTING_TIME, StartingTime_t), -CSN_DESCR_END (GPRS_DynamicOrFixedAllocation_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(PU_IA_AdditionsR99_t) - M_NEXT_EXIST (PU_IA_AdditionsR99_t, Exist_ExtendedRA, 1), - M_UINT (PU_IA_AdditionsR99_t, ExtendedRA, 5), -CSN_DESCR_END (PU_IA_AdditionsR99_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (Packet_Uplink_ImmAssignment_t) - M_UNION (Packet_Uplink_ImmAssignment_t, 2), - M_TYPE (Packet_Uplink_ImmAssignment_t, Access.SingleBlockAllocation, GPRS_SingleBlockAllocation_t), - M_TYPE (Packet_Uplink_ImmAssignment_t, Access.DynamicOrFixedAllocation, GPRS_DynamicOrFixedAllocation_t), - - M_NEXT_EXIST_OR_NULL_LH(Packet_Uplink_ImmAssignment_t, Exist_AdditionsR99, 1), - M_TYPE (Packet_Uplink_ImmAssignment_t, AdditionsR99, PU_IA_AdditionsR99_t), -CSN_DESCR_END (Packet_Uplink_ImmAssignment_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(PD_IA_AdditionsR99_t) - M_UINT (PD_IA_AdditionsR99_t, EGPRS_WindowSize, 5), - M_UINT (PD_IA_AdditionsR99_t, LINK_QUALITY_MEASUREMENT_MODE, 2), - - M_NEXT_EXIST (PD_IA_AdditionsR99_t, Exist_BEP_PERIOD2, 1), - M_UINT (PD_IA_AdditionsR99_t, BEP_PERIOD2, 4), -CSN_DESCR_END (PD_IA_AdditionsR99_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(Packet_Downlink_ImmAssignment_t) - M_UINT (Packet_Downlink_ImmAssignment_t, TLLI, 32), - - M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TFI_to_TA_VALID, 6 + 1), - M_UINT (Packet_Downlink_ImmAssignment_t, TFI_ASSIGNMENT, 5), - M_UINT (Packet_Downlink_ImmAssignment_t, RLC_MODE, 1), - M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_ALPHA, 1), - M_UINT (Packet_Downlink_ImmAssignment_t, ALPHA, 4), - M_UINT (Packet_Downlink_ImmAssignment_t, GAMMA, 5), - M_UINT (Packet_Downlink_ImmAssignment_t, POLLING, 1), - M_UINT (Packet_Downlink_ImmAssignment_t, TA_VALID, 1), - - M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TIMING_ADVANCE_INDEX, 1), - M_UINT (Packet_Downlink_ImmAssignment_t, TIMING_ADVANCE_INDEX, 4), - - M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TBF_STARTING_TIME, 1), - M_TYPE (Packet_Downlink_ImmAssignment_t, TBF_STARTING_TIME, StartingTime_t), - - M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_P0_PR_MODE, 3), - M_UINT (Packet_Downlink_ImmAssignment_t, P0, 4), - M_UINT (Packet_Downlink_ImmAssignment_t, BTS_PWR_CTRL_MODE, 1), - M_UINT (Packet_Downlink_ImmAssignment_t, PR_MODE, 1), - - M_NEXT_EXIST_OR_NULL_LH(Packet_Downlink_ImmAssignment_t, Exist_AdditionsR99, 1), - M_TYPE (Packet_Downlink_ImmAssignment_t, AdditionsR99, PD_IA_AdditionsR99_t), -CSN_DESCR_END (Packet_Downlink_ImmAssignment_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (Second_Part_Packet_Assignment_t) - M_NEXT_EXIST_OR_NULL_LH(Second_Part_Packet_Assignment_t, Exist_SecondPart, 2), - M_NEXT_EXIST (Second_Part_Packet_Assignment_t, Exist_ExtendedRA, 1), - M_UINT (Second_Part_Packet_Assignment_t, ExtendedRA, 5), -CSN_DESCR_END (Second_Part_Packet_Assignment_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(IA_PacketAssignment_UL_DL_t) - M_UNION (IA_PacketAssignment_UL_DL_t, 2), - M_TYPE (IA_PacketAssignment_UL_DL_t, ul_dl.Packet_Uplink_ImmAssignment, Packet_Uplink_ImmAssignment_t), - M_TYPE (IA_PacketAssignment_UL_DL_t, ul_dl.Packet_Downlink_ImmAssignment, Packet_Downlink_ImmAssignment_t), -CSN_DESCR_END (IA_PacketAssignment_UL_DL_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(IA_PacketAssignment_t) - M_UNION (IA_PacketAssignment_t, 2), - M_TYPE (IA_PacketAssignment_t, u.UplinkDownlinkAssignment, IA_PacketAssignment_UL_DL_t), - M_TYPE (IA_PacketAssignment_t, u.UplinkDownlinkAssignment, Second_Part_Packet_Assignment_t), -CSN_DESCR_END (IA_PacketAssignment_t) -#endif - /* <Packet Polling Request> */ static const CSN_ChoiceElement_t PacketPollingID[] = @@ -673,53 +308,6 @@ M_TYPE (PBCCH_present_t, PBCCH_Description, PBCCH_Description_t), CSN_DESCR_END (PBCCH_present_t) -#if 0 -static const -CSN_DESCR_BEGIN(SI13_AdditionsR6) - M_NEXT_EXIST (SI13_AdditionsR6, Exist_LB_MS_TXPWR_MAX_CCH, 1), - M_UINT (SI13_AdditionsR6, LB_MS_TXPWR_MAX_CCH, 5), - M_UINT (SI13_AdditionsR6, SI2n_SUPPORT, 2), -CSN_DESCR_END (SI13_AdditionsR6) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(SI13_AdditionsR4) - M_UINT (SI13_AdditionsR4, SI_STATUS_IND, 1), - M_NEXT_EXIST_OR_NULL_LH (SI13_AdditionsR4, Exist_AdditionsR6, 1), - M_TYPE (SI13_AdditionsR4, AdditionsR6, SI13_AdditionsR6), -CSN_DESCR_END (SI13_AdditionsR4) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN(SI13_AdditionR99) - M_UINT (SI13_AdditionR99, SGSNR, 1), - M_NEXT_EXIST_OR_NULL_LH (SI13_AdditionR99, Exist_AdditionsR4, 1), - M_TYPE (SI13_AdditionR99, AdditionsR4, SI13_AdditionsR4), -CSN_DESCR_END (SI13_AdditionR99) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (SI_13_t) - M_THIS_EXIST_LH (SI_13_t), - - M_UINT (SI_13_t, BCCH_CHANGE_MARK, 3), - M_UINT (SI_13_t, SI_CHANGE_FIELD, 4), - - M_NEXT_EXIST (SI_13_t, Exist_MA, 2), - M_UINT (SI_13_t, SI13_CHANGE_MARK, 2), - M_TYPE (SI_13_t, GPRS_Mobile_Allocation, GPRS_Mobile_Allocation_t), - - M_UNION (SI_13_t, 2), - M_TYPE (SI_13_t, u.PBCCH_Not_present, PBCCH_Not_present_t), - M_TYPE (SI_13_t, u.PBCCH_present, PBCCH_present_t), - - M_NEXT_EXIST_OR_NULL_LH(SI_13_t, Exist_AdditionsR99, 1), - M_TYPE (SI_13_t, AdditionsR99, SI13_AdditionR99), -CSN_DESCR_END (SI_13_t) -#endif /************************************************************/ /* TS 44.060 messages */ /************************************************************/ @@ -4021,37 +3609,6 @@ M_TYPE (PMR_AdditionsR99_t, AdditionsR5, PMR_AdditionsR5_t), CSN_DESCR_END (PMR_AdditionsR99_t) -#if 0 -static const -CSN_DESCR_BEGIN(EMR_ServingCell_t) - /*CSN_MEMBER_BIT (EMR_ServingCell_t, DTX_USED),*/ - M_UINT (EMR_ServingCell_t, DTX_USED, 1), - M_UINT (EMR_ServingCell_t, RXLEV_VAL, 6), - M_UINT (EMR_ServingCell_t, RX_QUAL_FULL, 3), - M_UINT (EMR_ServingCell_t, MEAN_BEP, 5), - M_UINT (EMR_ServingCell_t, CV_BEP, 3), - M_UINT (EMR_ServingCell_t, NBR_RCVD_BLOCKS, 5), -CSN_DESCR_END(EMR_ServingCell_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (EnhancedMeasurementReport_t) - M_UINT (EnhancedMeasurementReport_t, RR_Short_PD, 1), - M_UINT (EnhancedMeasurementReport_t, MESSAGE_TYPE, 5), - M_UINT (EnhancedMeasurementReport_t, ShortLayer2_Header, 2), - M_TYPE (EnhancedMeasurementReport_t, BA_USED, BA_USED_t), - M_UINT (EnhancedMeasurementReport_t, BSIC_Seen, 1), - M_UINT (EnhancedMeasurementReport_t, SCALE, 1), - M_NEXT_EXIST (EnhancedMeasurementReport_t, Exist_ServingCellData, 1), - M_TYPE (EnhancedMeasurementReport_t, ServingCellData, EMR_ServingCell_t), - M_REC_TARRAY (EnhancedMeasurementReport_t, RepeatedInvalid_BSIC_Info, RepeatedInvalid_BSIC_Info_t, - Count_RepeatedInvalid_BSIC_Info), - M_NEXT_EXIST (EnhancedMeasurementReport_t, Exist_ReportBitmap, 1), - M_VAR_TARRAY (EnhancedMeasurementReport_t, REPORTING_QUANTITY_Instances, REPORTING_QUANTITY_Instance_t, Count_REPORTING_QUANTITY_Instances), -CSN_DESCR_END (EnhancedMeasurementReport_t) -#endif - static const CSN_DESCR_BEGIN (Packet_Measurement_Report_t) /* Mac header */ @@ -4382,54 +3939,6 @@ M_PADDING_BITS(Packet_Serving_Cell_Data_t), CSN_DESCR_END (Packet_Serving_Cell_Data_t) - -/* Enhanced Measurement Report */ -#if 0 -static const -CSN_DESCR_BEGIN (ServingCellData_t) - M_UINT (ServingCellData_t, RXLEV_SERVING_CELL, 6), - M_FIXED (ServingCellData_t, 1, 0), -CSN_DESCR_END (ServingCellData_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (Repeated_Invalid_BSIC_Info_t) - M_UINT (Repeated_Invalid_BSIC_Info_t, BCCH_FREQ_NCELL, 5), - M_UINT (Repeated_Invalid_BSIC_Info_t, BSIC, 6), - M_UINT (Repeated_Invalid_BSIC_Info_t, RXLEV_NCELL, 5), -CSN_DESCR_END (Repeated_Invalid_BSIC_Info_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (REPORTING_QUANTITY_t) - M_NEXT_EXIST (REPORTING_QUANTITY_t, Exist_REPORTING_QUANTITY, 1), - M_UINT (REPORTING_QUANTITY_t, REPORTING_QUANTITY, 6), -CSN_DESCR_END (REPORTING_QUANTITY_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (NC_MeasurementReport_t) - M_UINT (NC_MeasurementReport_t, NC_MODE, 1), - M_UNION (NC_MeasurementReport_t, 2), - M_TYPE (NC_MeasurementReport_t, u.BA_USED, BA_USED_t), - M_UINT (NC_MeasurementReport_t, u.PSI3_CHANGE_MARK, 2), - M_UINT (NC_MeasurementReport_t, PMO_USED, 1), - M_UINT (NC_MeasurementReport_t, SCALE, 1), - - M_NEXT_EXIST (NC_MeasurementReport_t, Exist_ServingCellData, 1), - M_TYPE (NC_MeasurementReport_t, ServingCellData, ServingCellData_t), - - M_REC_TARRAY (NC_MeasurementReport_t, Repeated_Invalid_BSIC_Info, Repeated_Invalid_BSIC_Info_t, Count_Repeated_Invalid_BSIC_Info), - - M_NEXT_EXIST (NC_MeasurementReport_t, Exist_Repeated_REPORTING_QUANTITY, 1), - M_VAR_TARRAY (NC_MeasurementReport_t, Repeated_REPORTING_QUANTITY, REPORTING_QUANTITY_t, Count_Repeated_Reporting_Quantity), -CSN_DESCR_END (NC_MeasurementReport_t) -#endif - - /*< Packet Handover Command message content > */ static const CSN_DESCR_BEGIN (GlobalTimeslotDescription_t) @@ -5159,98 +4668,6 @@ CSN_DESCR_END (PSI13_t) /*< End Packet System Information Type 13 message content >*/ -/* SI1_RestOctet_t */ - -#if 0 -static const -CSN_DESCR_BEGIN (SI1_RestOctet_t) - M_NEXT_EXIST_LH(SI1_RestOctet_t, Exist_NCH_Position, 1), - M_UINT (SI1_RestOctet_t, NCH_Position, 5), - - M_UINT_LH (SI1_RestOctet_t, BandIndicator, 1), -CSN_DESCR_END (SI1_RestOctet_t) -#endif - -/* SI3_Rest_Octet_t */ -#if 0 -static const -CSN_DESCR_BEGIN(Selection_Parameters_t) - M_UINT (Selection_Parameters_t, CBQ, 1), - M_UINT (Selection_Parameters_t, CELL_RESELECT_OFFSET, 6), - M_UINT (Selection_Parameters_t, TEMPORARY_OFFSET, 3), - M_UINT (Selection_Parameters_t, PENALTY_TIME, 5), -CSN_DESCR_END (Selection_Parameters_t) - -static const -CSN_DESCR_BEGIN (SI3_Rest_Octet_t) - M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_Selection_Parameters, 1), - M_TYPE (SI3_Rest_Octet_t, Selection_Parameters, Selection_Parameters_t), - - M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_Power_Offset, 1), - M_UINT (SI3_Rest_Octet_t, Power_Offset, 2), - - M_UINT_LH (SI3_Rest_Octet_t, System_Information_2ter_Indicator, 1), - M_UINT_LH (SI3_Rest_Octet_t, Early_Classmark_Sending_Control, 1), - - M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_WHERE, 1), - M_UINT (SI3_Rest_Octet_t, WHERE, 3), - - M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_GPRS_Indicator, 2), - M_UINT (SI3_Rest_Octet_t, RA_COLOUR, 3), - M_UINT (SI3_Rest_Octet_t, SI13_POSITION, 1), - - M_UINT_LH (SI3_Rest_Octet_t, ECS_Restriction3G, 1), - - M_NEXT_EXIST_LH(SI3_Rest_Octet_t, ExistSI2quaterIndicator, 1), - M_UINT (SI3_Rest_Octet_t, SI2quaterIndicator, 1), -CSN_DESCR_END (SI3_Rest_Octet_t) -#endif - -#if 0 -static const -CSN_DESCR_BEGIN (SI4_Rest_Octet_t) - M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_Selection_Parameters, 1), - M_TYPE (SI4_Rest_Octet_t, Selection_Parameters, Selection_Parameters_t), - - M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_Power_Offset, 1), - M_UINT (SI4_Rest_Octet_t, Power_Offset, 2), - - M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_GPRS_Indicator, 2), - M_UINT (SI4_Rest_Octet_t, RA_COLOUR, 3), - M_UINT (SI4_Rest_Octet_t, SI13_POSITION, 1), -CSN_DESCR_END (SI4_Rest_Octet_t) -#endif - -/* SI6_RestOctet_t */ - -#if 0 -static const -CSN_DESCR_BEGIN(PCH_and_NCH_Info_t) - M_UINT (PCH_and_NCH_Info_t, PagingChannelRestructuring, 1), - M_UINT (PCH_and_NCH_Info_t, NLN_SACCH, 2), - - M_NEXT_EXIST (PCH_and_NCH_Info_t, Exist_CallPriority, 1), - M_UINT (PCH_and_NCH_Info_t, CallPriority, 3), - - M_UINT (PCH_and_NCH_Info_t, NLN_Status, 1), -CSN_DESCR_END (PCH_and_NCH_Info_t) - -static const -CSN_DESCR_BEGIN (SI6_RestOctet_t) - M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_PCH_and_NCH_Info, 1), - M_TYPE (SI6_RestOctet_t, PCH_and_NCH_Info, PCH_and_NCH_Info_t), - - M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_VBS_VGCS_Options, 1), - M_UINT (SI6_RestOctet_t, VBS_VGCS_Options, 2), - - M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_DTM_Support, 2), - M_UINT (SI6_RestOctet_t, RAC, 8), - M_UINT (SI6_RestOctet_t, MAX_LAPDm, 3), - - M_UINT_LH (SI6_RestOctet_t, BandIndicator, 1), -CSN_DESCR_END (SI6_RestOctet_t) -#endif - /* EGPRS Packet Channel Request (see 3GPP TS 44.060, table 11.2.5a.2) */ static const CSN_DESCR_BEGIN(PacketChannelRequest_MC5P2RB3_t) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8096ca5..bcde16f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = \ - rlcmac \ + ts_44_060 \ $(NULL) # The `:;' works around a Bash 3.2 bug when the output is not writeable. diff --git a/tests/testsuite.at b/tests/testsuite.at index 4669a00..1aee874 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,9 +1,9 @@ AT_INIT AT_BANNER([Regression tests]) -AT_SETUP([rlcmac]) -AT_KEYWORDS([rlcmac]) -cat $abs_srcdir/rlcmac/RLCMACTest.ok > expout -cat $abs_srcdir/rlcmac/RLCMACTest.err > experr -AT_CHECK([$abs_top_builddir/tests/rlcmac/RLCMACTest], [0], [expout], [experr]) +AT_SETUP([rlcmac/ts_44_060]) +AT_KEYWORDS([rlcmac ts_44_060]) +cat $abs_srcdir/ts_44_060/ts_44_060_test.ok > expout +cat $abs_srcdir/ts_44_060/ts_44_060_test.err > experr +AT_CHECK([$abs_top_builddir/tests/ts_44_060/ts_44_060_test], [0], [expout], [experr]) AT_CLEANUP diff --git a/tests/rlcmac/Makefile.am b/tests/ts_44_060/Makefile.am similarity index 70% rename from tests/rlcmac/Makefile.am rename to tests/ts_44_060/Makefile.am index 633f090..fb953e3 100644 --- a/tests/rlcmac/Makefile.am +++ b/tests/ts_44_060/Makefile.am @@ -9,16 +9,16 @@ $(NULL) check_PROGRAMS = \ - RLCMACTest \ + ts_44_060_test \ $(NULL) EXTRA_DIST = \ - RLCMACTest.ok \ - RLCMACTest.err \ + ts_44_060_test.ok \ + ts_44_060_test.err \ $(NULL) -RLCMACTest_SOURCES = RLCMACTest.c -RLCMACTest_LDADD = \ +ts_44_060_test_SOURCES = ts_44_060_test.c +ts_44_060_test_LDADD = \ $(LIBOSMOCORE_LIBS) \ $(top_builddir)/src/csn1/libosmo-csn1.la \ $(top_builddir)/src/rlcmac/libosmo-gprs-rlcmac.la \ diff --git a/tests/rlcmac/RLCMACTest.c b/tests/ts_44_060/ts_44_060_test.c similarity index 100% rename from tests/rlcmac/RLCMACTest.c rename to tests/ts_44_060/ts_44_060_test.c diff --git a/tests/rlcmac/RLCMACTest.err b/tests/ts_44_060/ts_44_060_test.err similarity index 100% rename from tests/rlcmac/RLCMACTest.err rename to tests/ts_44_060/ts_44_060_test.err diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/ts_44_060/ts_44_060_test.ok similarity index 100% rename from tests/rlcmac/RLCMACTest.ok rename to tests/ts_44_060/ts_44_060_test.ok -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2b941f06a70a25e92ba3fd2638f87360a5aa5435 Gerrit-Change-Number: 29193 Gerrit-PatchSet: 4 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmocom-bb[master]: mobile: lapdm_channel_init() is deprecated, use lapdm_channel_init3()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29174 ) Change subject: mobile: lapdm_channel_init() is deprecated, use lapdm_channel_init3() ...................................................................... mobile: lapdm_channel_init() is deprecated, use lapdm_channel_init3() Change-Id: I320381488046f9b1780a53b8d5d27e470da727c4 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 12 insertions(+), 7 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/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 57b472f..7b28bb4 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -186,13 +186,18 @@ gsm_settings_arfcn(ms); - lapdm_channel_init(&ms->lapdm_channel, LAPDM_MODE_MS); - ms->lapdm_channel.lapdm_dcch.datalink[DL_SAPI3].dl.t200_sec = - T200_DCCH_SHARED; - ms->lapdm_channel.lapdm_dcch.datalink[DL_SAPI3].dl.t200_usec = 0; - ms->lapdm_channel.lapdm_acch.datalink[DL_SAPI3].dl.t200_sec = - T200_ACCH; - ms->lapdm_channel.lapdm_acch.datalink[DL_SAPI3].dl.t200_usec = 0; + const int t200_ms_dcch[_NR_DL_SAPI] = { + [DL_SAPI0] = 1000, + [DL_SAPI3] = 1000 * T200_DCCH_SHARED + }; + const int t200_ms_acch[_NR_DL_SAPI] = { + [DL_SAPI0] = 2000, + [DL_SAPI3] = 1000 * T200_ACCH + }; + + lapdm_channel_init3(&ms->lapdm_channel, LAPDM_MODE_MS, + t200_ms_dcch, t200_ms_acch, + GSM_LCHAN_SDCCH, NULL); lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); /* init SAP client before SIM card starts up */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I320381488046f9b1780a53b8d5d27e470da727c4 Gerrit-Change-Number: 29174 Gerrit-PatchSet: 3 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

1 year, 8 months

1
0
0 0

Change in libosmo-netif[master]: Properly handle send() return code

by fixeria

Attention is currently required from: msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29178 ) Change subject: Properly handle send() return code ...................................................................... Patch Set 1: (1 comment) File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/29178/comment/92a50424_ce11b34c PS1, Line 1334: LOGP(DLINP, LOGL_ERROR, "error to send: %s\n", (ret == -1) ? strerror(errno) : strerror(-ret)); > this is not entirely correct, and confusing. What if -ENOTSUP is -1 in some implementation? […] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If9b80e855b740254d5414ea50b4ce594855da8e9 Gerrit-Change-Number: 29178 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:59:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: contrib/jenkins.sh: speed up pylint by running multiple processes

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29240 ) Change subject: contrib/jenkins.sh: speed up pylint by running multiple processes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I76d1696c27ddcab358526f807c4a0a7f0d4c85d4 Gerrit-Change-Number: 29240 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: Tue, 30 Aug 2022 11:54:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: contrib/jenkins.sh: pylint v2.15 is unstable, pin v2.14.5

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29239 ) Change subject: contrib/jenkins.sh: pylint v2.15 is unstable, pin v2.14.5 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie29be6ec6631ff2b3d8cd6b2dd9ac0ed8f505e4f Gerrit-Change-Number: 29239 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: Tue, 30 Aug 2022 11:54:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: contrib/jenkins.sh: install dependencies from requirements.txt

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29237 ) Change subject: contrib/jenkins.sh: install dependencies from requirements.txt ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I99af496e9a3758ea624ca484f4fbc51b262ffaf4 Gerrit-Change-Number: 29237 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:52:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: contrib/jenkins.sh: execute this script with -x and -e

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29236 ) Change subject: contrib/jenkins.sh: execute this script with -x and -e ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I13af70ef770936bec00b050b6c4f988e53ee2833 Gerrit-Change-Number: 29236 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:52:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: README.md: update installation instructions for Debian

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29235 ) Change subject: README.md: update installation instructions for Debian ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icefa33570a34960a4fff145f3c1b6585d867605c Gerrit-Change-Number: 29235 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:51:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: README.md: update git URLs (git -> https; gitea)

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29234 ) Change subject: README.md: update git URLs (git -> https; gitea) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia86979f656557e442b0f432b0646aa7661c293e9 Gerrit-Change-Number: 29234 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:51:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in libosmo-sccp[master]: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD

by pespin

Attention is currently required from: neels, laforge, fixeria, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 ) Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD ...................................................................... Patch Set 15: (7 comments) File src/sccp_scoc.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/99187a07_486bf644 PS15, Line 642: /* optional: importance */ why is this line removed here? this is non related. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/22584621_ed05b35e PS15, Line 600: if ( > in whihc situation would we have a zero-length opt_data_cache? Ack https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/95f59ccb_f6e0401e PS15, Line 606: } else remove curly braces in the if. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/76465829_27cd148a PS15, Line 630: if (xua_drop_data_check(prim, SCCP_MAX_DATA, "cache overrun")) ...check_drop(), otherwise it's not clear what you are checking and it's confusing since you actually check for drop and return the opposite to keep it. Actually, since you call this function _keep(), it would make sense to reverse the loginc on the xua_drop_data_check() function... I would even drop the function completely tbh. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/1e4a2119_e4a3eef7 PS15, Line 635: LOGP(DLSCCP, LOGL_ERROR, "replacing unsent %u bytes of optional data cache with %s optional data\n", NOTICE https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/fba00b9f_9b6214fd PS15, Line 639: msgb_alloc(SCCP_MAX_DATA, "SCCP optional data cache for CR/CC/RLSD"); > If we ever should run into memory leaks, it would be better to use msgb_alloc_c(conn) to attach this […] Ack https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/d53cddbe_6bbb5c85 PS15, Line 784: xua_msg_add_sccp_addr(xua, SUA_IEI_DEST_ADDR, &conn->calling_addr); why is this line removed here? this is non related. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a Gerrit-Change-Number: 29084 Gerrit-PatchSet: 15 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:49:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-hlr[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: osmith, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/29225 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/29225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I40b5d50470cb55ca94af5e17f21658181a02d4c2 Gerrit-Change-Number: 29225 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:38:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ggsn[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29223 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: Are these directories created automatically? or are they needed to be created during package installation? -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idffc115c21cac77f6f43356333de538ba549fc6a Gerrit-Change-Number: 29223 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:37:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ggsn[master]: Ignore .deb build byproducts

by pespin

Attention is currently required from: fixeria, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29224 ) Change subject: Ignore .deb build byproducts ...................................................................... Patch Set 2: (1 comment) File .gitignore: https://gerrit.osmocom.org/c/osmo-ggsn/+/29224/comment/edce9888_df78ed9f PS2, Line 27: # debian > I suggest to move your new entries here, so that we have all debian stuff in one place. Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Iec63ef5ea0acfc5e6621054926be15ae4754d65d Gerrit-Change-Number: 29224 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:36:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in libosmocore[master]: Make osmo_sockaddr_str_from_sockaddr() less picky

by pespin

Attention is currently required from: msuraev, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28995 ) Change subject: Make osmo_sockaddr_str_from_sockaddr() less picky ...................................................................... Patch Set 8: Code-Review-2 (1 comment) File src/sockaddr_str.c: https://gerrit.osmocom.org/c/libosmocore/+/28995/comment/e0df25cf_e1c09e6a PS7, Line 389: guess = (src->ss_family == AF_UNSPEC) ? osmo_sockaddr_guess_unspec((const struct sockaddr *)src) : src->ss_family; > Not "random stuff" but the content withdots or colons which passed through osmo_sockaddr_guess_unspe […] No dots or colons are passed to that function inside struct sockaddr, so you cannot really know that, it's only a chunk of memory containing octets representing digits. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I36f20701663c3c7eae7fedc6551da44800b325bf Gerrit-Change-Number: 28995 Gerrit-PatchSet: 8 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:32:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-upf[master]: Allow running without a GTP dev

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29210 ) Change subject: Allow running without a GTP dev ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ibb79b3ce1906136f77a895ff6f691d72a92c9fb9 Gerrit-Change-Number: 29210 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:29:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29193 ) Change subject: rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2b941f06a70a25e92ba3fd2638f87360a5aa5435 Gerrit-Change-Number: 29193 Gerrit-PatchSet: 4 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:20:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: make logging category configurable

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29207 ) Change subject: rlcmac: make logging category configurable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icfef6de126304da81120f1d7b212992ead3409aa Gerrit-Change-Number: 29207 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:20:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: add osmo_gprs_rlcmac_decode_si13ro()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29195 ) Change subject: rlcmac: add osmo_gprs_rlcmac_decode_si13ro() ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic8446509ef474b8496e5557aab3d2a9e94e11897 Gerrit-Change-Number: 29195 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:11:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: split ts_24_008.c out of ts_44_060.c

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29194 ) Change subject: rlcmac: split ts_24_008.c out of ts_44_060.c ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Idedf52423fef18b929e8096fbe4e130b5a6c7d2c Gerrit-Change-Number: 29194 Gerrit-PatchSet: 5 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 11:07:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmocom-bb[master]: mobile: lapdm_channel_init() is deprecated, use lapdm_channel_init3()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29174 ) Change subject: mobile: lapdm_channel_init() is deprecated, use lapdm_channel_init3() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I320381488046f9b1780a53b8d5d27e470da727c4 Gerrit-Change-Number: 29174 Gerrit-PatchSet: 2 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: Tue, 30 Aug 2022 10:58:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in libosmo-netif[master]: Properly handle send() return code

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29178 ) Change subject: Properly handle send() return code ...................................................................... Patch Set 1: (1 comment) File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/29178/comment/3b570886_6ea18f44 PS1, Line 1334: LOGP(DLINP, LOGL_ERROR, "error to send: %s\n", (ret == -1) ? strerror(errno) : strerror(-ret)); this is not entirely correct, and confusing. What if -ENOTSUP is -1 in some implementation? You should set "ret = -1; errno = ENOTSUP;" in the default switch branch, and use strerror(errno) there. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If9b80e855b740254d5414ea50b4ce594855da8e9 Gerrit-Change-Number: 29178 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 10:46:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-bsc[master]: BSSMAP: add assert to reset resending

by pespin

Attention is currently required from: neels, msuraev, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28892 ) Change subject: BSSMAP: add assert to reset resending ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I235bdd42ea82e7b5a1a40f437ca34c49ad239c48 Gerrit-Change-Number: 28892 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 10:41:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

2024

2023

2022

gerrit-log August 2022