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

Change in osmo-gbproxy[master]: docs: usermanual: reorder gb/ns2 chapter to keep all ns2 part together

by laforge

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27305 ) Change subject: docs: usermanual: reorder gb/ns2 chapter to keep all ns2 part together ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3bc1c4de090a073cf1b1a6fe852f17857754beaf Gerrit-Change-Number: 27305 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 01 Mar 2022 16:34:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in libosmocore[master]: add osmo_sockaddr_set_port()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27263 ) Change subject: add osmo_sockaddr_set_port() ...................................................................... add osmo_sockaddr_set_port() Do it like osmo_sockaddr_port() in reverse. Related: SYS#5599 Change-Id: I9512e44c3203daebb3fe3435fceef167613c1a73 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 18 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index fffc25c..183220d 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -96,6 +96,7 @@ const char *osmo_sockaddr_ntop(const struct sockaddr *sa, char *dst); uint16_t osmo_sockaddr_port(const struct sockaddr *sa); +void osmo_sockaddr_set_port(struct sockaddr *sa, uint16_t port); int osmo_sock_unix_init(uint16_t type, uint8_t proto, const char *socket_path, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index 80cba17..4605db4 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1254,6 +1254,23 @@ return 0; } +/*! Set sockaddr port content (to network byte order). + * \param[out] sa sockaddr to set the port of. + * \param[in] port port nr to set. + */ +void osmo_sockaddr_set_port(struct sockaddr *sa, uint16_t port) +{ + struct osmo_sockaddr *osa = (struct osmo_sockaddr *)sa; + switch (osa->u.sa.sa_family) { + case AF_INET6: + osa->u.sin6.sin6_port = htons(port); + return; + case AF_INET: + osa->u.sin.sin_port = htons(port); + return; + } +} + /*! Initialize a unix domain socket (including bind/connect) * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM * \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9512e44c3203daebb3fe3435fceef167613c1a73 Gerrit-Change-Number: 27263 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in pysim[master]: Initial support for GlobalPlatform

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27271 ) Change subject: Initial support for GlobalPlatform ...................................................................... Initial support for GlobalPlatform One can now select the Issuer Security Domain (hard-coded to a000000003000000) and issue get_data requests. FCI and other TLV objects are dcoded, e.g. pySIM-shell (MF)> select ADF.ISD { "application_id": "a000000003000000", "proprietary_data": { "maximum_length_of_data_field_in_command_message": 255 } } pySIM-shell (MF/ADF.ISD)> get_data CardData { "card_data": [ { "card_recognition_data": [ { "object_identifier": "2a864886fc6b01" }, { "card_management_type_and_version": [ { "object_identifier": "2a864886fc6b02020101" } ] }, { "card_identification_scheme": [ { "object_identifier": "2a864886fc6b03" } ] }, { "secure_channel_protocol_of_isd": [ { "object_identifier": "2a864886fc6b040215" } ] } ] } ] } Change-Id: If11267d45ab7aa371eea8c143abd9320c32b54d0 --- M pySim-shell.py M pySim/commands.py A pySim/global_platform.py 3 files changed, 262 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-shell.py b/pySim-shell.py index 0753b10..06977f0 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -53,6 +53,7 @@ from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM from pySim.ara_m import CardApplicationARAM +from pySim.global_platform import CardApplicationISD from pySim.gsm_r import DF_EIRENE # we need to import this module so that the SysmocomSJA2 sub-class of @@ -103,6 +104,7 @@ profile.add_application(CardApplicationUSIM()) profile.add_application(CardApplicationISIM()) profile.add_application(CardApplicationARAM()) + profile.add_application(CardApplicationISD()) # Create runtime state with card profile rs = RuntimeState(card, profile) diff --git a/pySim/commands.py b/pySim/commands.py index df23393..a959851 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -621,3 +621,7 @@ negotiated_duration_secs = decode_duration(data[:4]) resume_token = data[4:] return (negotiated_duration_secs, resume_token, sw) + + def get_data(self, tag: int, cla: int = 0x00): + data, sw = self._tp.send_apdu('%02xca%04x00' % (cla, tag)) + return (data, sw) diff --git a/pySim/global_platform.py b/pySim/global_platform.py new file mode 100644 index 0000000..1c31ddc --- /dev/null +++ b/pySim/global_platform.py @@ -0,0 +1,256 @@ +# coding=utf-8 +"""Partial Support for GlobalPLatform Card Spec (currently 2.1.1) + +(C) 2022 by Harald Welte <laforge(a)osmocom.org> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +""" + +from typing import Optional, List, Dict, Tuple +from construct import Optional as COptional +from construct import * +from bidict import bidict +from pySim.construct import * +from pySim.utils import * +from pySim.filesystem import * +from pySim.tlv import * +from pySim.profile import CardProfile + +sw_table = { + 'Warnings': { + '6200': 'Logical Channel already closed', + '6283': 'Card Life Cycle State is CARD_LOCKED', + '6310': 'More data available', + }, + 'Execution errors': { + '6400': 'No specific diagnosis', + '6581': 'Memory failure', + }, + 'Checking errors': { + '6700': 'Wrong length in Lc', + }, + 'Functions in CLA not supported': { + '6881': 'Logical channel not supported or active', + '6882': 'Secure messaging not supported', + }, + 'Command not allowed': { + '6982': 'Security Status not satisfied', + '6985': 'Conditions of use not satisfied', + }, + 'Wrong parameters': { + '6a80': 'Incorrect values in command data', + '6a81': 'Function not supported e.g. card Life Cycle State is CARD_LOCKED', + '6a82': 'Application not found', + '6a84': 'Not enough memory space', + '6a86': 'Incorrect P1 P2', + '6a88': 'Referenced data not found', + }, + 'GlobalPlatform': { + '6d00': 'Invalid instruction', + '6e00': 'Invalid class', + }, + 'Application errors': { + '9484': 'Algorithm not supported', + '9485': 'Invalid key check value', + }, +} + +# GlobalPlatform 2.1.1 Section 9.1.6 +KeyType = Enum(Byte, des=0x80, + rsa_public_exponent_e_cleartex=0xA0, + rsa_modulus_n_cleartext=0xA1, + rsa_modulus_n=0xA2, + rsa_private_exponent_d=0xA3, + rsa_chines_remainder_p=0xA4, + rsa_chines_remainder_q=0xA5, + rsa_chines_remainder_pq=0xA6, + rsa_chines_remainder_dpi=0xA7, + rsa_chines_remainder_dqi=0xA8, + not_available=0xff) + +# GlobalPlatform 2.1.1 Section 9.3.3.1 +# example: +# e0 48 +# c0 04 01708010 +# c0 04 02708010 +# c0 04 03708010 +# c0 04 01018010 +# c0 04 02018010 +# c0 04 03018010 +# c0 04 01028010 +# c0 04 02028010 +# c0 04 03028010 +# c0 04 01038010 +# c0 04 02038010 +# c0 04 03038010 +class KeyInformationData(BER_TLV_IE, tag=0xc0): + _construct = Struct('key_identifier'/Byte, 'key_version_number'/Byte, + 'key_types'/GreedyRange(KeyType)) +class KeyInformation(BER_TLV_IE, tag=0xe0, nested=[KeyInformationData]): + pass + +# card data sample, returned in response to GET DATA (80ca006600): +# 66 31 +# 73 2f +# 06 07 +# 2a864886fc6b01 +# 60 0c +# 06 0a +# 2a864886fc6b02020101 +# 63 09 +# 06 07 +# 2a864886fc6b03 +# 64 0b +# 06 09 +# 2a864886fc6b040215 + +# GlobalPlatform 2.1.1 Table F-1 +class ObjectIdentifier(BER_TLV_IE, tag=0x06): + _construct = GreedyBytes +class CardManagementTypeAndVersion(BER_TLV_IE, tag=0x60, nested=[ObjectIdentifier]): + pass +class CardIdentificationScheme(BER_TLV_IE, tag=0x63, nested=[ObjectIdentifier]): + pass +class SecureChannelProtocolOfISD(BER_TLV_IE, tag=0x64, nested=[ObjectIdentifier]): + pass +class CardConfigurationDetails(BER_TLV_IE, tag=0x65): + _construct = GreedyBytes +class CardChipDetails(BER_TLV_IE, tag=0x66): + _construct = GreedyBytes +class CardRecognitionData(BER_TLV_IE, tag=0x73, nested=[ObjectIdentifier, + CardManagementTypeAndVersion, + CardIdentificationScheme, + SecureChannelProtocolOfISD, + CardConfigurationDetails, + CardChipDetails]): + pass +class CardData(BER_TLV_IE, tag=0x66, nested=[CardRecognitionData]): + pass + +# GlobalPlatform 2.1.1 Table F-2 +class SecureChannelProtocolOfSelectedSD(BER_TLV_IE, tag=0x64, nested=[ObjectIdentifier]): + pass +class SecurityDomainMgmtData(BER_TLV_IE, tag=0x73, nested=[CardManagementTypeAndVersion, + CardIdentificationScheme, + SecureChannelProtocolOfSelectedSD, + CardConfigurationDetails, + CardChipDetails]): + pass + +# GlobalPlatform 2.1.1 Section 9.1.1 +IsdLifeCycleState = Enum(Byte, op_ready=0x01, initialized=0x07, secured=0x0f, + card_locked = 0x7f, terminated=0xff) + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class ApplicationID(BER_TLV_IE, tag=0x84): + _construct = GreedyBytes + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class SecurityDomainManagementData(BER_TLV_IE, tag=0x73): + _construct = GreedyBytes + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class ApplicationProductionLifeCycleData(BER_TLV_IE, tag=0x9f6e): + _construct = GreedyBytes + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class MaximumLengthOfDataFieldInCommandMessage(BER_TLV_IE, tag=0x9f65): + _construct = GreedyInteger() + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class ProprietaryData(BER_TLV_IE, tag=0xA5, nested=[SecurityDomainManagementData, + ApplicationProductionLifeCycleData, + MaximumLengthOfDataFieldInCommandMessage]): + pass + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class FciTemplate(BER_TLV_IE, tag=0x6f, nested=[ApplicationID, SecurityDomainManagementData, + ApplicationProductionLifeCycleData, + MaximumLengthOfDataFieldInCommandMessage, + ProprietaryData]): + pass + +class IssuerIdentificationNumber(BER_TLV_IE, tag=0x42): + _construct = BcdAdapter(GreedyBytes) + +class CardImageNumber(BER_TLV_IE, tag=0x45): + _construct = BcdAdapter(GreedyBytes) + +class SequenceCounterOfDefaultKvn(BER_TLV_IE, tag=0xc1): + _construct = GreedyInteger() + +class ConfirmationCounter(BER_TLV_IE, tag=0xc2): + _construct = GreedyInteger() + +# Collection of all the data objects we can get from GET DATA +class DataCollection(TLV_IE_Collection, nested=[IssuerIdentificationNumber, + CardImageNumber, + CardData, + KeyInformation, + SequenceCounterOfDefaultKvn, + ConfirmationCounter]): + pass + +def decode_select_response(resp_hex: str) -> object: + t = FciTemplate() + t.from_tlv(h2b(resp_hex)) + d = t.to_dict() + return flatten_dict_lists(d['fci_template']) + +# Application Dedicated File of a Security Domain +class ADF_SD(CardADF): + def __init__(self, aid: str, name: str, desc: str): + super().__init__(aid=aid, fid=None, sfid=None, name=name, desc=desc) + self.shell_commands += [self.AddlShellCommands()] + + @staticmethod + def decode_select_response(res_hex: str) -> object: + return decode_select_response(res_hex) + + @with_default_category('Application-Specific Commands') + class AddlShellCommands(CommandSet): + def __init__(self): + super().__init__() + + def do_get_data(self, opts): + tlv_cls_name = opts.arg_list[0] + tlv_cls = DataCollection().members_by_name[tlv_cls_name] + (data, sw) = self._cmd.card._scc.get_data(cla=0x80, tag=tlv_cls.tag) + ie = tlv_cls() + ie.from_tlv(h2b(data)) + self._cmd.poutput_json(ie.to_dict()) + + def complete_get_data(self, text, line, begidx, endidx) -> List[str]: + #data_dict = {camel_to_snake(str(x.__name__)): x for x in DataCollection.possible_nested} + data_dict = {str(x.__name__): x for x in DataCollection.possible_nested} + index_dict = {1: data_dict} + return self._cmd.index_based_complete(text, line, begidx, endidx, index_dict=index_dict) + +# Card Application of a Security Domain +class CardApplicationSD(CardApplication): + def __init__(self, aid: str, name: str, desc: str): + super().__init__(name, adf=ADF_SD(aid, name, desc), sw=sw_table) + +# Card Application of Issuer Security Domain +class CardApplicationISD(CardApplicationSD): + # FIXME: ISD AID is not static, but could be different. One can select the empty + # application using '00a4040000' and then parse the response FCI to get the ISD AID + def __init__(self, aid='a000000003000000'): + super().__init__(aid=aid, name='ADF.ISD', desc='Issuer Security Domain') + +#class CardProfileGlobalPlatform(CardProfile): +# ORDER = 23 +# +# def __init__(self, name='GlobalPlatform'): +# super().__init__(name, desc='GlobalPlatfomr 2.1.1', cla=['00','80','84'], sw=sw_table) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If11267d45ab7aa371eea8c143abd9320c32b54d0 Gerrit-Change-Number: 27271 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

2 years, 2 months

1
0
0 0

Change in pysim[master]: Initial support for GlobalPlatform

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27271 ) Change subject: Initial support for GlobalPlatform ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If11267d45ab7aa371eea8c143abd9320c32b54d0 Gerrit-Change-Number: 27271 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Mar 2022 16:32:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-gsm-manuals[master]: common: gb-ns2: add chapter Gb/NS maintenance

by lynxis lazus

Attention is currently required from: pespin, daniel, lynxis lazus. Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/24687 to look at the new patch set (#4). Change subject: common: gb-ns2: add chapter Gb/NS maintenance ...................................................................... common: gb-ns2: add chapter Gb/NS maintenance Add chapter to describe common maintenance Change-Id: I5571001a127c933397a4bc26e85410288d50fc2f --- A common/chapters/gb-ns2-maintenance.adoc A common/chapters/gb-ns2-nsvc-states-alive.dot A common/chapters/gb-ns2-nsvc-states-reset-block.dot 3 files changed, 130 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/87/24687/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/24687 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: I5571001a127c933397a4bc26e85410288d50fc2f Gerrit-Change-Number: 24687 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-gsm-manuals[master]: TESTING_CI: add source

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/27355 ) Change subject: TESTING_CI: add source ...................................................................... TESTING_CI: add source Change-Id: I0ab8ca5e846ba4437e72f7bf4c938df01c3b2369 --- M common/chapters/gb-ns2-maintenance.adoc 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/55/27355/1 diff --git a/common/chapters/gb-ns2-maintenance.adoc b/common/chapters/gb-ns2-maintenance.adoc index 09938b6..16179ed 100644 --- a/common/chapters/gb-ns2-maintenance.adoc +++ b/common/chapters/gb-ns2-maintenance.adoc @@ -98,6 +98,7 @@ ==== Blocking a NSVC .how to block a single NSVC +[source] ---- OsmoNSdummy# show ns nsei 01234 NSEI 01234: UDP, ALIVE since 0d 0h 41m 6s -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/27355 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: I0ab8ca5e846ba4437e72f7bf4c938df01c3b2369 Gerrit-Change-Number: 27355 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-gsm-manuals[master]: common: gb-ns2: fix typo in configures

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/27304 ) Change subject: common: gb-ns2: fix typo in configures ...................................................................... common: gb-ns2: fix typo in configures Change-Id: Ia3d41d5fae8af7a35e86feba6ecb37c0692206b1 --- M common/chapters/gb-ns2.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/common/chapters/gb-ns2.adoc b/common/chapters/gb-ns2.adoc index f7ff2ac..34943d3 100644 --- a/common/chapters/gb-ns2.adoc +++ b/common/chapters/gb-ns2.adoc @@ -58,7 +58,7 @@ The Linux kernel Frame Relay LMI support (which only implements the user role anyway) is not used. Instead, the ITU-T Q.933 LMI is implemented -as part of the Osmocom NS code in libosmogb. Osmocom NS code configres +as part of the Osmocom NS code in libosmogb. Osmocom NS code configures the `hdlcX` device to match the correct mode (fr) and lmi (none). This is equivalent to the user-space command `sethdlc hdlcX fr lmi none`. The net-devices will be also brought _up_ by the Osmocom NS code equivalent to 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/27304 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: Ia3d41d5fae8af7a35e86feba6ecb37c0692206b1 Gerrit-Change-Number: 27304 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-gsm-manuals[master]: common: gb-ns2: add chapter Gb/NS maintenance

by lynxis lazus

Attention is currently required from: pespin, daniel. Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/24687 to look at the new patch set (#3). Change subject: common: gb-ns2: add chapter Gb/NS maintenance ...................................................................... common: gb-ns2: add chapter Gb/NS maintenance Add chapter to describe common maintenance Change-Id: I5571001a127c933397a4bc26e85410288d50fc2f --- A common/chapters/gb-ns2-maintenance.adoc A common/chapters/gb-ns2-nsvc-states-alive.dot A common/chapters/gb-ns2-nsvc-states-reset-block.dot 3 files changed, 130 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/87/24687/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/24687 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: I5571001a127c933397a4bc26e85410288d50fc2f Gerrit-Change-Number: 24687 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: debian-*-jenkins: git clone from gerrit

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27353 ) Change subject: debian-*-jenkins: git clone from gerrit ...................................................................... debian-*-jenkins: git clone from gerrit Avoid occasional clone failures by replacing https://git.osmocom.org with https://gerrit.osmocom.org. Step 18/28 : RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && cp -v $(find osmo-ci/scripts -maxdepth 1 -type f ) /usr/local/bin ---> Running in c1c0bc9fb861 Cloning into 'osmo-ci'... error: (curl_result = 56, http_code = 200, sha1 = ded2f31cbac2e7b0ae6c3c4147f4e21ab1ce9b98) error: Unable to find ded2f31cbac2e7b0ae6c3c4147f4e21ab1ce9b98 under https://git.osmocom.org/osmo-ci Cannot obtain needed tree ded2f31cbac2e7b0ae6c3c4147f4e21ab1ce9b98 while processing commit bff275075548c443596aa1eb80d784e4cd3c2231. error: fetch failed. Related: SYS#5857 Change-Id: I9ad8e5755c5d520ff33d85792a5a70da62d05253 --- M debian-buster-jenkins/Dockerfile M debian-stretch-jenkins/Dockerfile 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index 2e3855b..0ea81fe 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -138,20 +138,20 @@ # Install osmo-python-tests for python2 (when building old tags again new releases) ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit -RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ +RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ cd osmo-python-tests2 && \ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ python2 setup.py clean build install # Install osmo-python-tests for python3 ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit -RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ +RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit -RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && \ +RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ -type f ) \ @@ -159,7 +159,7 @@ # Install osmo-gsm-manuals to /opt/osmo-gsm-manuals ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit -RUN git -C /opt clone https://git.osmocom.org/osmo-gsm-manuals +RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals # Set a UTF-8 locale RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile index e39ca4e..b5c36fb 100644 --- a/debian-stretch-jenkins/Dockerfile +++ b/debian-stretch-jenkins/Dockerfile @@ -140,20 +140,20 @@ # Install osmo-python-tests for python2 (when building old tags again new releases) ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit -RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ +RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ cd osmo-python-tests2 && \ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ python2 setup.py clean build install # Install osmo-python-tests for python3 ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit -RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ +RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit -RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && \ +RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ -type f ) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9ad8e5755c5d520ff33d85792a5a70da62d05253 Gerrit-Change-Number: 27353 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-MessageType: merged

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: debian-*-jenkins: git clone from gerrit

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27353 ) Change subject: debian-*-jenkins: git clone from gerrit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9ad8e5755c5d520ff33d85792a5a70da62d05253 Gerrit-Change-Number: 27353 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-Comment-Date: Tue, 01 Mar 2022 11:54:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-ogs: Use new bind_dev config option for GTP sockets

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27354 ) Change subject: ttcn3-ggsn-ogs: Use new bind_dev config option for GTP sockets ...................................................................... ttcn3-ggsn-ogs: Use new bind_dev config option for GTP sockets This way we validate the feature is run and open5gs-smfd/upfd don't fail when applying it. Related: SYS#5846 Change-Id: Ie23db8ffb4868e4bc75783e2f6eb7a725b376ea7 --- M ttcn3-ggsn-test/ogs/smfd.yaml M ttcn3-ggsn-test/ogs/upfd.yaml 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/54/27354/1 diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml b/ttcn3-ggsn-test/ogs/smfd.yaml index 96463e5..a0015c2 100644 --- a/ttcn3-ggsn-test/ogs/smfd.yaml +++ b/ttcn3-ggsn-test/ogs/smfd.yaml @@ -336,9 +336,11 @@ - addr: 172.18.3.201 gtpc: - addr: 172.18.3.201 + bind_dev: eth0 gtpu: - addr: 172.18.3.201 port: 2152 + bind_dev: eth0 subnet: - addr: 176.16.16.1/20 dnn: internet diff --git a/ttcn3-ggsn-test/ogs/upfd.yaml b/ttcn3-ggsn-test/ogs/upfd.yaml index b38bc34..efb0892 100644 --- a/ttcn3-ggsn-test/ogs/upfd.yaml +++ b/ttcn3-ggsn-test/ogs/upfd.yaml @@ -155,6 +155,7 @@ gtpu: - addr: 172.18.3.222 port: 2152 + bind_dev: eth0 subnet: - addr: 176.16.16.1/20 dnn: internet -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie23db8ffb4868e4bc75783e2f6eb7a725b376ea7 Gerrit-Change-Number: 27354 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27348 ) Change subject: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools ...................................................................... ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools This is needed for test TC_lots_of_concurrent_pdp_ctx, which creates up to 1000 pdp contexts. Change-Id: If3344c8acc9bc3b43ed0a13af52807d2a6050a81 --- M ttcn3-ggsn-test/ogs/smfd.yaml M ttcn3-ggsn-test/ogs/upfd-setup.sh M ttcn3-ggsn-test/ogs/upfd.yaml M ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg M ttcn3-ggsn-test/osmo-ggsn.cfg 5 files changed, 12 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml b/ttcn3-ggsn-test/ogs/smfd.yaml index 0860074..96463e5 100644 --- a/ttcn3-ggsn-test/ogs/smfd.yaml +++ b/ttcn3-ggsn-test/ogs/smfd.yaml @@ -340,11 +340,11 @@ - addr: 172.18.3.201 port: 2152 subnet: - - addr: 176.16.222.1/24 + - addr: 176.16.16.1/20 dnn: internet - addr: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 - - addr: 176.16.46.1/24 + - addr: 176.16.32.1/20 dnn: inet46 - addr: 2001:780:44:2100:0:0:0:1/56 dnn: inet46 diff --git a/ttcn3-ggsn-test/ogs/upfd-setup.sh b/ttcn3-ggsn-test/ogs/upfd-setup.sh index c96a561..b185ac0 100755 --- a/ttcn3-ggsn-test/ogs/upfd-setup.sh +++ b/ttcn3-ggsn-test/ogs/upfd-setup.sh @@ -18,9 +18,9 @@ create_tun "ogstun6" create_tun "ogstun46" -add_addr "ogstun4" "176.16.222.1/16" +add_addr "ogstun4" "176.16.16.1/20" add_addr "ogstun6" "2001:780:44:2000:0:0:0:1/56" -add_addr "ogstun46" "176.16.46.1/24" +add_addr "ogstun46" "176.16.32.1/20" add_addr "ogstun46" "2001:780:44:2100:0:0:0:1/56" ip link set ogstun4 up diff --git a/ttcn3-ggsn-test/ogs/upfd.yaml b/ttcn3-ggsn-test/ogs/upfd.yaml index 8fe932b..b38bc34 100644 --- a/ttcn3-ggsn-test/ogs/upfd.yaml +++ b/ttcn3-ggsn-test/ogs/upfd.yaml @@ -156,13 +156,13 @@ - addr: 172.18.3.222 port: 2152 subnet: - - addr: 176.16.222.1/24 + - addr: 176.16.16.1/20 dnn: internet dev: ogstun4 - addr: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 dev: ogstun6 - - addr: 176.16.46.1/24 + - addr: 176.16.32.1/20 dnn: inet46 dev: ogstun46 - addr: 2001:780:44:2100:0:0:0:1/56 diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg index 0288d60..6fbfd0e 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg @@ -48,10 +48,10 @@ gtpu-mode kernel-gtp tun-device tun4 type-support v4 - ip prefix dynamic 176.16.222.0/24 + ip prefix dynamic 176.16.16.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 - ip ifconfig 176.16.222.0/24 + ip ifconfig 176.16.16.0/20 no shutdown # apn inet6 # apn inet46 diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg index 972ee93..b27a6e4 100644 --- a/ttcn3-ggsn-test/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn.cfg @@ -48,10 +48,10 @@ gtpu-mode tun tun-device tun4 type-support v4 - ip prefix dynamic 176.16.222.0/24 + ip prefix dynamic 176.16.16.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 - ip ifconfig 176.16.222.0/24 + ip ifconfig 176.16.16.0/20 no shutdown apn inet6 gtpu-mode tun @@ -66,10 +66,10 @@ gtpu-mode tun tun-device tun46 type-support v4v6 - ip prefix dynamic 176.16.46.0/24 + ip prefix dynamic 176.16.32.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 - ip ifconfig 176.16.46.0/24 + ip ifconfig 176.16.32.0/20 ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 ipv6 dns 0 fd02:db8:3::201 ipv6 dns 1 2001:4860:4860::8844 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If3344c8acc9bc3b43ed0a13af52807d2a6050a81 Gerrit-Change-Number: 27348 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27348 ) Change subject: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If3344c8acc9bc3b43ed0a13af52807d2a6050a81 Gerrit-Change-Number: 27348 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Mar 2022 11:43:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX)

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 ) Change subject: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX) ...................................................................... libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX) osmo-ggsn crashes when concurrent pdp context num 1024 is created, due to the gsn->pdpa array (of size PDP_MAX, 1024) being full. The crash happens because return code of gtp_pdp_newpdp was not checked, and hence a pointer "pdp" pointing to a temporary not-fully-allocated object was being passed to gsn->cb_create_context_ind() callback. Let's avoid crashing and instead reject the PDP context. Related: OS#5469 Change-Id: I0d94ffad97eb4fef477d981bf285bf99740592a3 --- M gtp/gtp.c 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/gtp/gtp.c b/gtp/gtp.c index 59fd355..829d2d2 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -1809,7 +1809,16 @@ } } - gtp_pdp_newpdp(gsn, &pdp, pdp->imsi, pdp->nsapi, pdp); + rc = gtp_pdp_newpdp(gsn, &pdp, pdp->imsi, pdp->nsapi, pdp); + if (rc != 0) { + GTP_LOGPKG(LOGL_ERROR, peer, pack, len, + "Failed creating a new PDP context, array full (%u)\n", PDP_MAX); + /* &pdp in gtp_pdp_newpdp is untouched if it failed: */ + rc = gtp_create_pdp_resp(gsn, version, pdp, GTPCAUSE_NO_MEMORY); + /* Don't pass it to emit_cb_recovery, since allocation failed and it was already rejected: */ + pdp = NULL; + goto recover_ret; + } /* Callback function to validate login */ if (gsn->cb_create_context_ind != 0) @@ -1820,6 +1829,8 @@ rc = gtp_create_pdp_resp(gsn, version, pdp, GTPCAUSE_NOT_SUPPORTED); } + +recover_ret: if (recovery_recvd) emit_cb_recovery(gsn, peer, pdp, recovery); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0d94ffad97eb4fef477d981bf285bf99740592a3 Gerrit-Change-Number: 27351 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase)

by pespin

Attention is currently required from: laforge, keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27352 ) Change subject: libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6034b0fab2b2e5962314c2fca2f893246ce5cf4f Gerrit-Change-Number: 27352 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Tue, 01 Mar 2022 11:39:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX)

by pespin

Attention is currently required from: keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 ) Change subject: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0d94ffad97eb4fef477d981bf285bf99740592a3 Gerrit-Change-Number: 27351 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Tue, 01 Mar 2022 11:39:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX)

by pespin

Attention is currently required from: pespin, keith. Hello Jenkins Builder, laforge, fixeria, keith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 to look at the new patch set (#2). Change subject: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX) ...................................................................... libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX) osmo-ggsn crashes when concurrent pdp context num 1024 is created, due to the gsn->pdpa array (of size PDP_MAX, 1024) being full. The crash happens because return code of gtp_pdp_newpdp was not checked, and hence a pointer "pdp" pointing to a temporary not-fully-allocated object was being passed to gsn->cb_create_context_ind() callback. Let's avoid crashing and instead reject the PDP context. Related: OS#5469 Change-Id: I0d94ffad97eb4fef477d981bf285bf99740592a3 --- M gtp/gtp.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/51/27351/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0d94ffad97eb4fef477d981bf285bf99740592a3 Gerrit-Change-Number: 27351 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: debian-*-jenkins: git clone from gerrit

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27353 ) Change subject: debian-*-jenkins: git clone from gerrit ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9ad8e5755c5d520ff33d85792a5a70da62d05253 Gerrit-Change-Number: 27353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Mar 2022 10:57:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: debian-*-jenkins: git clone from gerrit

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27353 ) Change subject: debian-*-jenkins: git clone from gerrit ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9ad8e5755c5d520ff33d85792a5a70da62d05253 Gerrit-Change-Number: 27353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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-Comment-Date: Tue, 01 Mar 2022 10:55:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 ) Change subject: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx ...................................................................... ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx Change-Id: Iab19963f8e869af8fe0c385abd0fd7bbd9221790 --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 115 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index b66d7ba..58a12a6 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1862,6 +1862,119 @@ setverdict(pass); } + /* Test creation, user plane and deletion of big amount (1000) of concurrent PDP context */ + testcase TC_lots_of_concurrent_pdp_ctx() runs on GT_CT { + var Gtp1cUnitdata udc; + var Gtp1uUnitdata udu; + const integer num_ctx := 1000; + var PdpContext ctx[num_ctx]; + timer T_next := 0.01; + var integer next_req_ctx := 0; + var integer rx_resp_ctx := 0; + var integer rx_pong := 0; + var OCT4 dns1_addr; + var OCT4 saddr; + var integer teic; + var integer idx; + + f_init(); + + for (var integer i := 0; i < num_ctx; i := i + 1) { + ctx[i] := valueof(t_DefinePDP(f_rnd_imsi('26242'H), f_rnd_msisdn('1234'O), c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx[i].teic := int2oct(i+1, 4); /* +1: skip TEIC=0 */ + ctx[i].teid := int2oct(i+1, 4); /* +1: skip TEID=0 */ + ctx[i].pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + } + + T_default.start(60.0); + + T_next.start; + alt { + [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(INITIAL_REQUEST) { repeat; } + [] pingpong(); + [] T_next.timeout { + f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].imsi, g_restart_ctr, + ctx[next_req_ctx].teid, ctx[next_req_ctx].teic, ctx[next_req_ctx].nsapi, + ctx[next_req_ctx].eua, ctx[next_req_ctx].apn, g_sgsn_ip_c, g_sgsn_ip_u, + ctx[next_req_ctx].msisdn, ctx[next_req_ctx].pco_req, ctx[next_req_ctx].ratType, + ctx[next_req_ctx].uli)); + next_req_ctx := next_req_ctx + 1; + if (next_req_ctx < num_ctx) { + T_next.start; + } + repeat; + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ?)) -> value udc { + teic := oct2int(udc.gtpc.teid); + if (not match(teic, (1 .. num_ctx))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rx Unexpected TEIC"); + } + idx := teic - 1; + f_handle_create_req(ctx[idx], udc); + rx_resp_ctx := rx_resp_ctx + 1; + + dns1_addr := f_PCO_extract_proto(ctx[idx].pco_neg, '000d'O); + saddr := ctx[idx].eua.endUserAddress.endUserAddressIPv4.ipv4_address; + f_send_gtpu(ctx[idx], f_gen_icmpv4_echo(saddr, dns1_addr)); + repeat; + } + [] GTPU.receive(tr_GTPU_GPDU(g_peer_u, ?)) -> value udu { + var octetstring gpdu := udu.gtpu.gtpu_IEs.g_PDU_IEs.data; + var IPv4_packet ip4 := f_IPv4_dec(gpdu); + if (ip4.header.ver != 4) { + repeat; + } + var PDU_ICMP icmp4 := f_dec_PDU_ICMP(ip4.payload); + if (not match(icmp4, (tr_ICMPv4_ERP, tr_ICMPv4_DU))) { + repeat; + } + rx_pong := rx_pong + 1; + if (rx_pong < num_ctx) { + repeat; + } + setverdict(pass); + } + [] GTPC.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPC"); } + [] GTPU.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPU"); } + } + + /* Let's close them now: */ + next_req_ctx := 0; + rx_resp_ctx := 0; + T_next.start; + alt { + [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(TERMINATION_REQUEST) { repeat; } + [] pingpong(); + [] T_next.timeout { + f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].teic_remote, ctx[next_req_ctx].nsapi, '1'B)); + next_req_ctx := next_req_ctx + 1; + if (next_req_ctx < num_ctx) { + T_next.start; + } + repeat; + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, ?)) -> value udc { + teic := oct2int(udc.gtpc.teid); + if (not match(teic, (1 .. num_ctx))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rx Unexpected TEIC"); + } + rx_resp_ctx := rx_resp_ctx + 1; + if (rx_resp_ctx < num_ctx) { + repeat; + } + setverdict(pass); + } + [] GTPC.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPC"); } + [] GTPU.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPU"); } + } + T_next.stop; + + T_default.stop; + setverdict(pass); + } + control { execute(TC_pdp4_act_deact()); execute(TC_pdp4_act_deact_ipcp()); @@ -1904,5 +2017,7 @@ execute(TC_act_deact_retrans_duplicate()); execute(TC_pdp_act_restart_ctr_echo()); + + execute(TC_lots_of_concurrent_pdp_ctx()); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iab19963f8e869af8fe0c385abd0fd7bbd9221790 Gerrit-Change-Number: 27347 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 ) Change subject: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iab19963f8e869af8fe0c385abd0fd7bbd9221790 Gerrit-Change-Number: 27347 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Mar 2022 10:51:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: debian-*-jenkins: git clone from gerrit

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27353 ) Change subject: debian-*-jenkins: git clone from gerrit ...................................................................... debian-*-jenkins: git clone from gerrit Avoid occasional clone failures by replacing https://git.osmocom.org with https://gerrit.osmocom.org. Step 18/28 : RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && cp -v $(find osmo-ci/scripts -maxdepth 1 -type f ) /usr/local/bin ---> Running in c1c0bc9fb861 Cloning into 'osmo-ci'... error: (curl_result = 56, http_code = 200, sha1 = ded2f31cbac2e7b0ae6c3c4147f4e21ab1ce9b98) error: Unable to find ded2f31cbac2e7b0ae6c3c4147f4e21ab1ce9b98 under https://git.osmocom.org/osmo-ci Cannot obtain needed tree ded2f31cbac2e7b0ae6c3c4147f4e21ab1ce9b98 while processing commit bff275075548c443596aa1eb80d784e4cd3c2231. error: fetch failed. Related: SYS#5857 Change-Id: I9ad8e5755c5d520ff33d85792a5a70da62d05253 --- M debian-buster-jenkins/Dockerfile M debian-stretch-jenkins/Dockerfile 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/27353/1 diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index 2e3855b..0ea81fe 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -138,20 +138,20 @@ # Install osmo-python-tests for python2 (when building old tags again new releases) ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit -RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ +RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ cd osmo-python-tests2 && \ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ python2 setup.py clean build install # Install osmo-python-tests for python3 ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit -RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ +RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit -RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && \ +RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ -type f ) \ @@ -159,7 +159,7 @@ # Install osmo-gsm-manuals to /opt/osmo-gsm-manuals ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit -RUN git -C /opt clone https://git.osmocom.org/osmo-gsm-manuals +RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals # Set a UTF-8 locale RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile index e39ca4e..b5c36fb 100644 --- a/debian-stretch-jenkins/Dockerfile +++ b/debian-stretch-jenkins/Dockerfile @@ -140,20 +140,20 @@ # Install osmo-python-tests for python2 (when building old tags again new releases) ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit -RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ +RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ cd osmo-python-tests2 && \ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ python2 setup.py clean build install # Install osmo-python-tests for python3 ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit -RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ +RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit -RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && \ +RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ -type f ) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9ad8e5755c5d520ff33d85792a5a70da62d05253 Gerrit-Change-Number: 27353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

2024

2023

2022

gerrit-log March 2022