Attention is currently required from: fixeria, 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 1: Verified+1
(4 comments)
File contrib/jenkins-build-osmo-bts.sh:
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/8cfb5cd3_a235d…
PS1, Line 7: (git_url=https://gitea.osmocom.org/cellular-infrastructure
> sounds like you want to change the default git_url in have_repo or jenkins-build-common. […]
It needs to be this url for octphy-2g-headers only (not on gerrit), everything else should be retrieved from gerrit.osmocom.org (as there is no sync delay). I only want to set git_url for this one call to have_repo, hence it is in a subshell.
Something similar is done already in contrib/jenkins-build-osmo-bts-oc2g.sh, contrib/jenkins-build-osmo-pcu-oc2g.sh, contrib/jenkins-build-osmo-trx.sh. I can use the same exact syntax if you prefer.
This was not necessary before, as octphy-2g-headers was reachable from git.osmocom.org too.
File src/osmo_gsm_tester/obj/osmo_vty.py:
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/bcf0f78a_7cd9b…
PS1, Line 83: # (copied from osmo-python-tests/osmopy/osmo_interact/vty.py)
> osmo-python-tests. […]
Done
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/0b4ecfaa_f1abd…
PS1, Line 162: # (copied from osmo-python-tests/osmopy/osmo_interact/vty.py)
> osmo-python-tests. […]
Done
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/638b1896_d1cbf…
PS1, Line 212: # (copied from osmo-python-tests/osmopy/osmo_interact/vty.py)
> osmo-python-tests. […]
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: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 29 Nov 2023 13:22:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria, osmith.
Hello Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by osmith
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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/57/35157/2
--
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: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side
......................................................................
mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side
In general, the HNBs end up binding its IuUP/RTP streams to the same IP
address used for Iuh signalling.
When receiving a RAB-Ass-Req from CN, osmo-hnbgw creates an endpoint in
its co-located MGW and creates 2 MGCP conns on it, one facing the RAN
side and one facing the CN side. At that point, the remote CN IuUP IP address
is known (was include din the received RAB-Ass-Req), but the RAN one is
not yet known. Hence, the CRCX on the RAN-side conn contained no remote
IP address, which means MGW has to blindly guess a good local IP address
if "ip probing" is enabled.
As a result, when RAB-Ass-Resp comes back from the hNodeB containing the
allocated remote IuUP IP address and MGW is updated through MGCP MDCX,
it may happen that MGW rebinds to a better fitting local IP address and
returns it in MDCX. This has several downfalls:
1- We don't yet support updating the hNodeB about the changed IP address
(see mgw_fsm_mdcx_hnb). For that, we'd need to send a RAB-Modify-Req+Resp.
2- Even if we supported it, in the general case we'd be delaying call
establishment because an extra roundtrip is needed to update
RAB-Modify-Req+Resp.
In general, the HNBs end up binding its IuUP/RTP streams to the same IP
address used for the Iuh signalling. Hence, use this assumption to
announce the Iuh IP address as a remote IuUP IP address when
transmitting the MGCP CRCX at the RAN-side conn to the MGW. This way
the MGW can potentially select a proper local IuUP IP address from the
start, so no RAB-Modify-Req is required later on.
The logic to transmit RAB-Modify-Req is left unimplemented in this
commit and is left as a later improvement.
Related: SYS#6657
Change-Id: Icf43e3a1cde809d844f17ef2d0600efe64bc3dfe
---
M src/osmo-hnbgw/mgw_fsm.c
1 file changed, 56 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/53/35153/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Icf43e3a1cde809d844f17ef2d0600efe64bc3dfe
Gerrit-Change-Number: 35153
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email )
Change subject: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Icf43e3a1cde809d844f17ef2d0600efe64bc3dfe
Gerrit-Change-Number: 35153
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Wed, 29 Nov 2023 13:20:32 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: fixeria, jolly, laforge, pespin.
Hello Jenkins Builder, fixeria, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Code-Review+2 by pespin
The change is no longer submittable: Code-Review is unsatisfied now.
Change subject: Add flag to enable RTS based polling
......................................................................
Add flag to enable RTS based polling
RTS based polling in LAPDm code is disabled by default. Make libosmogsm
stay compatible with existing applications that do not use RTS based
polling.
This patch fixes the issue that LAPDM_ENT_F_POLLING_ONLY did enable RTS
based polling too, which breaks existing applications like older
versions of osmo-bts.
Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a
---
M include/osmocom/gsm/lapdm.h
M src/gsm/lapdm.c
2 files changed, 23 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/35160/2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a
Gerrit-Change-Number: 35160
Gerrit-PatchSet: 2
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
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: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: dexter, laforge, neels.
Hello Jenkins Builder, dexter, laforge, neels,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0
......................................................................
mgcp-cli: Transmit remote IP addr in CRCX if known and port=0
A client may know the IP address during CRCX but not yet the port, or it
may simply want to hint an initial IP address so that the MGW can better
guess when allocating a local IP address.
Related: SYS#6657
Change-Id: I30165dbac5e484011d0acf46af36f105954a501d
---
M src/libosmo-mgcp-client/mgcp_client.c
M src/libosmo-mgcp-client/mgcp_client_fsm.c
2 files changed, 89 insertions(+), 62 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/52/35152/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I30165dbac5e484011d0acf46af36f105954a501d
Gerrit-Change-Number: 35152
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: dexter, fixeria.
laforge has posted comments on 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.
......................................................................
Patch Set 2:
(1 comment)
File pySim-shell.py:
https://gerrit.osmocom.org/c/pysim/+/35161/comment/c9711334_3094391a
PS2, Line 244: 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 runt
I think the improtant bit for the user is not how we access the scc object. The important bit is that the 'apdu' command bypasses the currentyl selected logical channel. It might be a good idea to ad this to the docstr of the do_apdu method, so it ends up in the user manual.
--
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: 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-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 29 Nov 2023 13:08:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: dexter, fixeria.
pespin 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:
In general I'd prefer having v12 (newest version) configured everywhere and sed it to 10 or 11 on the specific cases, otherwise we start to have a bit of a mess here with so many versions.
--
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: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 29 Nov 2023 12:43:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: dexter, fixeria.
pespin 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: -Code-Review
(1 comment)
File src/gprs_rlcmac_sched.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/35151/comment/37d05e16_c8ed98a1
PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing
> Oh, I overlooked the `skip_idle && trx != 0` part in the old code (left side). […]
@vyanitskiy@sysmocom.de bear in mind the "skip_idle && trx != 0" was only applied inside the #ifdef DIRECT_PHY, so it was only really applied for sysmobts,lc15,oc2g. And that was done in order to make it send stuff on C0 because those osmo-bts lowerlayers are not filling the block otherwise. For trx!=0 it's fine sending empty block to those osmo-bts flavours, because it's fine if they end up transmitting nothing on those TRX.
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?
With the current version of the patch, it will still transmit dummy blocks on trx!=0, and that's not what we want. We want to transmit nothing on trx!=0.
So the could should be left as it was and this patch dropped? Maybe we can reuse this patch to rename bts->gen_idle_blocks to be "gen_idle_block_C0".
--
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: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 29 Nov 2023 12:32:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/35161?usp=email
to look at the new patch set (#2).
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, 26 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/35161/2
--
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: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
dexter has uploaded this change for review. ( 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
---
M pySim-shell.py
1 file changed, 25 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/35161/1
diff --git a/pySim-shell.py b/pySim-shell.py
index 4e08eb7..95192ce 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -240,7 +240,12 @@
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)
+
+ # 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: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria, jolly, pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email )
Change subject: Add flag to enable RTS bases polling
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
this fixes a regression in current libosmocore master affecting osmo-bts. We should get it merged fast.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a
Gerrit-Change-Number: 35160
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
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: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 29 Nov 2023 12:07:37 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: jolly.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email )
Change subject: Add flag to enable RTS bases polling
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a
Gerrit-Change-Number: 35160
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Comment-Date: Wed, 29 Nov 2023 12:06:57 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email )
Change subject: Add flag to enable RTS bases polling
......................................................................
Add flag to enable RTS bases polling
RTS based polling in LAPDm code is disabled by default. Make libosmogsm
stay compatible with existing applications that do not use RTS based
polling.
This patch fixes the issue that LAPDM_ENT_F_POLLING_ONLY did enable RTS
based polling too, which breaks existing applications like older
versions of osmo-bts.
Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a
---
M include/osmocom/gsm/lapdm.h
M src/gsm/lapdm.c
2 files changed, 23 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/35160/1
diff --git a/include/osmocom/gsm/lapdm.h b/include/osmocom/gsm/lapdm.h
index 42ebbce..6812102 100644
--- a/include/osmocom/gsm/lapdm.h
+++ b/include/osmocom/gsm/lapdm.h
@@ -51,6 +51,7 @@
#define LAPDM_ENT_F_EMPTY_FRAME 0x0001
#define LAPDM_ENT_F_POLLING_ONLY 0x0002
#define LAPDM_ENT_F_DROP_2ND_REJ 0x0004
+#define LAPDM_ENT_F_RTS 0x0008
/*! a LAPDm Entity */
struct lapdm_entity {
diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c
index fb892d2..1fc986d 100644
--- a/src/gsm/lapdm.c
+++ b/src/gsm/lapdm.c
@@ -363,8 +363,8 @@
if (le->tx_pending || le->flags & LAPDM_ENT_F_POLLING_ONLY) {
struct msgb *old_msg;
- /* In 'Polling only' mode there can be only one message. */
- if (le->flags & LAPDM_ENT_F_POLLING_ONLY) {
+ /* In 'RTS' mode there can be only one message. */
+ if (le->flags & LAPDM_ENT_F_RTS) {
/* Overwrite existing message by removing it first. */
if ((old_msg = msgb_dequeue(&dl->dl.tx_queue))) {
msgb_free(old_msg);
@@ -424,8 +424,8 @@
{
struct msgb *msg;
- /* Call RTS function of LAPD, to poll next frame. */
- if (dl->entity->flags & LAPDM_ENT_F_POLLING_ONLY) {
+ /* Call RTS function of LAPD, to queue next frame. */
+ if (dl->entity->flags & LAPDM_ENT_F_RTS) {
struct lapd_msg_ctx lctx;
int rc;
@@ -1635,7 +1635,7 @@
le->flags = flags;
/* Set flags at LAPD. */
- if (le->flags & LAPDM_ENT_F_POLLING_ONLY)
+ if (le->flags & LAPDM_ENT_F_RTS)
dl_flags |= LAPD_F_RTS;
if (le->flags & LAPDM_ENT_F_DROP_2ND_REJ)
dl_flags |= LAPD_F_DROP_2ND_REJ;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a
Gerrit-Change-Number: 35160
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-MessageType: newchange
Attention is currently required from: jolly.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email )
Change subject: Use polling based LAPDm with frame numbers
......................................................................
Patch Set 6: Code-Review-1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ic6d7902b13cf491daaa8752db78f9875387aeffd
Gerrit-Change-Number: 35007
Gerrit-PatchSet: 6
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Comment-Date: Wed, 29 Nov 2023 10:18:22 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: jolly.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email )
Change subject: Use polling based LAPDm with frame numbers
......................................................................
Patch Set 6:
(1 comment)
Patchset:
PS6:
let's wait a bit before merging this to make sure osmo-bts works still while using the old timer-based approach, after all the LAPD/LAPDm changes to libosmocore/libosmgsm
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ic6d7902b13cf491daaa8752db78f9875387aeffd
Gerrit-Change-Number: 35007
Gerrit-PatchSet: 6
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Comment-Date: Wed, 29 Nov 2023 10:18:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: fixeria, jolly, laforge.
Hello Jenkins Builder, fixeria, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email
to look at the new patch set (#5).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload
......................................................................
LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload
A special flag is used to keep track on the establishment of the data
link. If it is being established (not re-established) without L3
payload, it is rejected by a release request inside BTS.
Related: OS#5971
Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c
---
M include/osmo-bts/lchan.h
M src/common/lchan.c
M src/common/rsl.c
3 files changed, 36 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/35082/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c
Gerrit-Change-Number: 35082
Gerrit-PatchSet: 5
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email )
Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
......................................................................
ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
Unfortunately we had to revert [1] because it worked for current master
but not for latest. The mistake here was to change the PCUIF version
number in PCU_Tests.cfg to PCUIF v12. This is indeed the correct version
for current master, but latest still uses v11. Also the change we made in
jenkins-sns only affected 2023q1 builds, it does not affect latest. This
is the reason why the previous patch broke latest.
This follow up patch now copies the approach we already successfully use
with the normal ttcn3-pcu-test / ttcn3-pcu-test-latest. (see also
jenkins.sh)
[1] I0b37f01f4c7bb829053231339e39ab734f4c8cbc
Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f
Related: OS#6275
---
M ttcn3-pcu-test/jenkins-sns.sh
1 file changed, 32 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/59/35159/1
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index 50027d3..06f833e 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -13,6 +13,15 @@
if image_suffix_is_2023q1; then
sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1
fi
+
+ # This changes the PCUIF module parameter of the TTCN3 testsuite when the testsuite is
+ # executed for current master. For latest the PCUIF module parameter must stay at v.11
+ # since in osmo-pcu-latest PCUIF v.12 is not yet supported. After the next release, PCUIF
+ # v.12 will be supported in osmo-pcu-latest as well and this function, including the
+ # PCUIF_Types.mp_pcuif_version setting in the configuration files can be removed.
+ if image_suffix_is_master; then
+ sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 12/g' $1
+ fi
}
mkdir $VOL_BASE_DIR/pcu-tester
--
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-MessageType: newchange
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 1: Verified+1
(1 comment)
Patchset:
PS1:
I've verified that this fixes the url related failures in various osmo-gsm-tester jenkins jobs. gerrit verification is known to be broken: https://osmocom.org/issues/6149
--
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: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 29 Nov 2023 09:55:06 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/57/35157/1
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..f917070 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/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/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/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: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: jolly.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35156?usp=email )
Change subject: Fix union abis_rsl_chan_nr and abis_rsl_link_id
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Patchset:
PS1:
this is *very* interesting. I would have assumed that an union of two uint8_t is again just maps the uint8_t together - and not the individual bits in the bit-fields.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35156?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I5ef5aa62be8310da4ebe9ea73ebbedcbcc2ba49c
Gerrit-Change-Number: 35156
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Comment-Date: Wed, 29 Nov 2023 09:44:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
dexter has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35136?usp=email )
Change subject: ttcn3-pcu-test/sns: fix PCUIF version number
......................................................................
ttcn3-pcu-test/sns: fix PCUIF version number
The current master of OsmoPCU is now using PCUIF version number 12.
However, the configuration file of the the SNS tests still sets it to
11.
Related: OS#6275
Change-Id: I0b37f01f4c7bb829053231339e39ab734f4c8cbc
---
M ttcn3-pcu-test/jenkins-sns.sh
M ttcn3-pcu-test/sns/PCU_Tests.cfg
2 files changed, 16 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index 50027d3..d63229b 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -11,7 +11,7 @@
set_pcuif_version() {
if image_suffix_is_2023q1; then
- sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1
+ sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1
fi
}
diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg
index d62f52d..2b11462 100644
--- a/ttcn3-pcu-test/sns/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg
@@ -59,7 +59,7 @@
}
}
}
-PCUIF_Types.mp_pcuif_version := 11
+PCUIF_Types.mp_pcuif_version := 12
[MAIN_CONTROLLER]
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35136?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: I0b37f01f4c7bb829053231339e39ab734f4c8cbc
Gerrit-Change-Number: 35136
Gerrit-PatchSet: 2
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: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: jolly.
falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email )
Change subject: Transmit invalid AMR speech blocks instead of dummy FACCH
......................................................................
Patch Set 3:
(4 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/a16f6572_4bd42192
PS3, Line 17: playload
Did you perhaps mean "payload"?
Patchset:
PS3:
Aside from typos/grammar, I would give a CR+2 on the code itself at this point.
File src/osmo-bts-trx/sched_lchan_tchf.c:
https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/63b99f1d_eed0cec1
PS3, Line 541: with
This extraneous use of "with" here is ungrammatical. Simply removing the extra "with" will produce correct English grammar.
File src/osmo-bts-trx/sched_lchan_tchh.c:
https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/16a07373_c32e788d
PS3, Line 456: with
Same as above,
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I056f379715c91ad968f198e112d363a9009dc1c3
Gerrit-Change-Number: 35132
Gerrit-PatchSet: 3
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Comment-Date: Wed, 29 Nov 2023 00:07:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
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/fe7bd69a_25c49d21
PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing
> This is how it works: […]
Oh, I overlooked the `skip_idle && trx != 0` part in the old code (left side). I don't remember why we had this constraint, but could you explain why are you removing it?
With this constraint we only have power saving on Cn (n > 0). On the BCCH carrier we always transmit PDCH blocks at full power, no matter if there are active TBFs or not, because we always get DATA.req for the C0.
By removing this constraint in your patch you're making osmo-bts-trx send Dummy Bursts (carrying no info at all) instead of Normal Bursts. Like I explained in my previous comment.
--
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: Tue, 28 Nov 2023 22:38:55 +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: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
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/45e2904c_d3c2aa5a
PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing
> IIRC you can only decrease a given number of dBm at specific points in time, it's specified somewher […]
This is how it works:
* on C0 (the BCCH carrier): osmo-bts-trx transmits Dummy Bursts (not Normal Bursts), which can be transmitted at a lower power level (2 dB or even 4 dB less relative to the full power, IIRC) in the BCCH carrier power saving mode;
* on Cn (n > 0): osmo-bts-trx simply transmits nothing and thus saves energy.
It's actually required by 3GPP specs. to maintain a continuous ("gapless") transmission on the BCCH carrier (C0), so that a phone doing full power scan would not overlook it.
It would have been more logical (and elegant, IMO) to offload the power saving logic to the BTS completely, instead of making such a decision in osmo-pcu. There would be no need to maintain a list of the power saving capable BTS models here, and add lengthy comments explaining what the BTS is supposed to do.
My initial idea/proposal was to simply flag dummy blocks generated in the absence of active TBFs, so that the BTS could decide what to do with such a DATA.req on its own. Unfortunately, I was not able to defend this proposal back then because I was on sick leave. Seeing how much effort/time it's taking to fix OS#6191, I think we should consider getting back to this idea at some point...
--
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: Tue, 28 Nov 2023 22:30:23 +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
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email )
Change subject: libosmosim: Support Microsoft smart card discovery process
......................................................................
libosmosim: Support Microsoft smart card discovery process
Our class/instruction tables (used mainly by simtrace cardem host
software) only contain support for those instructions permitted
in the related card specification.
Microsoft blindly tries CLA=0xCA with INS=0x00 which is not somethin
that the GSM SIM, ETSI UICC or 3GPP USIM specs specify, and which
hence results in log output like this:
DLINP DEBUG [0] <= osmo_st2_cardem_request_sw_tx(sw=6a88)
DLGLOBAL INFO => DATA: flags=0x01 (HDR ), 00 ca 7f 68 00
DLGLOBAL ERROR Unknown APDU case 0
DLGLOBAL FATAL Failed to recognize APDU, terminating
Let's adjust to microsoft and *always* support their instructions
no matter which osim_cla_ins_card_profile was used.
Special thanks to Eric Wild for pointing me to this unexpected
behaviour of PC/SC on modern Windows.
Change-Id: I424964c0afab643e6a5d7824d91c2c86b0d3f25b
Related: SYS#6617
---
M src/sim/class_tables.c
1 file changed, 47 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/src/sim/class_tables.c b/src/sim/class_tables.c
index 6d05ede..29c1e40 100644
--- a/src/sim/class_tables.c
+++ b/src/sim/class_tables.c
@@ -350,6 +350,13 @@
[0x88] = 4, /* AUTHENTICATE */
};
+/* https://learn.microsoft.com/en-us/windows-hardware/drivers/smartcard/discov… */
+static const uint8_t microsoft_discovery_ins_tbl[256] = {
+ [0xA4] = 4, /* SELECT FILE */
+ [0xCA] = 2, /* GET DATA */
+ [0xC0] = 2, /* GET RESPONSE */
+};
+
int osim_determine_apdu_case(const struct osim_cla_ins_card_profile *prof,
const uint8_t *hdr)
{
@@ -374,5 +381,16 @@
return rc;
}
}
+ /* special handling for Microsoft who insists to use INS=0xCA in CLA=0x00 which is not
+ * really part of GSM SIM, ETSI UICC or 3GPP USIM specifications, but only ISO7816. Rather than adding
+ * it to each and every card profile, let's add the instructions listed at
+ * https://learn.microsoft.com/en-us/windows-hardware/drivers/smartcard/discov… explicitly
+ * here. They will only be used in case no more specific match was found in the actual profile above. */
+ if (cla == 0x00) {
+ rc = microsoft_discovery_ins_tbl[ins];
+ if (rc)
+ return rc;
+ }
+
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I424964c0afab643e6a5d7824d91c2c86b0d3f25b
Gerrit-Change-Number: 35154
Gerrit-PatchSet: 4
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Hoernchen <ewild(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
Attention is currently required from: dexter.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email )
Change subject: libosmosim: Support Microsoft smart card discovery process
......................................................................
Patch Set 4:
(1 comment)
Patchset:
PS4:
> It would probably be useful to add the msdn links to the commit message that explain what MS does?
the links are in the code comments, not sure we need them also in the commit message?
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I424964c0afab643e6a5d7824d91c2c86b0d3f25b
Gerrit-Change-Number: 35154
Gerrit-PatchSet: 4
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 28 Nov 2023 22:24:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria, laforge.
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email )
Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode
......................................................................
Patch Set 6:
(2 comments)
File src/common/l1sap.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12698):
https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/21244cd8_c8b32077
PS6, Line 1879: } else {
else is not generally useful after a break or return
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12698):
https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/8f7b8427_f0815275
PS6, Line 1893: } else {
else is not generally useful after a break or return
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219
Gerrit-Change-Number: 35124
Gerrit-PatchSet: 6
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 28 Nov 2023 22:12:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: fixeria, laforge.
Hello Jenkins Builder, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email
to look at the new patch set (#6).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode
......................................................................
Add GSMTAP encapsulation of RLP frames in CSD NT mode
In CSD (Circuit Switched Data) NT (Non-Transparent) mode, there
are RLP (Radio Link Protocol) frames inside the modified V.110.
wireshark alrady has a dissector for this, and we've introduced
a GSMTAP type for RLP some time ago. So with this patch, we now
generate such GSMTAP RLP frames.
Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219
---
M include/osmo-bts/bts.h
M include/osmo-bts/lchan.h
M src/common/l1sap.c
M src/common/vty.c
M tests/osmo-bts.vty
5 files changed, 124 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/35124/6
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219
Gerrit-Change-Number: 35124
Gerrit-PatchSet: 6
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: dexter, laforge.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email )
Change subject: libosmosim: Support Microsoft smart card discovery process
......................................................................
Patch Set 4:
(1 comment)
Patchset:
PS4:
It would probably be useful to add the msdn links to the commit message that explain what MS does?
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I424964c0afab643e6a5d7824d91c2c86b0d3f25b
Gerrit-Change-Number: 35154
Gerrit-PatchSet: 4
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 28 Nov 2023 22:07:23 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: fixeria, laforge.
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email )
Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode
......................................................................
Patch Set 5:
(2 comments)
File src/common/l1sap.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12695):
https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/cad0efa7_87105560
PS5, Line 1879: } else {
else is not generally useful after a break or return
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12695):
https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/5bdef780_58ff2f99
PS5, Line 1893: } else {
else is not generally useful after a break or return
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219
Gerrit-Change-Number: 35124
Gerrit-PatchSet: 5
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 28 Nov 2023 22:00:45 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment