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

[S] Change in osmo-gsm-manuals[master]: Bump version: 1.5.0.13-b3b2 → 1.6.0

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/37559?usp=email ) Change subject: Bump version: 1.5.0.13-b3b2 → 1.6.0 ...................................................................... Bump version: 1.5.0.13-b3b2 → 1.6.0 Change-Id: Ic9f5065885d7d607380a60932dac59b38c54e800 --- A TODO-RELEASE M debian/changelog 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/59/37559/1 diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 0000000..0ed7189 --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release +# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info… +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:a. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library what description / commit summary line diff --git a/debian/changelog b/debian/changelog index bcd956b..5692469 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +osmo-gsm-manuals-dev (1.6.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * sigtran: Document SCTP INIT VTY parameters + * Update spec reference s/TS 04.08/TS 24.008/ + * gsup.adoc: Update spec reference s/TS 09.60/TS 29.060/ + * gsup: Convert PDP-Type IE to PDP-Address IE + * gsup.adoc: Fix typo + * gsup.adoc: Fix Authentication Info message naming in table + * gsup.adoc: Add links to section of each message type in table + * gsup.adoc: Add conditional 'PDP Info' IE to Auth Info Req + * gsup: Introduce a new PCO IE + * gsup: Document ePDG Tunnel Req/Res/Err + + [ Oliver Smith ] + * build/Makefile.asciidoc: fix GIT_DATE + * Cosmetic: build/Makefile.asciidoc: remove comments + + [ Neels Hofmeyr ] + * add static SS7 routing example to cs7-config.adoc + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 24 Jul 2024 10:32:07 +0200 + osmo-gsm-manuals-dev (1.5.0) unstable; urgency=medium [ Max ] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/37559?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: Ic9f5065885d7d607380a60932dac59b38c54e800 Gerrit-Change-Number: 37559 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[M] Change in libosmocore[master]: codec: add osmo_hr_sid_classify()

by falconia

Attention is currently required from: falconia. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/37558?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: codec: add osmo_hr_sid_classify() ...................................................................... codec: add osmo_hr_sid_classify() In order to support DTX, each frame coming out of the channel decoder for TCH/FS, TCH/HS and TCH/EFS needs to be classified as valid SID, invalid SID or non-SID speech as specified in GSM 06.31, 06.41 and 06.81, respectively. However, the case of TCH/HS (GSM 06.41) is more difficult than FR & EFR: ETSI provided an example implementation instead of a stipulation, and because they failed to document the BCI error flag they relied upon, ETSI's reference implementation of HR SID classification defied understanding for a long time. But now this mystery has been cracked: https://osmocom.org/projects/retro-gsm/wiki/HRv1_error_flags Add a function to libosmocodec that implements the same logic as ETSI's swSidDetection(), including support for BCI flag. This function is intended to be used in OsmoBTS (it can post-process the output of sysmoBTS PHY) when TW-TS-002 output is requested, and it can also be used in implementations of SDR-based GSM MS when feeding TCH/HS Rx to a proper speech decoder and Rx DTX handler for HRv1 codec. Related: OS#6036 Change-Id: I5f4eb65379646125b966cf182775b6e9348900bd --- M include/osmocom/codec/codec.h M src/codec/Makefile.am A src/codec/hr_sid_class.c 3 files changed, 213 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/37558/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37558?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: I5f4eb65379646125b966cf182775b6e9348900bd Gerrit-Change-Number: 37558 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newpatchset

11 months, 1 week

1
0
0 0

[M] Change in libosmocore[master]: codec: add osmo_hr_sid_classify()

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/37558?usp=email ) Change subject: codec: add osmo_hr_sid_classify() ...................................................................... Patch Set 1: (2 comments) File src/codec/hr_sid_class.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-17193): https://gerrit.osmocom.org/c/libosmocore/+/37558/comment/23856af6_77bf5806 PS1, Line 68: {0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; that open brace { should be on the previous line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-17193): https://gerrit.osmocom.org/c/libosmocore/+/37558/comment/ffa79337_727ba9c5 PS1, Line 79: {0x08, 0xEF, 0x1F, 0x3F, 0xF3, 0xFC, 0xA4, that open brace { should be on the previous line -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37558?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: I5f4eb65379646125b966cf182775b6e9348900bd Gerrit-Change-Number: 37558 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 24 Jul 2024 07:26:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

[M] Change in libosmocore[master]: codec: add osmo_hr_sid_classify()

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/37558?usp=email ) Change subject: codec: add osmo_hr_sid_classify() ...................................................................... codec: add osmo_hr_sid_classify() In order to support DTX, each frame coming out of the channel decoder for TCH/FS, TCH/HS and TCH/EFS needs to be classified as valid SID, invalid SID or non-SID speech as specified in GSM 06.31, 06.41 and 06.81, respectively. However, the case of TCH/HS (GSM 06.41) is more difficult than FR & EFR: ETSI provided an example implementation instead of a stipulation, and because they failed to document the BCI error flag they relied upon, ETSI's reference implementation of HR SID classification defied understanding for a long time. But now this mystery has been cracked: https://osmocom.org/projects/retro-gsm/wiki/HRv1_error_flags Add a function to libosmocodec that implements the same logic as ETSI's swSidDetection(), including support for BCI flag. This function is intended to be used in OsmoBTS (it can post-process the output of sysmoBTS PHY) when TW-TS-002 output is requested, and it can also be used in implementations of SDR-based GSM MS when feeding TCH/HS Rx to a proper speech decoder and Rx DTX handler for HRv1 codec. Related: OS#6036 Change-Id: I5f4eb65379646125b966cf182775b6e9348900bd --- M include/osmocom/codec/codec.h M src/codec/Makefile.am A src/codec/hr_sid_class.c 3 files changed, 211 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/37558/1 diff --git a/include/osmocom/codec/codec.h b/include/osmocom/codec/codec.h index c5981f8..7a23e7f 100644 --- a/include/osmocom/codec/codec.h +++ b/include/osmocom/codec/codec.h @@ -100,6 +100,9 @@ enum osmo_gsm631_sid_class osmo_fr_sid_classify(const uint8_t *rtp_payload); enum osmo_gsm631_sid_class osmo_efr_sid_classify(const uint8_t *rtp_payload); +enum osmo_gsm631_sid_class osmo_hr_sid_classify(const uint8_t *rtp_payload, + bool bci_flag, + bool *bfi_from_bci); /*! Check if given FR codec frame is any kind of SID, valid or invalid * \param[in] rtp_payload Buffer with RTP payload diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index bb01b9d..e9d58c1 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -18,6 +18,7 @@ gsm620.c \ gsm660.c \ gsm690.c \ + hr_sid_class.c \ ecu.c \ ecu_fr.c \ ecu_fr_old.c \ diff --git a/src/codec/hr_sid_class.c b/src/codec/hr_sid_class.c new file mode 100644 index 0000000..3454062 --- /dev/null +++ b/src/codec/hr_sid_class.c @@ -0,0 +1,178 @@ +/* + * This module implements osmo_hr_sid_classify() function - an independent + * reimplementation of the logic that was recommended (but not stipulated + * as normative) by ETSI for classifying received TCH/HS frames as + * valid SID, invalid SID or non-SID speech. + * + * Author: Mychaela N. Falconia <falcon(a)freecalypso.org>, 2024 - however, + * Mother Mychaela's contributions are NOT subject to copyright. + * No rights reserved, all rights relinquished. + * + * 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. + */ + +#include <stdint.h> +#include <stdbool.h> + +#include <osmocom/codec/codec.h> + +/* + * This helper function takes a byte, counts how many bits are set to 1, + * and returns that number. + */ +static unsigned ones_in_byte(uint8_t byte) +{ + unsigned count = 0; + + for (; byte; byte >>= 1) { + if (byte & 1) + count++; + } + return count; +} + +/* + * This helper function takes two byte arrays of equal length (data and mask), + * applies the mask to the data, then counts how many bits are set to 1 + * under the mask, and returns that number. + */ +static unsigned count_ones_under_mask(const uint8_t *data, const uint8_t *mask, + unsigned nbytes) +{ + unsigned n, accum; + uint8_t and; + + accum = 0; + for (n = 0; n < nbytes; n++) { + and = *data++ & *mask++; + accum += ones_in_byte(and); + } + return accum; +} + +/* + * When a GSM-HR SID frame has been decoded correctly in voiced mode, + * the 79 bits of the SID field will be the last bits in the frame. + * In the packed format of TS 101 318, the bits of interest will be + * in the last 10 bytes. The following array is the mask to be applied. + */ +static const uint8_t sid_field_last10_mask[10] = + {0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; + +/* + * When a GSM-HR SID frame has been incorrectly decoded in unvoiced mode + * (both mode bits got flipped to 0 by channel errors), the 79 bits + * of the SID field will be badly misordered all over the frame. + * However, they can still be counted for the purpose of SID detection. + * The following array is the mask to be applied to the whole frame + * (14 bytes) to locate the misordered SID field. + */ +static const uint8_t sid_field_misordered[14] = + {0x08, 0xEF, 0x1F, 0x3F, 0xF3, 0xFC, 0xA4, + 0xFF, 0xFA, 0x3F, 0xFF, 0x47, 0xFF, 0xEC}; + +/* + * In the channel coding scheme on TCH/HS, the HR codec frame of 112 bits + * is divided into 95 class 1 bits and 17 class 2 bits. In the packed + * format of TS 101 318, all 17 class 2 bits will always be in the last + * 4 bytes; however, the specific bits will be different depending on + * whether the frame was decoded in voiced or unvoiced mode. + * The following two arrays are masks to be applied to the last 4 bytes. + */ +static const uint8_t class2_mask_voiced[4] = {0x7F, 0x80, 0x3F, 0xE0}; +static const uint8_t class2_mask_unvoiced[4] = {0x07, 0x07, 0xFF, 0xE0}; + +/* + * osmo_hr_sid_classify() - this function is an independent reimplementation + * of the logic that was recommended (but not stipulated as normative) by ETSI + * for classifying received TCH/HS frames as valid SID, invalid SID or non-SID + * speech. ETSI's original version is swSidDetection() function in reid.c + * in GSM 06.06 source; the present version implements exactly the same + * logic (same inputs will produce same output), but differs in the following + * ways: + * + * - The frame of channel-decoded 112 payload bits was passed in the form + * of an array of 18 codec parameters in ETSI's version; the present version + * uses the packed format of TS 101 318 instead. + * + * - The C code implementation was written anew by Mother Mychaela; no code + * in this file has been copied directly from GSM 06.06 code drop. + * + * This function is meant to be used only in the same network element + * that performs GSM 05.03 channel decoding (OsmoBTS, new implementations + * of GSM MS), _*NOT*_ in programs or network elements that receive + * HRv1 codec frames from other elements via RTP or Abis-E1 etc! + * + * The BCI logic recommended by ETSI and implemented in practice by at least + * one vendor whose implementation has been reverse-engineered (TI Calypso) + * is included in this function. To understand this logic, please refer + * to this wiki description: + * + * https://osmocom.org/projects/retro-gsm/wiki/HRv1_error_flags + */ +enum osmo_gsm631_sid_class osmo_hr_sid_classify(const uint8_t *rtp_payload, + bool bci_flag, + bool *bfi_from_bci) +{ + uint8_t mode_bits = rtp_payload[4] & 0x30; + unsigned sid_field_ones, class1_ones, class2_ones; + unsigned sid_field_zeros, class1_zeros; + unsigned invalid_sid_threshold; + enum osmo_gsm631_sid_class sidc; + + if (mode_bits != 0) { /* decoded as voiced */ + sid_field_ones = count_ones_under_mask(rtp_payload + 4, + sid_field_last10_mask, 10); + class2_ones = count_ones_under_mask(rtp_payload + 10, + class2_mask_voiced, 4); + } else { /* decoded as unvoiced */ + sid_field_ones = count_ones_under_mask(rtp_payload, + sid_field_misordered, 14); + class2_ones = count_ones_under_mask(rtp_payload + 10, + class2_mask_unvoiced, 4); + } + class1_ones = sid_field_ones - class2_ones; + sid_field_zeros = 79 - sid_field_ones; + class1_zeros = 62 - class1_ones; + + /* frame classification logic recommended by ETSI */ + if (bci_flag) + invalid_sid_threshold = 16; + else + invalid_sid_threshold = 11; + + if (class1_zeros < 3) + sidc = OSMO_GSM631_SID_CLASS_VALID; + else if (sid_field_zeros < invalid_sid_threshold) + sidc = OSMO_GSM631_SID_CLASS_INVALID; + else + sidc = OSMO_GSM631_SID_CLASS_SPEECH; + + /* If the mode bits got corrupted and the frame was channel-decoded + * as unvoiced, it cannot be taken as valid SID because the bits + * that hold CN parameters have been misordered. Therefore, + * we have to turn it into invalid SID classification. + */ + if (mode_bits == 0 && sidc == OSMO_GSM631_SID_CLASS_VALID) + sidc = OSMO_GSM631_SID_CLASS_INVALID; + + /* ETSI's peculiar logic that "upgrades" BCI error flag to BFI + * (from lowest to highest error severity) when the decoded bit + * pattern matches a set criterion. We leave it up to applications + * whether they choose to apply this logic or not. If this logic + * is not wanted, pass NULL pointer as the last argument. + */ + if (bci_flag && bfi_from_bci && + sid_field_zeros >= 16 && sid_field_zeros <= 25) + *bfi_from_bci = true; + + return sidc; +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37558?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: I5f4eb65379646125b966cf182775b6e9348900bd Gerrit-Change-Number: 37558 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-sgsn: Use 2nd IP address on emulated HNBGW

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37557?usp=email ) Change subject: ttcn3-sgsn: Use 2nd IP address on emulated HNBGW ...................................................................... ttcn3-sgsn: Use 2nd IP address on emulated HNBGW In 3G, both HNBGW and GGSN talk GTPv1U, and osmo-sgsn uses Direct Tunnel feature to connect both together. Since GTPv1U uses a fixed port, we need 2 IP addresses, one set for the emulated GGSN and one for the emulated HNBGW. This is a preparation towards adding tests validating creation of PDP context in 3G, which was not yet tested. Related: SYS#5435 Change-Id: I21882dc5a9f5167ac9104d4ac48d5e5631505463 --- M ttcn3-sgsn-test/jenkins.sh M ttcn3-sgsn-test/osmo-stp.cfg A ttcn3-sgsn-test/ttcn3.sh 3 files changed, 42 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/37557/1 diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index e1f40f6..b047d80 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -11,6 +11,7 @@ set -e mkdir $VOL_BASE_DIR/sgsn-tester +cp "ttcn3.sh" "$VOL_BASE_DIR/sgsn-tester/" cp SGSN_Tests.cfg $VOL_BASE_DIR/sgsn-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/sgsn-tester/SGSN_Tests.cfg" @@ -24,6 +25,7 @@ network_create network_replace_subnet_in_configs +TTCN3_RAN_IPADDR="$SUB4_PREFIX.$SUBNET.104" echo Starting container with STP docker run --rm \ @@ -46,12 +48,15 @@ echo Starting container with SGSN testsuite docker run --rm \ + --cap-add=NET_ADMIN \ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ -e "OSMO_SUT_PORT=4245" \ + -e "EXTRA_IPADDR=${TTCN3_RAN_IPADDR}" \ -v $VOL_BASE_DIR/sgsn-tester:/data \ --name ${BUILD_TAG}-ttcn3-sgsn-test \ $DOCKER_ARGS \ - $REPO_USER/ttcn3-sgsn-test + $REPO_USER/ttcn3-sgsn-test \ + /data/ttcn3.sh diff --git a/ttcn3-sgsn-test/osmo-stp.cfg b/ttcn3-sgsn-test/osmo-stp.cfg index f1b6f49..3a7d0ab 100644 --- a/ttcn3-sgsn-test/osmo-stp.cfg +++ b/ttcn3-sgsn-test/osmo-stp.cfg @@ -22,8 +22,8 @@ asp virt-rnc0-0 23908 2905 m3ua local-ip 172.18.8.200 local-ip fd02:db8:8::200 - remote-ip 172.18.8.103 - remote-ip fd02:db8:8::103 + remote-ip 172.18.8.104 + remote-ip fd02:db8:8::104 role sg sctp-role server as virt-rnc0 m3ua diff --git a/ttcn3-sgsn-test/ttcn3.sh b/ttcn3-sgsn-test/ttcn3.sh new file mode 100755 index 0000000..9100bfa --- /dev/null +++ b/ttcn3-sgsn-test/ttcn3.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set +e +set -x + +if [[ -z "${EXTRA_IPADDR}" ]]; then + echo "env var EXTRA_IPADDR undefined!" + exit 1 +fi + +ip addr add "${EXTRA_IPADDR}" dev eth0 + +# https://bugzilla.redhat.com/show_bug.cgi?id=782042 +# IPv6 addresses may take an extra while to be available ('tentative' state): +while [ -n "$(ip -6 addr show tentative)" ]; do sleep 1; done + +ttcn3-docker-run sgsn SGSN_Tests -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37557?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: I21882dc5a9f5167ac9104d4ac48d5e5631505463 Gerrit-Change-Number: 37557 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/GTPv1C_Templates: Introduce template ts_GTPC_UpdatePdpRespGGSN

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37554?usp=email ) Change subject: library/GTPv1C_Templates: Introduce template ts_GTPC_UpdatePdpRespGGSN ...................................................................... library/GTPv1C_Templates: Introduce template ts_GTPC_UpdatePdpRespGGSN Will be used by SGSN_Tests in a follow-up patch. Change-Id: I91afc14eecfadb3e00ccb9b74794079a82ef884b --- M library/GTPv1C_Templates.ttcn 1 file changed, 66 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/37554/1 diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn index 2eb1d7e..fe0db2b 100644 --- a/library/GTPv1C_Templates.ttcn +++ b/library/GTPv1C_Templates.ttcn @@ -994,6 +994,61 @@ eua, recovery, pco)), seq) } + template (value) GTPC_PDUs ts_UpdatePdpRespGGSNPDU(OCT1 cause, OCT4 teid_data, OCT4 teid_ctrl, + octetstring ggsn_ip_sign, octetstring ggsn_ip_data, + OCT4 chg_id, template (omit) EndUserAddress eua := omit, + template (omit) Recovery_gtpc recovery := omit, + template (omit) ProtConfigOptions pco := omit) := { + updatePDPContextResponse := { + updatePDPContextResponseGGSN := { + + cause := { '00'O, cause }, + recovery := recovery, + teidDataI := { + type_gtpc := '00'O, + teidDataI := teid_data + }, + teidControlPlane := { + type_gtpc := '00'O, + teidControlPlane := teid_ctrl + }, + chargingID := { + type_gtpc := '7F'O, + chargingID := chg_id + }, + protConfigOptions := pco, + ggsn_addr_controlPlane := ts_GsnAddr(ggsn_ip_sign), + ggsn_addr_traffic := ts_GsnAddr(ggsn_ip_data), + alt_ggsn_addr_controlPane := omit, + alt_ggsn_addr_traffic := omit, + qualityOfServiceProfile := ts_QosDefault, + commonFlags := omit, + aPN_Restriction := omit, + mS_InfoChangeReportingAction := omit, + bearerControlMode := omit, + evolvedAllocationRetentionPriorityI := omit, + csg_information_reporting_action := omit, + aPN_AMBR := omit, + private_extension_gtpc := omit + } + } + } + + template (value) Gtp1cUnitdata ts_GTPC_UpdatePdpRespGGSN(Gtp1cPeer peer, uint16_t seq, OCT4 teid, + OCT1 cause, + OCT4 teid_ctrl, OCT4 teid_data, + octetstring ggsn_ip_sign, + octetstring ggsn_ip_data, OCT4 chg_id, + template (omit) EndUserAddress eua := omit, + template (omit) Recovery_gtpc recovery := omit, + template (omit) ProtConfigOptions pco := omit) := { + peer := peer, + gtpc := ts_GTP1C_PDU(updatePDPContextResponse, teid, + valueof(ts_UpdatePdpRespGGSNPDU(cause, teid_data, teid_ctrl, + ggsn_ip_sign, ggsn_ip_data, chg_id, + eua, recovery, pco)), seq) + } + /* PCO send base template */ template (value) ProtConfigOptions ts_PCO := { type_gtpc := '84'O, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37554?usp=email 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: I91afc14eecfadb3e00ccb9b74794079a82ef884b Gerrit-Change-Number: 37554 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/L3_Templates: Introduce templates for GMM Service Req/Acc/Rej

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37555?usp=email ) Change subject: library/L3_Templates: Introduce templates for GMM Service Req/Acc/Rej ...................................................................... library/L3_Templates: Introduce templates for GMM Service Req/Acc/Rej Those will be used by a follow-up patch in SGSN_Tests. Change-Id: Ia948a27e39cf11f1421396d15da32bd82ea9513c --- M library/L3_Templates.ttcn 1 file changed, 100 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/37555/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 710b0ea..d37ce0e 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -44,6 +44,15 @@ CM_ID_TYPE_PTMSI_RAI_PTMSI_SIG ('101'B) } +/* TS 24.008 10.5.5.20 Service type */ +type enumerated ServiceType { + SERVICE_TYPE_Signalling ('001'B), + SERVICE_TYPE_Data ('010'B), + SERVICE_TYPE_Paging_Response ('011'B), + SERVICE_TYPE_MBMS_Multicast_Service_Reception ('100'B), + SERVICE_TYPE_MBMS_Broadcast_Service_Reception ('101'B) +} + template ML3_Cause_TLV ts_ML3_Cause(BIT7 cause, BIT4 loc := '0001'B, BIT2 std := '11'B) := { elementIdentifier := '08'O, lengthIndicator := 0, /* overwritten */ @@ -148,7 +157,7 @@ /* send template for Mobile Identity (TMSI) */ -template MobileIdentityLV ts_MI_TMSI_LV(OCT4 tmsi) := { +template MobileIdentityLV ts_MI_TMSI_LV(template (value) OCT4 tmsi) := { lengthIndicator := 0, /* overwritten */ mobileIdentityV := { typeOfIdentity := '000'B, /* overwritten */ @@ -315,6 +324,14 @@ fop := '0'B }; +/* TS 24.008 10.5.7.1 PDPContextStatus */ +template (value) PDPContextStatusTLV ts_PDPContextStatusTLV(template (value) OCT2 status := '0000'O /* all inactive */) := { + elementIdentifier := '32'O, + lengthIndicator := 0, /* overwritten */ + valueField := status +}; + + /* Send template for LOCATION UPDATING REQUEST */ template (value) PDU_ML3_MS_NW ts_LU_REQ(template (value) LocationUpdatingType lu_type, template (value) MobileIdentityLV mi_lv, @@ -431,8 +448,8 @@ } } -template (value) CipheringKeySequenceNumberV ts_CKSN(integer key_seq) := { - keySequence := int2bit(key_seq, 3), +template (value) CipheringKeySequenceNumberV ts_CKSN(template (value) integer key_seq) := { + keySequence := int2bit(valueof(key_seq), 3), spare := '0'B } @@ -2974,6 +2991,75 @@ } } +template (value) ServiceTypeV ts_ServiceTypeV(template (value) ServiceType serviceType) := { + serviceType := int2bit(enum2int(valueof(serviceType)), 3), + spare := '0'B +} +template (present) ServiceTypeV tr_ServiceTypeV(template (present) BIT3 serviceType := ?) := { + serviceType := serviceType, + spare := '0'B +} + +/* 3GPP TS 24.008 9.4.20 Service Request (Iu mode only) */ +template (value) PDU_L3_MS_SGSN ts_GMM_SERVICE_REQ(template (value) ServiceType service_type, + template (value) OCT4 p_tmsi, + template (value) integer cksn := 0, + template (value) OCT2 pdp_status := '0000'O) := { + discriminator := '1000'B, /* overwritten */ + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + gprs_mm := { + serviceRequest := { + messageType := '00001100'B, /* overwritten */ + cipheringKeySeqNum := ts_CKSN(cksn), + serviceType := ts_ServiceTypeV(service_type), + ptmsi := ts_MI_TMSI_LV(p_tmsi), + pdpContextStatus := ts_PDPContextStatusTLV(pdp_status), + mBMS_ContextStatus := omit, + uplinkDataStatus := omit, + deviceProperties := omit + } + } + } +} + +/* 3GPP TS 24.008 9.4.21 Service Accept (Iu mode only) */ +template (present) PDU_L3_SGSN_MS tr_GMM_SERVICE_ACC(template PDPContextStatusTLV pdp_status := *) := { + discriminator := '1000'B, /* overwritten */ + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + gprs_mm := { + serviceAccept := { + messageType := '00001101'B, /* overwritten */ + pdpContextStatus := pdp_status, + mBMS_ContextStatus := * + } + } + } +} + +/* 3GPP TS 24.008 9.4.22 Service Reject (Iu mode only) */ +template (present) PDU_L3_SGSN_MS tr_GMM_SERVICE_REJ(template (present) GMM_CauseV gmmCause := ?, + template GPRSTimer2TLV t3346 := *) := { + discriminator := '1000'B, /* overwritten */ + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + gprs_mm := { + serviceReject := { + messageType := '00001110'B, /* overwritten */ + gmmCause := gmmCause, + t3346 := t3346 + } + } + } +} + template PDU_L3_MS_SGSN ts_GMM_DET_ACCEPT_MO := { discriminator := '0000'B, /* overwritten */ tiOrSkip := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37555?usp=email 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: Ia948a27e39cf11f1421396d15da32bd82ea9513c Gerrit-Change-Number: 37555 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/L3_Templates: Fix discriminator field in ts_GMM_DET_ACCEPT_MO

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37556?usp=email ) Change subject: library/L3_Templates: Fix discriminator field in ts_GMM_DET_ACCEPT_MO ...................................................................... library/L3_Templates: Fix discriminator field in ts_GMM_DET_ACCEPT_MO It says it's overwritten, so in practice it may not be important, but it's confusing for readers when figuring out which values are expected, eg when adding a new tr_ template which needs that field set right (not overwritten there). Change-Id: If9741953f98b7dd29749d335a5bd937fdfb62bc6 --- M library/L3_Templates.ttcn 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/37556/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index d37ce0e..c64a0d0 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -3061,7 +3061,7 @@ } template PDU_L3_MS_SGSN ts_GMM_DET_ACCEPT_MO := { - discriminator := '0000'B, /* overwritten */ + discriminator := '1000'B, /* overwritten */ tiOrSkip := { skipIndicator := '0000'B }, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37556?usp=email 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: If9741953f98b7dd29749d335a5bd937fdfb62bc6 Gerrit-Change-Number: 37556 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/GTP_Emulation: Check IMSI presence before returning if Condit...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37553?usp=email ) Change subject: library/GTP_Emulation: Check IMSI presence before returning if Conditional or Optional ...................................................................... library/GTP_Emulation: Check IMSI presence before returning if Conditional or Optional Change-Id: I73c683e62191a06212933391d424d608a14f8c1e --- M library/GTP_Emulation.ttcn 1 file changed, 60 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/37553/1 diff --git a/library/GTP_Emulation.ttcn b/library/GTP_Emulation.ttcn index f7c54a1..afe4217 100644 --- a/library/GTP_Emulation.ttcn +++ b/library/GTP_Emulation.ttcn @@ -118,11 +118,23 @@ if (ischosen(gtp.gtpc_pdu.createPDPContextRequest)) { return gtp.gtpc_pdu.createPDPContextRequest.imsi.digits; } else if (ischosen(gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestSGSN)) { - return gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestSGSN.imsi.digits; + if (ispresent(gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestSGSN.imsi.digits)) { + return gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestSGSN.imsi.digits; + } else { + return omit; + } } else if (ischosen(gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestGGSN)) { - return gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestGGSN.imsi.digits; + if (ispresent(gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestGGSN.imsi.digits)) { + return gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestGGSN.imsi.digits; + } else { + return omit; + } } else if (ischosen(gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestCGW)) { - return gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestCGW.imsi.digits; + if (ispresent(gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestCGW.imsi.digits)) { + return gtp.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestCGW.imsi.digits; + } else { + return omit; + } } else if (ischosen(gtp.gtpc_pdu.pdu_NotificationRequest)) { return gtp.gtpc_pdu.pdu_NotificationRequest.imsi.digits; } else if (ischosen(gtp.gtpc_pdu.sendRouteingInformationForGPRSRequest)) { @@ -133,8 +145,12 @@ return gtp.gtpc_pdu.failureReportRequest.imsi.digits; } else if (ischosen(gtp.gtpc_pdu.noteMS_GPRSPresentRequest)) { return gtp.gtpc_pdu.noteMS_GPRSPresentRequest.imsi.digits; - } else if (ischosen(gtp.gtpc_pdu.identificationResponse) ){ - return gtp.gtpc_pdu.identificationResponse.imsi.digits; + } else if (ischosen(gtp.gtpc_pdu.identificationResponse) ) { + if (ispresent(gtp.gtpc_pdu.identificationResponse.imsi.digits)) { + return gtp.gtpc_pdu.identificationResponse.imsi.digits; + } else { + return omit; + } } else if (ischosen(gtp.gtpc_pdu.sgsn_ContextRequest)) { if (ispresent(gtp.gtpc_pdu.sgsn_ContextRequest.imsi.digits)) { return gtp.gtpc_pdu.sgsn_ContextRequest.imsi.digits; @@ -148,9 +164,17 @@ return omit; } } else if (ischosen(gtp.gtpc_pdu.forwardRelocationRequest)) { - return gtp.gtpc_pdu.forwardRelocationRequest.imsi.digits; + if (ispresent(gtp.gtpc_pdu.forwardRelocationRequest.imsi.digits)) { + return gtp.gtpc_pdu.forwardRelocationRequest.imsi.digits; + } else { + return omit; + } } else if (ischosen(gtp.gtpc_pdu.relocationCancelRequest)) { - return gtp.gtpc_pdu.relocationCancelRequest.imsi.digits; + if (ispresent(gtp.gtpc_pdu.relocationCancelRequest.imsi.digits)) { + return gtp.gtpc_pdu.relocationCancelRequest.imsi.digits; + } else { + return omit; + } } else if (ischosen(gtp.gtpc_pdu.uERegistrationQueryRequest)) { return gtp.gtpc_pdu.uERegistrationQueryRequest.imsi.digits; } else if (ischosen(gtp.gtpc_pdu.uERegistrationQueryResponse)) { @@ -158,13 +182,29 @@ } else if (ischosen(gtp.gtpc_pdu.mBMSNotificationRequest)) { return gtp.gtpc_pdu.mBMSNotificationRequest.imsi.digits; } else if (ischosen(gtp.gtpc_pdu.createMBMSContextRequest)) { - return gtp.gtpc_pdu.createMBMSContextRequest.imsi.digits; + if (ispresent(gtp.gtpc_pdu.createMBMSContextRequest.imsi.digits)) { + return gtp.gtpc_pdu.createMBMSContextRequest.imsi.digits; + } else { + return omit; + } } else if (ischosen(gtp.gtpc_pdu.deleteMBMSContextRequest)) { - return gtp.gtpc_pdu.deleteMBMSContextRequest.imsi.digits; + if (ispresent(gtp.gtpc_pdu.deleteMBMSContextRequest.imsi.digits)) { + return gtp.gtpc_pdu.deleteMBMSContextRequest.imsi.digits; + } else { + return omit; + } } else if (ischosen(gtp.gtpc_pdu.mS_InfoChangeNotificationRequest)) { - return gtp.gtpc_pdu.mS_InfoChangeNotificationRequest.imsi.digits; + if (ispresent(gtp.gtpc_pdu.mS_InfoChangeNotificationRequest.imsi.digits)) { + return gtp.gtpc_pdu.mS_InfoChangeNotificationRequest.imsi.digits; + } else { + return omit; + } } else if (ischosen(gtp.gtpc_pdu.mS_InfoChangeNotificationResponse)) { - return gtp.gtpc_pdu.mS_InfoChangeNotificationResponse.imsi.digits; + if (ispresent(gtp.gtpc_pdu.mS_InfoChangeNotificationResponse.imsi.digits)) { + return gtp.gtpc_pdu.mS_InfoChangeNotificationResponse.imsi.digits; + } else { + return omit; + } } else { return omit; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37553?usp=email 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: I73c683e62191a06212933391d424d608a14f8c1e Gerrit-Change-Number: 37553 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: Use template ts_RAB_SMdL

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37552?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: msc: Use template ts_RAB_SMdL ...................................................................... msc: Use template ts_RAB_SMdL Change-Id: I768aad762c4fa6c0d3a6d0effd7a7a1aabb3488f --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 17 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/37552/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37552?usp=email 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: I768aad762c4fa6c0d3a6d0effd7a7a1aabb3488f Gerrit-Change-Number: 37552 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

11 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024