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

Change in osmocom-bb[master]: trxcon: link trxcon against libl1sched.la directly

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30361 ) Change subject: trxcon: link trxcon against libl1sched.la directly ...................................................................... trxcon: link trxcon against libl1sched.la directly Change-Id: I8a1319077167f118d1909a8ab33d33a73f47541a Related: OS#5599 --- M src/host/trxcon/src/Makefile.am 1 file changed, 4 insertions(+), 12 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/src/Makefile.am b/src/host/trxcon/src/Makefile.am index 34b7a3c..a286f2a 100644 --- a/src/host/trxcon/src/Makefile.am +++ b/src/host/trxcon/src/Makefile.am @@ -28,12 +28,6 @@ sched_trx.c \ $(NULL) -libl1sched_la_LIBADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOCODING_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - noinst_LTLIBRARIES += libtrxcon.la @@ -44,12 +38,6 @@ l1ctl.c \ $(NULL) -libtrxcon_la_LIBADD = \ - libl1sched.la \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - bin_PROGRAMS = trxcon @@ -62,4 +50,8 @@ trxcon_LDADD = \ libtrxcon.la \ + libl1sched.la \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOCODING_LIBS) \ + $(LIBOSMOGSM_LIBS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8a1319077167f118d1909a8ab33d33a73f47541a Gerrit-Change-Number: 30361 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: link trxcon against libl1sched.la directly

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30361 ) Change subject: trxcon: link trxcon against libl1sched.la directly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8a1319077167f118d1909a8ab33d33a73f47541a Gerrit-Change-Number: 30361 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 03 Dec 2022 08:10:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in pysim[master]: pySim-trace: Also consider SW 91xx as successful

by fixeria

Attention is currently required from: laforge, jtavares, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/30440 ) Change subject: pySim-trace: Also consider SW 91xx as successful ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4170721be30342bdce7fb4beeefd1927263ca6 Gerrit-Change-Number: 30440 Gerrit-PatchSet: 1 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: jtavares <jtavares(a)kvh.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: jtavares <jtavares(a)kvh.com> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 03 Dec 2022 08:06:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in pysim[master]: pySim-trace: Fix missing MANAGE CHANNEL decode

by fixeria

Attention is currently required from: laforge, jtavares, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/30439 ) Change subject: pySim-trace: Fix missing MANAGE CHANNEL decode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iac5b24c14d2b68d526ab347462b72548b8731b30 Gerrit-Change-Number: 30439 Gerrit-PatchSet: 1 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: jtavares <jtavares(a)kvh.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: jtavares <jtavares(a)kvh.com> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 03 Dec 2022 08:05:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in pysim[master]: pySim-trace: Add support for reading GSMTAP from pcap files

by fixeria

Attention is currently required from: laforge, jtavares, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/30438 ) Change subject: pySim-trace: Add support for reading GSMTAP from pcap files ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I46d42774b39a2735500ff5804206ddcfa545568c Gerrit-Change-Number: 30438 Gerrit-PatchSet: 1 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: jtavares <jtavares(a)kvh.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: jtavares <jtavares(a)kvh.com> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 03 Dec 2022 08:05:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-trx[master]: bladerf xa4 support

by manawyrm

Attention is currently required from: Hoernchen, pespin. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30413 ) Change subject: bladerf xa4 support ...................................................................... Patch Set 4: (1 comment) File Transceiver52M/device/bladerf/bladerf.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/30413/comment/61b785b4_56a11285 PS4, Line 502: RX fucked Well, that's true, but a different error message might still be favorable 😊 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I455c34bb9520d5f09eeb1ac76fceb4bdea94d1ac Gerrit-Change-Number: 30413 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 03 Dec 2022 01:19:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in pysim[master]: pySim-trace: Also consider SW 91xx as successful

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/30440 ) Change subject: pySim-trace: Also consider SW 91xx as successful ...................................................................... pySim-trace: Also consider SW 91xx as successful Change-Id: I9e4170721be30342bdce7fb4beeefd1927263ca6 --- M pySim/apdu/__init__.py 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/30440/1 diff --git a/pySim/apdu/__init__.py b/pySim/apdu/__init__.py index 3961fe9..1d1174d 100644 --- a/pySim/apdu/__init__.py +++ b/pySim/apdu/__init__.py @@ -135,7 +135,12 @@ if callable(method): return method() # default case: only 9000 is success - return self.sw == b'\x90\x00' + if self.sw == b'\x90\x00': + return True + # This is not really a generic positive APDU SW but specific to UICC/SIM + if self.sw[0] == 0x91: + return True + return False class ApduCommand(Apdu, metaclass=ApduCommandMeta): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4170721be30342bdce7fb4beeefd1927263ca6 Gerrit-Change-Number: 30440 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in pysim[master]: pySim-trace: Fix missing MANAGE CHANNEL decode

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/30439 ) Change subject: pySim-trace: Fix missing MANAGE CHANNEL decode ...................................................................... pySim-trace: Fix missing MANAGE CHANNEL decode old output: 00 MANAGE CHANNEL 01 9110 new output: 00 MANAGE CHANNEL 01 9110 {'mode': 'open_channel', 'created_channel': 1} Change-Id: Iac5b24c14d2b68d526ab347462b72548b8731b30 --- M pySim/apdu/ts_102_221.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/39/30439/1 diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index fb2f375..ea45602 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -393,10 +393,12 @@ manage_channel = rs.get_lchan_by_cla(self.cla) manage_channel.add_lchan(created_channel_nr) self.col_id = '%02u' % created_channel_nr + return {'mode': mode, 'created_channel': created_channel_nr } elif mode == 'close_channel': closed_channel_nr = self.cmd_dict['p2'] rs.del_lchan(closed_channel_nr) self.col_id = '%02u' % closed_channel_nr + return {'mode': mode, 'closed_channel': closed_channel_nr } else: raise ValueError('Unsupported MANAGE CHANNEL P1=%02X' % self.p1) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iac5b24c14d2b68d526ab347462b72548b8731b30 Gerrit-Change-Number: 30439 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in pysim[master]: pySim-trace: Add support for reading GSMTAP from pcap files

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/30438 ) Change subject: pySim-trace: Add support for reading GSMTAP from pcap files ...................................................................... pySim-trace: Add support for reading GSMTAP from pcap files So far we supported * GSMTAP live traces via a UDP socket * RSPRO traces from pcap files (or live) We were lacking support for reading GSMTAP stored in pcap, which is what this patch implements. Change-Id: I46d42774b39a2735500ff5804206ddcfa545568c --- M pySim-trace.py A pySim/apdu_source/pyshark_gsmtap.py 2 files changed, 98 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/38/30438/1 diff --git a/pySim-trace.py b/pySim-trace.py index 33cb75a..79069a6 100755 --- a/pySim-trace.py +++ b/pySim-trace.py @@ -18,6 +18,7 @@ from pySim.apdu_source.gsmtap import GsmtapApduSource from pySim.apdu_source.pyshark_rspro import PysharkRsproPcap, PysharkRsproLive +from pySim.apdu_source.pyshark_gsmtap import PysharkGsmtapPcap from pySim.apdu.ts_102_221 import UiccSelect, UiccStatus @@ -130,6 +131,11 @@ parser_gsmtap.add_argument('-p', '--bind-port', default=4729, help='Local UDP port') +parser_gsmtap_pyshark_pcap = subparsers.add_parser('gsmtap-pyshark-pcap', help=""" + PCAP file containing GSMTAP (SIM APDU) communication; processed via pyshark.""") +parser_gsmtap_pyshark_pcap.add_argument('-f', '--pcap-file', required=True, + help='Name of the PCAP[ng] file to be read') + parser_rspro_pyshark_pcap = subparsers.add_parser('rspro-pyshark-pcap', help=""" PCAP file containing RSPRO (osmo-remsim) communication; processed via pyshark. REQUIRES OSMOCOM PATCHED WIRESHARK!""") @@ -153,6 +159,8 @@ s = PysharkRsproPcap(opts.pcap_file) elif opts.source == 'rspro-pyshark-live': s = PysharkRsproLive(opts.interface) + elif opts.source == 'gsmtap-pyshark-pcap': + s = PysharkGsmtapPcap(opts.pcap_file) tracer = Tracer(source=s, suppress_status=opts.suppress_status, suppress_select=opts.suppress_select) logger.info('Entering main loop...') diff --git a/pySim/apdu_source/pyshark_gsmtap.py b/pySim/apdu_source/pyshark_gsmtap.py new file mode 100644 index 0000000..8ea9ae7 --- /dev/null +++ b/pySim/apdu_source/pyshark_gsmtap.py @@ -0,0 +1,90 @@ +# coding=utf-8 + +# (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/>. + + +import sys +import logging +from pprint import pprint as pp +from typing import Tuple +import pyshark + +from pySim.utils import h2b, b2h +from pySim.apdu import Tpdu +from pySim.gsmtap import GsmtapMessage +from . import ApduSource, PacketType, CardReset + +from pySim.apdu.ts_102_221 import ApduCommands as UiccApduCommands +from pySim.apdu.ts_31_102 import ApduCommands as UsimApduCommands +from pySim.apdu.global_platform import ApduCommands as GpApduCommands +ApduCommands = UiccApduCommands + UsimApduCommands + GpApduCommands + +logger = logging.getLogger(__name__) + +class _PysharkGsmtap(ApduSource): + """APDU Source [provider] base class for reading GSMTAP SIM APDU via tshark.""" + + def __init__(self, pyshark_inst): + self.pyshark = pyshark_inst + self.bank_id = None + self.bank_slot = None + self.cmd_tpdu = None + super().__init__() + + def read_packet(self) -> PacketType: + p = self.pyshark.next() + return self._parse_packet(p) + + def _set_or_verify_bank_slot(self, bsl: Tuple[int, int]): + """Keep track of the bank:slot to make sure we don't mix traces of multiple cards""" + if not self.bank_id: + self.bank_id = bsl[0] + self.bank_slot = bsl[1] + else: + if self.bank_id != bsl[0] or self.bank_slot != bsl[1]: + raise ValueError('Received data for unexpected B(%u:%u)' % (bsl[0], bsl[1])) + + def _parse_packet(self, p) -> PacketType: + udp_layer = p['udp'] + udp_payload_hex = udp_layer.get_field('payload').replace(':','') + gsmtap = GsmtapMessage(h2b(udp_payload_hex)) + gsmtap_msg = gsmtap.decode() + if gsmtap_msg['type'] != 'sim': + raise ValueError('Unsupported GSMTAP type %s' % gsmtap_msg['type']) + sub_type = gsmtap_msg['sub_type'] + if sub_type == 'apdu': + return ApduCommands.parse_cmd_bytes(gsmtap_msg['body']) + elif sub_type == 'atr': + # card has been reset + return CardReset() + elif sub_type in ['pps_req', 'pps_rsp']: + # simply ignore for now + pass + else: + raise ValueError('Unsupported GSMTAP-SIM sub-type %s' % sub_type) + +class PysharkGsmtapPcap(_PysharkGsmtap): + """APDU Source [provider] class for reading GSMTAP from a PCAP + file via pyshark, which in turn uses tshark (part of wireshark). + """ + def __init__(self, pcap_filename): + """ + Args: + pcap_filename: File name of the pcap file to be opened + """ + pyshark_inst = pyshark.FileCapture(pcap_filename, display_filter='gsm_sim', use_json=True, keep_packets=False) + super().__init__(pyshark_inst) + -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I46d42774b39a2735500ff5804206ddcfa545568c Gerrit-Change-Number: 30438 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: gsmtap.h: Add definitions for various ISDN sub-types

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30437 ) Change subject: gsmtap.h: Add definitions for various ISDN sub-types ...................................................................... gsmtap.h: Add definitions for various ISDN sub-types We've started to encapsulate a varieth of ISDN related formats as sub-types to GSMTAP_TYPE_E1T1 for quite some time. Let's add some more formats, such as V5EF, V.110, V.120, X.75 and H.221 For the HDLC based V5EF, V.110, V.120 and X.75 the payload format is clear. For V.110 and H.221 we will need to specify how the actual payload looks like. Change-Id: I8dee0f730cf91d6f9133d5c57f653e669ec8d598 --- M include/osmocom/core/gsmtap.h 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index 11b2d13..b0985f0 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -179,6 +179,11 @@ #define GSMTAP_E1T1_RAW 0x03 /* raw/transparent B-channel */ #define GSMTAP_E1T1_TRAU16 0x04 /* 16k TRAU frames; sub-slot 0-3 */ #define GSMTAP_E1T1_TRAU8 0x05 /* 8k TRAU frames; sub-slot 0-7 */ +#define GSMTAP_E1T1_V5EF 0x06 /* V5 Envelope Function */ +#define GSMTAP_E1T1_X75 0x07 /* X.75 B-channel data */ +#define GSMTAP_E1T1_V120 0x08 /* V.120 B-channel data */ +#define GSMTAP_E1T1_V110 0x09 /* V.110 B-channel data */ +#define GSMTAP_E1T1_H221 0x0a /* H.221 B-channel data */ /* flags for the ARFCN */ #define GSMTAP_ARFCN_F_PCS 0x8000 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8dee0f730cf91d6f9133d5c57f653e669ec8d598 Gerrit-Change-Number: 30437 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022