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

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip

by fixeria

Attention is currently required from: dexter, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email ) Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip ...................................................................... Patch Set 2: (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/35151/comment/01b4c1fc_4c03fc14 PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing > @fixeria bear in mind the "skip_idle && trx != 0" was only applied inside the #ifdef DIRECT_PHY [...] It's getting more and more complicated, but it seems I have a more complete picture in my mind. The `#ifdef DIRECT_PHY` block was removed in a recent patch (I7a08d8cc670fa14f7206ffffdbc22351f3668a17), and now this patch removes the `trx != 0` constraint. > And that was done in order to make it send stuff on C0 because those osmo-bts lowerlayers are not filling the block otherwise. Ack. The `trx != 0` constraint was specifically needed for those DSP based models. > I realize now though, that when proposing the cleanup in this patch, I assumed those were 1 TRX only, but lc15 has several of them right? I am not familiar with the lc15 PHY, but AFAIR there also was a sysmoBTS model with two TRX. Also, I don't know how those DSP based models behave when getting an empty DATA.req for `trx!=0`. Was this ever tested? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 16:26:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Let's address this is in a follow up patch. This patch makes jenkins-sns.sh, equal to jenkins.sh. […] Suggestion: maybe we could agree on always having the latest PCUIF version configured in `osmo-ttcn3-hacks.git` (we already do in `PCU_Tests.default`) and overwrite it here in `docker-playground.git` only if needed (e.g. for latest or `202[0-9]q[0-9]` branches). This way patching the config file would be as easy as doing `echo "PCUIF_Types.mp_pcuif_version := 12" >> $1`. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Gerrit-Change-Number: 35159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(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-Comment-Date: Wed, 29 Nov 2023 16:02:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-gsm-tester[master]: Update git URLs

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs ...................................................................... Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/9ecedff9_d5b73… PS2, Line 9: git.osmocom.org has been deprecated > Huh? I thought it's only the `git://` protocol has been deprecated and was disabled yesterday. […] right, `git clone https://git.osmocom.org/libosmocore` still works... agreed that the commit message could be better, but the change still makes sense given that gerrit.osmocom.org is more recent. I should have written: git://git.osmocom.org is deprecated. Sorry, had merged it already just before your comment arrived. I guess it failed in jenkins because the workspaces weren't cleaned when git:// was changed to https:// in I5f51b260445624759e77a70c5065838b29ec8c01. I have cleaned them as I tested the patch here. File contrib/jenkins-build-osmo-bts.sh: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/c86e1de5_403b2… PS1, Line 7: (git_url=https://gitea.osmocom.org/cellular-infrastructure > It needs to be this url for octphy-2g-headers only (not on gerrit), everything else should be retrie […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 15:55:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-gsm-tester[master]: Update git URLs

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs ...................................................................... Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/8913f5a1_96c58… PS2, Line 9: git.osmocom.org has been deprecated Huh? I thought it's only the `git://` protocol has been deprecated and was disabled yesterday. When doing `git clone https://git.osmocom.org/...`, you'll be redirected to Gitea anyway... The sync delay (which may be different in different projects) is a more reasonable argument against using `https://git.osmocom.org`, IMO. File contrib/jenkins-build-osmo-bts.sh: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/98f9a961_97627… PS1, Line 7: (git_url=https://gitea.osmocom.org/cellular-infrastructure > It needs to be this url for octphy-2g-headers only (not on gerrit), everything else should be retrie […] Likewise, cloning from `https://git.osmocom.org/octphy-2g-headers` works fine, git client gets redirected to `https://gitea.osmocom.org/cellular-infrastructure/octphy-2g-headers/`. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 15:50:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-ggsn[master]: libgtp: Remove defines for reserved causes in gtp.h

by osmith

Attention is currently required from: daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email ) Change subject: libgtp: Remove defines for reserved causes in gtp.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8db0aa0ade59785443a407b51dea326144406dcf Gerrit-Change-Number: 35162 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 15:49:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-ggsn[master]: libgtp: Remove defines for reserved causes in gtp.h

by pespin

Attention is currently required from: daniel, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email ) Change subject: libgtp: Remove defines for reserved causes in gtp.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8db0aa0ade59785443a407b51dea326144406dcf Gerrit-Change-Number: 35162 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 15:49:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-gsm-tester[master]: Update git URLs

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs ...................................................................... Update git URLs git.osmocom.org has been deprecated, use gerrit or gitea urls instead. Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Git_infrastructure Related: OS#6251 Change-Id: I03a06d23e87a75257eb731a97facd7a67c40a2c6 --- M README.md M contrib/jenkins-build-common.sh M contrib/jenkins-build-manuals.sh M contrib/jenkins-build-osmo-bts.sh M doc/manuals/chapters/ansible.adoc M doc/manuals/chapters/docker.adoc M doc/manuals/osmo-gsm-tester-manual-docinfo.xml M src/osmo_gsm_tester/obj/osmo_vty.py M sysmocom/ttcn3/README.txt 9 files changed, 32 insertions(+), 16 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/README.md b/README.md index 3394969..9bc1dcf 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,12 @@ Ansible scripts to set up hosts to be used as Osmo-GSM-Tester Main Units or/and Slave Units on the above mentioned setup can be found at -https://git.osmocom.org/osmo-ci/tree/ansible, which actually install sample -system configuration files from _utils/_ directory in this same repository. +https://gitea.osmocom.org/osmocom/osmo-ci/src/branch/master/ansible, which +actually install sample system configuration files from _utils/_ directory in +this same repository. A sample Docker setup is also maintained publicly at -https://git.osmocom.org/docker-playground/tree/osmo-gsm-tester. +https://gitea.osmocom.org/osmocom/docker-playground/src/branch/master/osmo-gsm-tester. For the complete documentation, please refer to Osmo-GSM-Tester User manual, available in sources under _doc/manuals/_ under this same repository, and diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index b41fc05..59d0d11 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -42,7 +42,7 @@ exit 1 fi -git_url="${git_url:-https://git.osmocom.org}" +git_url="${git_url:-https://gerrit.osmocom.org}" prefix="${prefix:-$base/inst-$name}" # prefix_real is usually identical with prefix, except when installing to a # different $DESTDIR than /, which is the case for example when building diff --git a/contrib/jenkins-build-manuals.sh b/contrib/jenkins-build-manuals.sh index 48f7780..cf2a4d8 100755 --- a/contrib/jenkins-build-manuals.sh +++ b/contrib/jenkins-build-manuals.sh @@ -15,7 +15,7 @@ if [ -d "$OSMO_GSM_MANUALS_DIR" ]; then git -C "$OSMO_GSM_MANUALS_DIR" pull else - git clone "https://git.osmocom.org/osmo-gsm-manuals" "$OSMO_GSM_MANUALS_DIR" + git clone "https://gerrit.osmocom.org/osmo-gsm-manuals" "$OSMO_GSM_MANUALS_DIR" fi git -C "$OSMO_GSM_MANUALS_DIR" checkout -f HEAD diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh index 6e9416a..d0b9e02 100755 --- a/contrib/jenkins-build-osmo-bts.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -4,7 +4,8 @@ name="osmo-bts" . "$(dirname "$0")/jenkins-build-common.sh" -have_repo octphy-2g-headers +(git_url=https://gitea.osmocom.org/cellular-infrastructure + have_repo octphy-2g-headers) build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen --disable-uring build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi diff --git a/doc/manuals/chapters/ansible.adoc b/doc/manuals/chapters/ansible.adoc index 4c80723..d8970aa 100644 --- a/doc/manuals/chapters/ansible.adoc +++ b/doc/manuals/chapters/ansible.adoc @@ -5,8 +5,8 @@ and tedious, nowadays the Osmocom RnD and Production {app-name} setups are installed and maintained using Ansible scripts. The set of ansible scripts is available in Osmocom's git repository -link:https://git.osmocom.org/osmo-ci/[osmo-ci.git] under 'ansible' subdirectory, -with the rest of ansible scripts to set jenkins slaves, etc. +link:https://gitea.osmocom.org/osmocom/osmo-ci/[osmo-ci.git] under 'ansible' +subdirectory, with the rest of ansible scripts to set jenkins slaves, etc. Since these set of scripts is mainly aimed at Osmocom's own setup, and debian is used there, so far only debian hosts are supported officially, though patches to diff --git a/doc/manuals/chapters/docker.adoc b/doc/manuals/chapters/docker.adoc index bc8ad00..985edc3 100644 --- a/doc/manuals/chapters/docker.adoc +++ b/doc/manuals/chapters/docker.adoc @@ -3,8 +3,8 @@ A sample {app-name} setup based on docker containers and maintained by the Osmocom community is available in Osmocom's git repository -link:https://git.osmocom.org/docker-playground/[docker-playground.git], under -'osmo-gsm-tester' subdirectory. In there, one can find: +link:https://gitea.osmocom.org/osmocom/docker-playground/[docker-playground.git], +under 'osmo-gsm-tester' subdirectory. In there, one can find: - A 'Dockerfile' file can be found which builds a docker image which can be used both to run as an osmo-gsm-tester <<install_main_unit,Main Unit>> or as diff --git a/doc/manuals/osmo-gsm-tester-manual-docinfo.xml b/doc/manuals/osmo-gsm-tester-manual-docinfo.xml index d7b112f..d59fc73 100644 --- a/doc/manuals/osmo-gsm-tester-manual-docinfo.xml +++ b/doc/manuals/osmo-gsm-tester-manual-docinfo.xml @@ -51,8 +51,8 @@ </para> <para> The Asciidoc source code of this manual can be found at - <ulink url="http://git.osmocom.org/osmo-gsm-manuals/"> - http://git.osmocom.org/osmo-gsm-manuals/ + <ulink url="https://gitea.osmocom.org/cellular-infrastructure/osmo-gsm-manuals"> + https://gitea.osmocom.org/cellular-infrastructure/osmo-gsm-manuals </ulink> </para> </legalnotice> diff --git a/src/osmo_gsm_tester/obj/osmo_vty.py b/src/osmo_gsm_tester/obj/osmo_vty.py index 1b414c9..80697c9 100644 --- a/src/osmo_gsm_tester/obj/osmo_vty.py +++ b/src/osmo_gsm_tester/obj/osmo_vty.py @@ -80,7 +80,7 @@ def _command(self, command_str, timeout=10, strict=True): '''Send a command and return the response.''' - # (copied from https://git.osmocom.org/python/osmo-python-tests/tree/osmopy/osmo_interact/…) + # (copied from osmo-python-tests.git/osmopy/osmo_interact/vty.py) self.dbg('Sending', command_str=command_str) self.sck.send(command_str.encode()) @@ -159,7 +159,7 @@ self.sck.setblocking(1) # read first prompt - # (copied from https://git.osmocom.org/python/osmo-python-tests/tree/osmopy/osmo_interact/…) + # (copied from osmo-python-tests.git/osmopy/osmo_interact/vty.py) self.this_node = None self.this_prompt_char = '>' # slight cheat for initial prompt char self.last_node = None @@ -209,7 +209,7 @@ with self: return self.cmd(command_str, timeout, strict) - # (copied from https://git.osmocom.org/python/osmo-python-tests/tree/osmopy/osmo_interact/…) + # (copied from osmo-python-tests.git/osmopy/osmo_interact/vty.py) command_str = command_str or '\r' if command_str[-1] not in '?\r\t': command_str = command_str + '\r' diff --git a/sysmocom/ttcn3/README.txt b/sysmocom/ttcn3/README.txt index 3886c80..2e10105 100644 --- a/sysmocom/ttcn3/README.txt +++ b/sysmocom/ttcn3/README.txt @@ -1,5 +1,6 @@ This directory contains a set of scripts and osmo-gsm-tester testsuites to run -osmo-ttcn3-hacks.git BTS_tests.ttcn (https://git.osmocom.org/osmo-ttcn3-hacks/tree/bts). +osmo-ttcn3-hacks.git BTS_tests.ttcn +(https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/src/branch/master/bts). The idea is to set up automatically the following components: TTCN3 <-> osmocon (osmocom-bb) <-> motorola C123 <-> RF network <-> BTS_TO_TEST <-> TTCN3 + osmo-bsc -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success

by daniel

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email ) Change subject: gtp: Add net GTP cause values and a function to check for success ...................................................................... Patch Set 2: (1 comment) File gtp/gtp.h: https://gerrit.osmocom.org/c/osmo-ggsn/+/35084/comment/6c8690c8_c0d44bed PS2, Line 106: #define GTPCAUSE_129 129 /* For future use 129-176 */ > Agree, please submit a patch dropping all of them. See https://gerrit.osmocom.org/c/osmo-ggsn/+/35162 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 Gerrit-Change-Number: 35084 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 15:42:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-ggsn[master]: libgtp: Remove defines for reserved causes in gtp.h

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email ) Change subject: libgtp: Remove defines for reserved causes in gtp.h ...................................................................... libgtp: Remove defines for reserved causes in gtp.h As discussed in Gerrit change I9c3bf64537ef2223e29f8082861fa32fde26bf68 remove defines that don't serve any purpose. These are defines for reserved values and changing them later if a newer spec defined them would break API. Keep the comments to explain the missing values. Change-Id: I8db0aa0ade59785443a407b51dea326144406dcf --- M TODO-RELEASE M gtp/gtp.h 2 files changed, 26 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/62/35162/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..d8cc3af 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libgtp REMOVE remove GTP cause defines of reserved values diff --git a/gtp/gtp.h b/gtp/gtp.h index c066fa6..7465cf1 100644 --- a/gtp/gtp.h +++ b/gtp/gtp.h @@ -53,7 +53,7 @@ #define GTP_UPDATE_PDP_RSP 19 /* Update PDP Context Response */ #define GTP_DELETE_PDP_REQ 20 /* Delete PDP Context Request */ #define GTP_DELETE_PDP_RSP 21 /* Delete PDP Context Response */ - /* 22-25 For future use. *//* In version GTP 1 anonomous PDP context */ +/* 22-25 For future use. *//* In version GTP 1 anonomous PDP context */ #define GTP_ERROR 26 /* Error Indication */ #define GTP_PDU_NOT_REQ 27 /* PDU Notification Request */ #define GTP_PDU_NOT_RSP 28 /* PDU Notification Response */ @@ -99,21 +99,21 @@ #define GTPCAUSE_NO_ID_NEEDED 3 /* No identity needed */ #define GTPCAUSE_MS_REFUSES_X 4 /* MS refuses */ #define GTPCAUSE_MS_NOT_RESP_X 5 /* MS is not GPRS responding */ -#define GTPCAUSE_006 6 /* For future use 6-48 */ -#define GTPCAUSE_049 49 /* Cause values reserved for GPRS charging protocol use (See GTP' in GSM 12.15) 49-63 */ -#define GTPCAUSE_064 64 /* For future use 64-127 */ +/* 6-48 For future use */ +/* 49-63 Cause values reserved for GPRS charging protocol use (See GTP' in GSM 12.15) */ +/* 64-127 For future use */ #define GTPCAUSE_ACC_REQ 128 /* Request accepted */ #define GTPCAUSE_NEW_PDP_NET_PREF 129 /* New PDP type due to network preference */ #define GTPCAUSE_NEW_PDP_ADDR_BEAR 130 /* New PDP type due to single address bearer only */ -#define GTPCAUSE_131 131 /* For future use 131-176 */ -#define GTPCAUSE_177 177 /* Cause values reserved for GPRS charging protocol use (See GTP' In GSM 12.15) 177-191 */ +/* 131-176 For future use */ +/* 177-191 Cause values reserved for GPRS charging protocol use (See GTP' In GSM 12.15) */ #define GTPCAUSE_NON_EXIST 192 /* Non-existent */ #define GTPCAUSE_INVALID_MESSAGE 193 /* Invalid message format */ #define GTPCAUSE_IMSI_NOT_KNOWN 194 /* IMSI not known */ #define GTPCAUSE_MS_DETACHED 195 /* MS is GPRS detached */ #define GTPCAUSE_MS_NOT_RESP 196 /* MS is not GPRS responding */ #define GTPCAUSE_MS_REFUSES 197 /* MS refuses */ -#define GTPCAUSE_198 198 /* For future use */ +/* 198 For future use */ #define GTPCAUSE_NO_RESOURCES 199 /* No resources available */ #define GTPCAUSE_NOT_SUPPORTED 200 /* Service not supported */ #define GTPCAUSE_MAN_IE_INCORRECT 201 /* Mandatory IE incorrect */ @@ -136,8 +136,8 @@ #define GTPCAUSE_SYN_ERR_FILTER 218 /* Syntactic errors in packet filter(s) */ #define GTPCAUSE_MISSING_APN 219 /* Missing or unknown APN */ #define GTPCAUSE_UNKNOWN_PDP 220 /* Unknown PDP address or PDP type */ -#define GTPCAUSE_221 221 /* For Future Use 221-240 */ -#define GTPCAUSE_241 241 /* Cause Values Reserved For Gprs Charging Protocol Use (See Gtp' In Gsm 12.15) 241-255 */ +/* 221-240 For future use */ +/* 241-255 Cause Values Reserved For Gprs Charging Protocol Use (See Gtp' In Gsm 12.15) */ static inline bool gtp_cause_successful(uint8_t cause) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8db0aa0ade59785443a407b51dea326144406dcf Gerrit-Change-Number: 35162 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35161?usp=email ) Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs. ...................................................................... pySim-shell: Do not use self.lchan.scc when sending raw APDUs. When sending raw APDUs, we access the scc (SimCardCommands) object via the scc member in the lchan object. Unfortunately self.lchan will not be populated when the rs (RuntimeState) object is missing. This is in particular the case when no profile could be detected for the card, which is a common situation when we boostrap an unprovisioned card. So let's access the scc object through the card object. This is also more logical since when we send raw APDUs we work below the level of logical channels. Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Related: OS#6278 --- M pySim-shell.py 1 file changed, 29 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 4e08eb7..3d8bd86 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -237,10 +237,15 @@ @cmd2.with_argparser(apdu_cmd_parser) def do_apdu(self, opts): """Send a raw APDU to the card, and print SW + Response. - DANGEROUS: pySim-shell will not know any card state changes, and - not continue to work as expected if you e.g. select a different - file.""" - data, sw = self.lchan.scc._tp.send_apdu(opts.APDU) + CAUTION: this command bypasses the logical channel handling of pySim-shell and card state changes are not + tracked. Dpending on the raw APDU sent, pySim-shell may not continue to work as expected if you e.g. select + a different file.""" + + # When sending raw APDUs we access the scc object through _scc member of the card object. It should also be + # noted that the apdu command plays an exceptional role since it is the only card accessing command that + # can be executed without the presence of a runtime state (self.rs) object. However, this also means that + # self.lchan is also not present (see method equip). + data, sw = self.card._scc._tp.send_apdu(opts.APDU) if data: self.poutput("SW: %s, RESP: %s" % (sw, data)) else: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Gerrit-Change-Number: 35161 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2023