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

Change in osmo-iuh[master]: asn1tostruct: don't use f-strings

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30177 ) Change subject: asn1tostruct: don't use f-strings ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/30177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3a19b8a1147532b41d3ed7b802de595302ff8f44 Gerrit-Change-Number: 30177 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Nov 2022 10:07:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-iuh[master]: asn1tostruct: don't use f-strings

by osmith

osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-iuh/+/30177 ) Change subject: asn1tostruct: don't use f-strings ...................................................................... asn1tostruct: don't use f-strings Make the script work with python < 3.6 again by not using f-strings. Fix for: SyntaxError: invalid syntax File "../../git/asn1/utils/asn1tostruct.py", line 94 f" IE {ie}. Found another entry in ies {ie_other}" \ ^ Fixes: 1d19c8e2 ("asn1tostruct: fix defines getting redefined") Change-Id: I3a19b8a1147532b41d3ed7b802de595302ff8f44 --- M asn1/utils/asn1tostruct.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/77/30177/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/30177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3a19b8a1147532b41d3ed7b802de595302ff8f44 Gerrit-Change-Number: 30177 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 7 months

1
0
0 0

Change in osmo-iuh[master]: asn1struct: don't use f-strings

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30177 ) Change subject: asn1struct: don't use f-strings ...................................................................... asn1struct: don't use f-strings Make the script work with python < 3.6 by not using f-strings. Fix for: SyntaxError: invalid syntax File "../../git/asn1/utils/asn1tostruct.py", line 94 f" IE {ie}. Found another entry in ies {ie_other}" \ ^ Fixes: 1d19c8e2 ("asn1tostruct: fix defines getting redefined") Change-Id: I3a19b8a1147532b41d3ed7b802de595302ff8f44 --- M asn1/utils/asn1tostruct.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/77/30177/1 diff --git a/asn1/utils/asn1tostruct.py b/asn1/utils/asn1tostruct.py index d71d87d..9b1c1a1 100755 --- a/asn1/utils/asn1tostruct.py +++ b/asn1/utils/asn1tostruct.py @@ -91,8 +91,8 @@ if ie_other[2] == ie[2]: unique = False assert ie[0] != ie_other[0], "failed to find a unique name for" \ - f" IE {ie}. Found another entry in ies {ie_other}" \ - " that has the same ie[0] value." + " IE {}. Found another entry in ies {}" \ + " that has the same ie[0] value.".format(ie, ie_other) if unique: ret = ie[2] -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/30177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3a19b8a1147532b41d3ed7b802de595302ff8f44 Gerrit-Change-Number: 30177 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Fix copy+paste when logging invalid INS bytes

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30175 ) Change subject: firmware/sniffer: Fix copy+paste when logging invalid INS bytes ...................................................................... firmware/sniffer: Fix copy+paste when logging invalid INS bytes Change-Id: I2679415f1853d4b4a33fca33791fb0bfc6908a1b --- M firmware/libcommon/source/sniffer.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 366ac7e..86dfd3a 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -718,7 +718,7 @@ break; case TPDU_S_INS: if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) { - TRACE_WARNING("invalid CLA 0x%02x\n\r", byte); + TRACE_WARNING("invalid INS 0x%02x\n\r", byte); led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */ change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2679415f1853d4b4a33fca33791fb0bfc6908a1b Gerrit-Change-Number: 30175 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Fix copy+paste when logging invalid INS bytes

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30175 ) Change subject: firmware/sniffer: Fix copy+paste when logging invalid INS bytes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2679415f1853d4b4a33fca33791fb0bfc6908a1b Gerrit-Change-Number: 30175 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 16 Nov 2022 09:08:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Log parity errors, just like overruns and framing e...

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/30176 ) Change subject: firmware/sniffer: Log parity errors, just like overruns and framing errors ...................................................................... firmware/sniffer: Log parity errors, just like overruns and framing errors Reading of code + datasheet showed that we did enable parity checking but never actually checked if the USART has the PARE bit in CSR set. Let's change that. Plus also avoid possible race conditions due to multiple status resets via US_CR_RSTSTA. Let's only reset that once per interrupt handler. TODO: actually do something useful at that point. We currently don't report those to the host, nor do we attempt to recover in any way. The data sheet also doesn't tell us what it actually does in such situations; it appears the character is *not* returned from the USART, so we're missing one byte in the stream at that point. Change-Id: I5f012d86c61a2377d355396e7b95d078952bee7c Related: OS#5464 --- M firmware/libcommon/source/sniffer.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/76/30176/1 diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 86dfd3a..13ef506 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -800,14 +800,14 @@ /* Read channel status register */ uint32_t csr = sniff_usart.base->US_CSR; /* Verify if there was an error */ - if (csr & US_CSR_OVRE) { - TRACE_WARNING("USART overrun error\n\r"); + if (csr & US_CSR_OVRE) + TRACE_ERROR("USART overrun error\n\r"); + if (csr & US_CSR_FRAME) + TRACE_ERROR("USART framing error\n\r"); + if (csr & US_CSR_PARE) + TRACE_ERROR("USART parity error\n\r"); + if (csr & (US_CSR_OVRE|US_CSR_FRAME|US_CSR_PARE)) sniff_usart.base->US_CR |= US_CR_RSTSTA; - } - if (csr & US_CSR_FRAME) { - TRACE_WARNING("USART framing error\n\r"); - sniff_usart.base->US_CR |= US_CR_RSTSTA; - } /* Verify if character has been received */ if (csr & US_CSR_RXRDY) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5f012d86c61a2377d355396e7b95d078952bee7c Gerrit-Change-Number: 30176 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Fix copy+paste when logging invalid INS bytes

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/30175 ) Change subject: firmware/sniffer: Fix copy+paste when logging invalid INS bytes ...................................................................... firmware/sniffer: Fix copy+paste when logging invalid INS bytes Change-Id: I2679415f1853d4b4a33fca33791fb0bfc6908a1b --- M firmware/libcommon/source/sniffer.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/75/30175/1 diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 366ac7e..86dfd3a 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -718,7 +718,7 @@ break; case TPDU_S_INS: if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) { - TRACE_WARNING("invalid CLA 0x%02x\n\r", byte); + TRACE_WARNING("invalid INS 0x%02x\n\r", byte); led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */ change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2679415f1853d4b4a33fca33791fb0bfc6908a1b Gerrit-Change-Number: 30175 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in docker-playground[master]: open5gs-latest: migrate from debian:buster to debian:bullseye

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30161 ) Change subject: open5gs-latest: migrate from debian:buster to debian:bullseye ...................................................................... open5gs-latest: migrate from debian:buster to debian:bullseye Change-Id: Ia09aa712a916686f7220da9a5d2f4a02a8b7b8db --- M open5gs-latest/Dockerfile 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/open5gs-latest/Dockerfile b/open5gs-latest/Dockerfile index e8424de..519701c 100644 --- a/open5gs-latest/Dockerfile +++ b/open5gs-latest/Dockerfile @@ -1,5 +1,5 @@ ARG REGISTRY=docker.io -FROM ${REGISTRY}/debian:buster +FROM ${REGISTRY}/debian:bullseye RUN apt-get update && \ @@ -7,14 +7,14 @@ ca-certificates \ gnupg -ADD https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/D… /tmp/Release.key -ADD https://pgp.mongodb.com/server-4.2.asc /tmp/server-4.2.asc +ADD https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/D… /tmp/Release.key +ADD https://pgp.mongodb.com/server-5.0.asc /tmp/server-5.0.asc -RUN echo "deb http://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/De… ./" \ +RUN echo "deb http://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/De… ./" \ > /etc/apt/sources.list.d/open5gs.list -RUN echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" \ +RUN echo "deb http://repo.mongodb.org/apt/debian bullseye/mongodb-org/5.0 main" \ > /etc/apt/sources.list.d/mongodb-org.list -RUN apt-key add /tmp/Release.key && apt-key add /tmp/server-4.2.asc +RUN apt-key add /tmp/Release.key && apt-key add /tmp/server-5.0.asc RUN apt-get update && \ apt-get install -y \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia09aa712a916686f7220da9a5d2f4a02a8b7b8db Gerrit-Change-Number: 30161 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

2 years, 7 months

1
0
0 0

Change in docker-playground[master]: open5gs-latest: migrate from debian:buster to debian:bullseye

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30161 ) Change subject: open5gs-latest: migrate from debian:buster to debian:bullseye ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia09aa712a916686f7220da9a5d2f4a02a8b7b8db Gerrit-Change-Number: 30161 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 15 Nov 2022 19:37:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-test-ogs: update freeDiameter-smf.conf

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30164 ) Change subject: ttcn3-ggsn-test-ogs: update freeDiameter-smf.conf ...................................................................... ttcn3-ggsn-test-ogs: update freeDiameter-smf.conf Recent open5gs changed location of the TLS key and certificate files: commit 0859dd44530a944076c207c750188572effc2709 Author: Sukchan Lee <acetcom(a)gmail.com> Date: Sat Nov 12 09:37:43 2022 +0900 Follow-up on #1865 Updating paths makes the open5gs-master work, however the -latest still installs these files to '/etc/freeDiameter/'. Let's remove both 'TLS_Cred' and 'TLS_CA' params, we are not using TLS anyway. Change-Id: Iacd7287f217db7a23ceece1d4508ef674b696d35 --- M ttcn3-ggsn-test/ogs/freediameter.conf 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/ttcn3-ggsn-test/ogs/freediameter.conf b/ttcn3-ggsn-test/ogs/freediameter.conf index 60693cd..63d61e5 100644 --- a/ttcn3-ggsn-test/ogs/freediameter.conf +++ b/ttcn3-ggsn-test/ogs/freediameter.conf @@ -106,7 +106,6 @@ # Default : NO DEFAULT #TLS_Cred = "<x509 certif file.PEM>" , "<x509 private key file.PEM>"; #TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key"; -TLS_Cred = "/etc/freeDiameter/smf.cert.pem", "/etc/freeDiameter/smf.key.pem"; # Certificate authority / trust anchors # The file containing the list of trusted Certificate Authorities (PEM list) @@ -114,7 +113,6 @@ # The directive can appear several times to specify several files. # Default : GNUTLS default behavior #TLS_CA = "<file.PEM>"; -TLS_CA = "/etc/freeDiameter/cacert.pem"; # Certificate Revocation List file # The information about revoked certificates. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iacd7287f217db7a23ceece1d4508ef674b696d35 Gerrit-Change-Number: 30164 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022