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

[S] Change in osmo-tetra[master]: Added support for slot stealing
by Jenkins Builder 26 Jul '23

26 Jul '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33942 ) Change subject: Added support for slot stealing ...................................................................... Patch Set 1: (1 comment) File src/lower_mac/tetra_lower_mac.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10054): https://gerrit.osmocom.org/c/osmo-tetra/+/33942/comment/9440ff20_f6bb4dd8 PS1, Line 192: if (tms->cur_burst.is_traffic && type == TPSAP_T_NDB && blk_num == BLK_1) { braces {} are not necessary for single statement blocks -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I01a112e6e74f75401649d358b8f98c6248d2522b Gerrit-Change-Number: 33942 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 26 Jul 2023 15:32:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-tetra[master]: Added support for slot stealing
by wbokslag 26 Jul '23

26 Jul '23

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33942 ) Change subject: Added support for slot stealing ...................................................................... Added support for slot stealing Slot stealing is how a traffic slot can be partially or fully "stolen" by a control channel. This patch adds support for that and maintains the stealing status in the tetra_mac_state. This can be used to prevent passing a signalling half slot to the voice decoder. Change-Id: I01a112e6e74f75401649d358b8f98c6248d2522b --- M src/lower_mac/tetra_lower_mac.c M src/tetra_common.h 2 files changed, 29 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/42/33942/1 diff --git a/src/lower_mac/tetra_lower_mac.c b/src/lower_mac/tetra_lower_mac.c index 2a2cbbe..2ff8057 100644 --- a/src/lower_mac/tetra_lower_mac.c +++ b/src/lower_mac/tetra_lower_mac.c @@ -186,8 +186,15 @@ DEBUGP("%s %s type4: %s\n", tbp->name, time_str, osmo_ubit_dump(type4, tbp->type345_bits)); + /* Handle block 1 slot stealing, see clause 19.4.4 */ + /* Block 1 is stolen if AACH says slot is traffic and burst used training sequence 1 */ + /* Block 2 is stolen if indicated in stolen block 1 resource len (-2) */ + if (tms->cur_burst.is_traffic && type == TPSAP_T_NDB && blk_num == BLK_1) { + tms->cur_burst.blk1_stolen = true; + } + /* If this is a traffic channel, dump. */ - if ((type == TPSAP_T_SCH_F) && tms->cur_burst.is_traffic && tms->dumpdir) { + if (tms->cur_burst.is_traffic && (type == TPSAP_T_SCH_F || (blk_num == BLK_2 && !tms->cur_burst.blk2_stolen))) { char fname[PATH_MAX]; int16_t block[690]; FILE *f; @@ -229,6 +236,7 @@ f = fopen(fname, "a"); fprintf(f, "%d\n", tms->ssi); fclose(f); + goto out; } if (tbp->interleave_a) { @@ -333,6 +341,7 @@ msg->l4h = 0; } +out: talloc_free(msg); talloc_free(ttp); } diff --git a/src/tetra_common.h b/src/tetra_common.h index dc538d0..3296a3f 100644 --- a/src/tetra_common.h +++ b/src/tetra_common.h @@ -3,8 +3,12 @@ #include <stdint.h> #include "tetra_mac_pdu.h" +#include <stdbool.h> #include <osmocom/core/linuxlist.h> +#include "tetra_common.h" +#include "tetra_mac_pdu.h" + #ifdef DEBUG #define DEBUGP(x, args...) printf(x, ## args) #else @@ -46,12 +50,16 @@ struct llist_head voice_channels; struct { int is_traffic; + bool blk1_stolen; + bool blk2_stolen; } cur_burst; struct tetra_si_decoded last_sid; char *dumpdir; /* Where to save traffic channel dump */ int ssi; /* SSI */ int tsn; /* Timeslon number */ + int usage_marker; /* Usage marker (if addressed)*/ + int addr_type; }; void tetra_mac_state_init(struct tetra_mac_state *tms); -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I01a112e6e74f75401649d358b8f98c6248d2522b Gerrit-Change-Number: 33942 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-trx[master]: ms: drop the tx burst padding
by Hoernchen 26 Jul '23

26 Jul '23

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/33926 to look at the new patch set (#2). Change subject: ms: drop the tx burst padding ...................................................................... ms: drop the tx burst padding Change-Id: Ied5c3ab5dde975e11b0ef6d9cbc86be19173c4e8 --- M Transceiver52M/ms/ms.cpp 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/26/33926/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ied5c3ab5dde975e11b0ef6d9cbc86be19173c4e8 Gerrit-Change-Number: 33926 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[L] Change in osmo-trx[master]: ms/va: add test tool and data
by Hoernchen 26 Jul '23

26 Jul '23

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/33929 to look at the new patch set (#3). Change subject: ms/va: add test tool and data ...................................................................... ms/va: add test tool and data Change-Id: Ie38ed4996134e84ad0481872a743299bb442b3db move burstgen Change-Id: Ie2cf3066500062920201c6fa4c2a4286fd5bbcb0 --- M .gitignore M utils/Makefile.am A utils/va-test/burst-gen.cpp A utils/va-test/demodbits_tsc7.s8 A utils/va-test/nb_chunk_tsc7.cfile 5 files changed, 562 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/29/33929/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie2cf3066500062920201c6fa4c2a4286fd5bbcb0 Gerrit-Change-Number: 33929 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-trx[master]: transceiver: add experimental viterbi equalizer support
by Hoernchen 26 Jul '23

26 Jul '23

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/33930 to look at the new patch set (#3). Change subject: transceiver: add experimental viterbi equalizer support ...................................................................... transceiver: add experimental viterbi equalizer support The VA is already being used by the ms side and is part of the original gsm design. It only works for gmsk, 4sps, and needs a bit of rx burst scaling and burst shifting. Change-Id: I9d7a4ff72e323832a94d885d5714fcde01ceeb3d --- M CommonLibs/config_defs.h M CommonLibs/trx_vty.c M Transceiver52M/Makefile.am M Transceiver52M/Transceiver.cpp M Transceiver52M/osmo-trx.cpp M Transceiver52M/radioInterface.h 6 files changed, 131 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/30/33930/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9d7a4ff72e323832a94d885d5714fcde01ceeb3d Gerrit-Change-Number: 33930 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in pysim[master]: construct: add adapter Utf8Adapter to safely interpret utf8 text
by dexter 26 Jul '23

26 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33941 ) Change subject: construct: add adapter Utf8Adapter to safely interpret utf8 text ...................................................................... construct: add adapter Utf8Adapter to safely interpret utf8 text Uninitialized Files, File records or fields in a File record or File usually contain a string of 0xff bytes. This becomes a problem when the content is normally encoded/decoded as utf8 since by the construct parser. The parser will throw an expection when it tries to decode the 0xff string as utf8. This is especially a serious problem in pySim-trace where an execption stops the parser. Let's fix this by interpreting a string of 0xff as an empty string. Related: OS#6094 Change-Id: Id114096ccb8b7ff8fcc91e1ef3002526afa09cb7 --- M pySim/construct.py M pySim/ts_31_102.py M pySim/ts_31_103.py 3 files changed, 44 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/33941/1 diff --git a/pySim/construct.py b/pySim/construct.py index ab44a63..af96b49 100644 --- a/pySim/construct.py +++ b/pySim/construct.py @@ -6,6 +6,7 @@ from construct.lib import integertypes from pySim.utils import b2h, h2b, swap_nibbles import gsm0338 +import codecs """Utility code related to the integration of the 'construct' declarative parser.""" @@ -34,6 +35,18 @@ def _encode(self, obj, context, path): return h2b(obj) +class Utf8Adapter(Adapter): + """convert a bytes() type that contains utf8 encoded text to human readable text.""" + + def _decode(self, obj, context, path): + # In case the string contains only 0xff bytes we interpret it as an empty string + if obj == b'\xff' * len(obj): + return "" + return codecs.decode(obj, "utf-8") + + def _encode(self, obj, context, path): + return codecs.encode(obj, "utf-8") + class BcdAdapter(Adapter): """convert a bytes() type to a string of BCD nibbles.""" diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 5db3e88..dc674b2 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -872,7 +872,7 @@ class ePDGId(BER_TLV_IE, tag=0x80, nested=[]): _construct = Struct('type_of_ePDG_address'/Enum(Byte, FQDN=0, IPv4=1, IPv6=2), 'ePDG_address'/Switch(this.type_of_address, - {'FQDN': GreedyString("utf8"), + {'FQDN': Utf8Adapter(GreedyBytes), 'IPv4': HexAdapter(GreedyBytes), 'IPv6': HexAdapter(GreedyBytes)})) @@ -951,15 +951,15 @@ class EF_SUPI_NAI(TransparentEF): class NetworkSpecificIdentifier(TLV_IE, tag=0x80): # RFC 7542 encoded as UTF-8 string - _construct = GreedyString("utf8") + _construct = Utf8Adapter(GreedyBytes) class GlobalLineIdentifier(TLV_IE, tag=0x81): # TS 23.003 clause 28.16.2 - _construct = GreedyString("utf8") + _construct = Utf8Adapter(GreedyBytes) class GlobalCableIdentifier(TLV_IE, tag=0x82): # TS 23.003 clause 28.15.2 - _construct = GreedyString("utf8") + _construct = Utf8Adapter(GreedyBytes) class NAI_TLV_Collection(TLV_IE_Collection, nested=[NetworkSpecificIdentifier, GlobalLineIdentifier, GlobalCableIdentifier]): @@ -984,7 +984,7 @@ # TS 31.102 Section 4.4.11.13 class EF_TN3GPPSNN(TransparentEF): class ServingNetworkName(BER_TLV_IE, tag=0x80): - _construct = GreedyString("utf8") + _construct = Utf8Adapter(GreedyBytes) def __init__(self, fid='4f0c', sfid=0x0c, name='EF.TN3GPPSNN', desc='Trusted non-3GPP Serving network names list', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 5f374cb..19ade2b 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -30,6 +30,7 @@ from pySim.ts_31_102_telecom import EF_UServiceTable import pySim.ts_102_221 from pySim.ts_102_221 import EF_ARR +from pySim.construct import * # Mapping between ISIM Service Number and its description EF_IST_map = { @@ -62,8 +63,9 @@ ( '803137333830303630303030303031303140696d732e6d6e633030302e6d63633733382e336770706e6574776f726b2e6f7267', { "nai": "738006000000101(a)ims.mnc000.mcc738.3gppnetwork.org" } ), ] + class nai(BER_TLV_IE, tag=0x80): - _construct = GreedyString("utf8") + _construct = Utf8Adapter(GreedyBytes) def __init__(self, fid='6f02', sfid=0x02, name='EF.IMPI', desc='IMS private user identity', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) @@ -76,7 +78,7 @@ { "domain": "ims.mnc000.mcc738.3gppnetwork.org" } ), ] class domain(BER_TLV_IE, tag=0x80): - _construct = GreedyString("utf8") + _construct = Utf8Adapter(GreedyBytes) def __init__(self, fid='6f03', sfid=0x05, name='EF.DOMAIN', desc='Home Network Domain Name', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) @@ -89,7 +91,7 @@ { "impu": "sip:738006000000101@ims.mnc000.mcc738.3gppnetwork.org" } ), ] class impu(BER_TLV_IE, tag=0x80): - _construct = GreedyString("utf8") + _construct = Utf8Adapter(GreedyBytes) def __init__(self, fid='6f04', sfid=0x04, name='EF.IMPU', desc='IMS public user identity', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) @@ -165,7 +167,7 @@ # TS 31.103 Section 4.2.16 class EF_UICCIARI(LinFixedEF): class iari(BER_TLV_IE, tag=0x80): - _construct = GreedyString("utf8") + _construct = Utf8Adapter(GreedyBytes) def __init__(self, fid='6fe7', sfid=None, name='EF.UICCIARI', desc='UICC IARI', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) @@ -232,7 +234,7 @@ # TS 31.103 Section 4.2.20 class EF_WebRTCURI(TransparentEF): class uri(BER_TLV_IE, tag=0x80): - _construct = GreedyString("utf8") + _construct = Utf8Adapter(GreedyBytes) def __init__(self, fid='6ffa', sfid=None, name='EF.WebRTCURI', desc='WebRTC URI', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id114096ccb8b7ff8fcc91e1ef3002526afa09cb7 Gerrit-Change-Number: 33941 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-trx[master]: ms/va: add test tool and data
by Jenkins Builder 26 Jul '23

26 Jul '23

Attention is currently required from: Hoernchen. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33929 ) Change subject: ms/va: add test tool and data ...................................................................... Patch Set 2: (2 comments) File utils/va-test/burst-gen.cpp: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10047): https://gerrit.osmocom.org/c/osmo-trx/+/33929/comment/7969f53b_62da9bb3 PS2, Line 441: tsc 5 off: 66 - 82 = tsc 16 midamble (26-5-5) trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10047): https://gerrit.osmocom.org/c/osmo-trx/+/33929/comment/7cad9d08_1ba7a4de PS2, Line 442: tsc center: trailing whitespace -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie2cf3066500062920201c6fa4c2a4286fd5bbcb0 Gerrit-Change-Number: 33929 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jul 2023 15:16:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-trx[master]: transceiver: add experimental viterbi equalizer support
by Jenkins Builder 26 Jul '23

26 Jul '23

Attention is currently required from: Hoernchen. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33930 ) Change subject: transceiver: add experimental viterbi equalizer support ...................................................................... Patch Set 2: (1 comment) File CommonLibs/trx_vty.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10046): https://gerrit.osmocom.org/c/osmo-trx/+/33930/comment/524caf4a_599ac832 PS2, Line 351: if (strcmp("disable", argv[0]) == 0) { braces {} are not necessary for any arm of this statement -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9d7a4ff72e323832a94d885d5714fcde01ceeb3d Gerrit-Change-Number: 33930 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jul 2023 15:16:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: ms: update osmocom-bb
by Hoernchen 26 Jul '23

26 Jul '23

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/33927 to look at the new patch set (#2). Change subject: ms: update osmocom-bb ...................................................................... ms: update osmocom-bb Change-Id: I6f9fca7a4d6a02e82bf406fd136c5bde96bb93af --- M Transceiver52M/Makefile.am M Transceiver52M/ms/ms_upper.cpp M osmocom-bb 3 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/27/33927/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I6f9fca7a4d6a02e82bf406fd136c5bde96bb93af Gerrit-Change-Number: 33927 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-trx[master]: devices: add freq/gain override for uhd
by pespin 26 Jul '23

26 Jul '23

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32764 ) Change subject: devices: add freq/gain override for uhd ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3c1b9a067cafc6d696b9aa2da8ee0480ec1e094f Gerrit-Change-Number: 32764 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jul 2023 15:09:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0