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

[S] Change in libosmo-gprs[master]: sndcp: Update n201_u & n201_i indicatd by LLC layer
by laforge 27 Jul '23

27 Jul '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33950 ) Change subject: sndcp: Update n201_u & n201_i indicatd by LLC layer ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7429701ae49c2a694dcad3e3d5ec639ab9927f5b Gerrit-Change-Number: 33950 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Jul 2023 06:56:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-gprs[master]: llc: Submit LL-XID-IND to L3 if N201-U or N201-I changes
by laforge 27 Jul '23

27 Jul '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33949 ) Change subject: llc: Submit LL-XID-IND to L3 if N201-U or N201-I changes ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8135c5cef4df69a7c3a540050da0837bf2059df2 Gerrit-Change-Number: 33949 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Jul 2023 06:56:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-gprs[master]: llc: Apply N201-I & N201-U requested by the network
by laforge 27 Jul '23

27 Jul '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33948 ) Change subject: llc: Apply N201-I & N201-U requested by the network ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2f2cb8b831266b8e4251c2832e6545bef776658c Gerrit-Change-Number: 33948 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Jul 2023 06:55:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: llc: Introduce function to log XID fields and use upon Rx/Tx
by laforge 27 Jul '23

27 Jul '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33947 ) Change subject: llc: Introduce function to log XID fields and use upon Rx/Tx ...................................................................... Patch Set 3: (1 comment) File src/llc/llc_xid.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/33947/comment/a76ea39d_61db66a5 PS3, Line 325: void gprs_llc_dump_xid_fields(const struct gprs_llc_xid_field *xid_fields, I think it would be better to have some kind of visual begin + end marker in the log, to clearly see at one point where one LLC message starts and ends. One possible option is to have indenting (either fixed or caller-specified). A caller-specified "const char *prefix" prepended to every string covers that case, and also allows to specify further context (like the subscriber, if we ever move the SGSN over to this lib). -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8c6b07305c0bcecb4e1681967884a3e62c813592 Gerrit-Change-Number: 33947 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Jul 2023 06:55:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: llc: xid: Introduce some helper internal functions to make code easie...
by laforge 27 Jul '23

27 Jul '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33946 ) Change subject: llc: xid: Introduce some helper internal functions to make code easier to follow ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8c0163583efc2720a4b2675ce93293c184f80d0c Gerrit-Change-Number: 33946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Jul 2023 06:53:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

27 Jul '23

laforge has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

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

27 Jul '23

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33941 ) Change subject: construct: add adapter Utf8Adapter to safely interpret utf8 text ...................................................................... Patch Set 1: Code-Review+2 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Jul 2023 06:52:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

27 Jul '23

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33941 ) Change subject: construct: add adapter Utf8Adapter to safely interpret utf8 text ...................................................................... Patch Set 1: Code-Review+1 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jul 2023 21:50:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: sndcp: Initialize N201-U & N201-I to default settings
by pespin 26 Jul '23

26 Jul '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33952 ) Change subject: sndcp: Initialize N201-U & N201-I to default settings ...................................................................... sndcp: Initialize N201-U & N201-I to default settings LLC is only expected to signal new values if SNDCP XID params are received, or if the default N201 values change. Change-Id: I68f54d329b326895ed8f010cf50f20fa30948d30 --- M src/sndcp/sndcp.c 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/52/33952/1 diff --git a/src/sndcp/sndcp.c b/src/sndcp/sndcp.c index 5decfac..d71cac9 100644 --- a/src/sndcp/sndcp.c +++ b/src/sndcp/sndcp.c @@ -34,6 +34,23 @@ struct gprs_sndcp_ctx *g_sndcp_ctx; +struct gprs_sndcp_llc_params { + uint16_t n201_u; + uint16_t n201_i; +}; + +/* Section 8.9.9 LLC layer parameter default values */ +static const struct gprs_sndcp_llc_params llc_default_params[GPRS_SNDCP_NUM_NSAPIS] = { + [1] = { .n201_u = 400, }, + [2] = { .n201_u = 270, }, + [3] = { .n201_u = 500, .n201_i = 1503, }, + [5] = { .n201_u = 500, .n201_i = 1503, }, + [7] = { .n201_u = 270, }, + [8] = { .n201_u = 270, }, + [9] = { .n201_u = 500, .n201_i = 1503, }, + [11] = { .n201_u = 500, .n201_i = 1503, }, +}; + int osmo_gprs_sndcp_init(enum osmo_gprs_sndcp_location location) { if (g_sndcp_ctx) @@ -126,6 +143,9 @@ sne->rx_state = GPRS_SNDCP_RX_S_FIRST; INIT_LLIST_HEAD(&sne->defrag.frag_list); + sne->n201_u = llc_default_params[llc_sapi].n201_u; + sne->n201_i = llc_default_params[llc_sapi].n201_i; + sne->snme = snme; gprs_sndcp_snme_attach_sne(snme, sne); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I68f54d329b326895ed8f010cf50f20fa30948d30 Gerrit-Change-Number: 33952 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

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

26 Jul '23

laforge has submitted this change. ( 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, 28 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/lower_mac/tetra_lower_mac.c b/src/lower_mac/tetra_lower_mac.c index 2a2cbbe..907f1dc 100644 --- a/src/lower_mac/tetra_lower_mac.c +++ b/src/lower_mac/tetra_lower_mac.c @@ -186,8 +186,14 @@ 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 +235,7 @@ f = fopen(fname, "a"); fprintf(f, "%d\n", tms->ssi); fclose(f); + goto out; } if (tbp->interleave_a) { @@ -333,6 +340,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: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0