January 2024 - gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: pySim.utils: Support datetime.datetime in JsonEncoder
by laforge 22 Jan '24

22 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35614?usp=email ) Change subject: pySim.utils: Support datetime.datetime in JsonEncoder ...................................................................... pySim.utils: Support datetime.datetime in JsonEncoder Change-Id: I6223475cec8eb45c6fc4278109ad9dd1cb557800 --- M pySim/utils.py 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pySim/utils.py b/pySim/utils.py index 581abf2..cf95dab 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -6,6 +6,7 @@ import json import abc import string +import datetime from io import BytesIO from typing import Optional, List, Dict, Any, Tuple, NewType @@ -973,6 +974,8 @@ def default(self, o): if isinstance(o, BytesIO) or isinstance(o, bytes) or isinstance(o, bytearray): return b2h(o) + elif isinstance(o, datetime.datetime): + return o.isoformat() return json.JSONEncoder.default(self, o) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35614?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: I6223475cec8eb45c6fc4278109ad9dd1cb557800 Gerrit-Change-Number: 35614 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: pySim.utils: Support datetime.datetime in JsonEncoder
by laforge 22 Jan '24

22 Jan '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35614?usp=email ) Change subject: pySim.utils: Support datetime.datetime in JsonEncoder ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35614?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: I6223475cec8eb45c6fc4278109ad9dd1cb557800 Gerrit-Change-Number: 35614 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 22 Jan 2024 16:51:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: osmo-smdpp: Actually dump Rx/Tx JSON in JSON format and not as python...
by laforge 22 Jan '24

22 Jan '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35613?usp=email ) Change subject: osmo-smdpp: Actually dump Rx/Tx JSON in JSON format and not as python dict ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35613?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: Ieea3fd2d0f0239acfa6a5c4cfdbfd558d1a3e0ea Gerrit-Change-Number: 35613 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 22 Jan 2024 16:51:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: osmo-smdpp: Handle case where client sends empty list of Pki Cert IDs
by laforge 22 Jan '24

22 Jan '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35650?usp=email ) Change subject: osmo-smdpp: Handle case where client sends empty list of Pki Cert IDs ...................................................................... osmo-smdpp: Handle case where client sends empty list of Pki Cert IDs In this case we don't want to run in an "undefined variable" exception, so let's initialize ci_cert to None. Change-Id: I4541d11dc6f660b59a1ec5225428ddde8401817d --- M osmo-smdpp.py 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/50/35650/1 diff --git a/osmo-smdpp.py b/osmo-smdpp.py index 2d1cd66..6f437e6 100755 --- a/osmo-smdpp.py +++ b/osmo-smdpp.py @@ -215,6 +215,7 @@ if 'euiccCiPKIdListForSigningV3' in euiccInfo1: pkid_list = pkid_list + euiccInfo1['euiccCiPKIdListForSigningV3'] # verify it supports one of the keys indicated by euiccCiPKIdListForSigning + ci_cert = None for x in pkid_list: ci_cert = self.ci_get_cert_for_pkid(x) if ci_cert: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35650?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: I4541d11dc6f660b59a1ec5225428ddde8401817d Gerrit-Change-Number: 35650 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo_gsup[master]: cosmetic: Fix trailing whitespace
by pespin 22 Jan '24

22 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/35648?usp=email ) Change subject: cosmetic: Fix trailing whitespace ...................................................................... cosmetic: Fix trailing whitespace Change-Id: I9c894440818040151015283b0df7e1646110f5d5 --- M include/gsup_protocol.hrl M src/gsup_protocol.erl 2 files changed, 15 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/gsup_protocol.hrl b/include/gsup_protocol.hrl index 2e9c9d3..5db534e 100644 --- a/include/gsup_protocol.hrl +++ b/include/gsup_protocol.hrl @@ -2,7 +2,7 @@ % License, v. 2.0. If a copy of the MPL was not distributed with this % file, You can obtain one at https://mozilla.org/MPL/2.0/. % (C) 2019 Andrey Velikiy <agreat22(a)gmail.com> -% (C) 2019 Fairwaves (edited) +% (C) 2019 Fairwaves (edited) % (C) 2019 Harald Welte <laforge(a)gnumonks.org> -ifndef(GSUP_PROTOCOL). @@ -85,7 +85,7 @@ pdp_info_complete => true, pdp_info_list => ['GSUPPdpInfo'()], cancellation_type => integer(), - freeze_p_tmsi => true, + freeze_p_tmsi => true, msisdn => binary(), hlr_number => binary(), pdp_context_id => [integer()], diff --git a/src/gsup_protocol.erl b/src/gsup_protocol.erl index 5dd4bda..41e7dd6 100644 --- a/src/gsup_protocol.erl +++ b/src/gsup_protocol.erl @@ -2,7 +2,7 @@ % License, v. 2.0. If a copy of the MPL was not distributed with this % file, You can obtain one at https://mozilla.org/MPL/2.0/. % (C) 2019 Andrey Velikiy <agreat22(a)gmail.com> -% (C) 2019 Fairwaves (edited) +% (C) 2019 Fairwaves (edited) -module(gsup_protocol). @@ -34,7 +34,7 @@ true -> GSUPMessage; false -> error({mandatory_ie_missing, MsgTypeAtom, Mandatory -- maps:keys(GSUPMessage)}) end; - _ -> + _ -> error({unknown_gsup_msg_type, MsgType}) end. @@ -299,13 +299,13 @@ Possible = Mandatory ++ maps:get(optional, Map, []) ++ ?OPTIONAL_DEFAULT, case {maps:size(maps:with(Mandatory, GSUPMessage)) == length(Mandatory), maps:size(maps:without(Possible, GSUPMessage)) == 0} of - {true, true} -> + {true, true} -> Tail = encode_ie(GSUPMessage, <<>>), <<MsgType, Tail/binary>>; {false, _} -> error({mandatory_ie_missing, MsgTypeAtom, Mandatory -- maps:keys(GSUPMessage)}); {_, false} -> error({ie_not_expected, MsgTypeAtom, maps:keys(GSUPMessage) -- Possible}) end; - _ -> + _ -> error({unknown_gsup_msg_type, MsgType}) end. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/35648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I9c894440818040151015283b0df7e1646110f5d5 Gerrit-Change-Number: 35648 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo_gsup[master]: cosmetic: Fix trailing whitespace
by pespin 22 Jan '24

22 Jan '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/35648?usp=email ) Change subject: cosmetic: Fix trailing whitespace ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/35648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I9c894440818040151015283b0df7e1646110f5d5 Gerrit-Change-Number: 35648 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Jan 2024 16:49:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-manuals[master]: gsup.adoc: Fix typo
by pespin 22 Jan '24

22 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35649?usp=email ) Change subject: gsup.adoc: Fix typo ...................................................................... gsup.adoc: Fix typo Change-Id: I1e7be8eb34a465ac6b35fa61544087668311338a --- M common/chapters/gsup.adoc 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index eeada52..8be4bae 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -1419,7 +1419,7 @@ is 3 (three) octets it is assumed that these are octets 3-5 of the TS 3GPP TS 24.008 Quality of Service Octets. If it is more than three then then it is assumed that the first octet is the Allocation/Retention -Priority and the reset are encoded as octets 3-N of 24.008. +Priority and the rest are encoded as octets 3-N of 24.008. [packetdiag] ---- -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I1e7be8eb34a465ac6b35fa61544087668311338a Gerrit-Change-Number: 35649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-manuals[master]: gsup.adoc: Fix typo
by fixeria 22 Jan '24

22 Jan '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35649?usp=email ) Change subject: gsup.adoc: Fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I1e7be8eb34a465ac6b35fa61544087668311338a Gerrit-Change-Number: 35649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Jan 2024 16:09:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-epdg: Run osmo-epdg with CAP_NET_ADMIN
by pespin 22 Jan '24

22 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35607?usp=email ) Change subject: ttcn3-epdg: Run osmo-epdg with CAP_NET_ADMIN ...................................................................... ttcn3-epdg: Run osmo-epdg with CAP_NET_ADMIN This will be needed since soon osmo-epdg will start creating tunnel devices througth gtp_u_kmod, which requires CAP_NET_ADMIN, plus it will need probably need to set up local IP addresses. Change-Id: I48eea0e8d7969cc0a3ad2ed08f696decf064c474 --- M ttcn3-epdg-test/jenkins.sh 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/ttcn3-epdg-test/jenkins.sh b/ttcn3-epdg-test/jenkins.sh index df445fc..eb596dc 100755 --- a/ttcn3-epdg-test/jenkins.sh +++ b/ttcn3-epdg-test/jenkins.sh @@ -22,7 +22,10 @@ echo Starting container with osmo-epdg docker run --rm \ $(docker_network_params $SUBNET 20) \ + -u root \ --ulimit core=-1 \ + --cap-add=NET_ADMIN \ + --device /dev/net/tun:/dev/net/tun \ -v $VOL_BASE_DIR/epdg:/data \ --name ${BUILD_TAG}-epdg -d \ $DOCKER_ARGS \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35607?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: I48eea0e8d7969cc0a3ad2ed08f696decf064c474 Gerrit-Change-Number: 35607 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-epdg: Run osmo-epdg with CAP_NET_ADMIN
by osmith 22 Jan '24

22 Jan '24

Attention is currently required from: laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35607?usp=email ) Change subject: ttcn3-epdg: Run osmo-epdg with CAP_NET_ADMIN ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35607?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: I48eea0e8d7969cc0a3ad2ed08f696decf064c474 Gerrit-Change-Number: 35607 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Jan 2024 15:48:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0