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

[XS] Change in libasn1c[master]: Bump version: 0.9.37.1-2d31 → 0.9.38

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libasn1c/+/38994?usp=email ) Change subject: Bump version: 0.9.37.1-2d31 → 0.9.38 ...................................................................... Patch Set 1: (1 comment) File debian/changelog: https://gerrit.osmocom.org/c/libasn1c/+/38994/comment/34d49dea_8cd115d0?usp… : PS1, Line 3: * debian/control: Build-Depends: add pkg-config Currently libasn1c fails to build in osmocom:latest for Debian Unstable. Make a release with this patch to fix it. * https://gerrit.osmocom.org/c/libasn1c/+/38970 * https://obs.osmocom.org/package/live_build_log/osmocom:latest/libasn1c/Debi… -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/38994?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I5f87965ef761e7d2fb639642ffcf698b23197f3b Gerrit-Change-Number: 38994 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 02 Dec 2024 08:43:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

6 months, 3 weeks

1
0
0 0

[XS] Change in libasn1c[master]: Bump version: 0.9.37.1-2d31 → 0.9.38

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libasn1c/+/38994?usp=email ) Change subject: Bump version: 0.9.37.1-2d31 → 0.9.38 ...................................................................... Bump version: 0.9.37.1-2d31 → 0.9.38 Change-Id: I5f87965ef761e7d2fb639642ffcf698b23197f3b --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/94/38994/1 diff --git a/debian/changelog b/debian/changelog index a9c9282..10c5d2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libasn1c (0.9.38) unstable; urgency=medium + + * debian/control: Build-Depends: add pkg-config + + -- Oliver Smith <osmith(a)sysmocom.de> Mon, 02 Dec 2024 09:41:20 +0100 + libasn1c (0.9.37) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/38994?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I5f87965ef761e7d2fb639642ffcf698b23197f3b Gerrit-Change-Number: 38994 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: Drop internal use of osmocom/abis/ipaccess.h

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38988?usp=email ) Change subject: Drop internal use of osmocom/abis/ipaccess.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38988?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ifc9759b17a9b966cb713f7533a13f6223161a4cd Gerrit-Change-Number: 38988 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Dec 2024 06:37:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[S] Change in osmo-hlr[master]: Drop use of libosmo-abis osmocom/abis/ipaccess.h

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38989?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/38989?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I393cd23a09af6d1eefa68dc955415f4fe334d71b Gerrit-Change-Number: 38989 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Dec 2024 06:36:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-bts[master]: Drop use of libosmo-abis osmocom/abis/ipaccess.h

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/38990?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie4540eb6f535375a1e4ddf3849602aecb6260914 Gerrit-Change-Number: 38990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Dec 2024 06:35:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: Drop use of libosmo-abis osmocom/abis/ipaccess.h

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38991?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/38991/comment/06d83d80_23e069bc?usp… : PS1, Line 16: Take the chance to organize a bit better This patch would have been easier to read if this was done separately. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5f9daaf7789a56a08d2ec24b5e25e2e3b65b8b5b Gerrit-Change-Number: 38991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Dec 2024 06:35:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-bsc[master]: ipaccess-proxy: Fix wrong cb function passed

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38981?usp=email ) Change subject: ipaccess-proxy: Fix wrong cb function passed ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/38981/comment/9a96beee_b8326db7?usp… : PS1, Line 15: osmo-bsc.git It was actually `openbsc.git` 10y ago. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38981?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1702d9913a462a36e4b78b503a8338ae2ad140b1 Gerrit-Change-Number: 38981 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Dec 2024 06:32:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream_cli: Fix discard 1st msg received quick after connect

by fixeria

Attention is currently required from: daniel, jolly, laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38987?usp=email ) Change subject: stream_cli: Fix discard 1st msg received quick after connect ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38987?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I98cd51d4bb87d3572245446648ced44a23a622ef Gerrit-Change-Number: 38987 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Dec 2024 06:30:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: Modem related fixes.

by JPM

JPM has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38993?usp=email ) Change subject: Modem related fixes. ...................................................................... Modem related fixes. Change-Id: I3e45603a13496fff41b9f859de486143252fb28d --- M pySim/app.py M pySim/cards.py M pySim/transport/modem_atcmd.py 3 files changed, 29 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/93/38993/1 diff --git a/pySim/app.py b/pySim/app.py index 23a4c3c..3483cb2 100644 --- a/pySim/app.py +++ b/pySim/app.py @@ -17,6 +17,7 @@ from typing import Tuple from pySim.transport import LinkBase +from pySim.transport.modem_atcmd import ModemATCommandLink from pySim.commands import SimCardCommands from pySim.filesystem import CardModel, CardApplication from pySim.cards import card_detect, SimCardBase, UiccCardBase, CardBase @@ -63,12 +64,19 @@ if skip_card_init: return None, CardBase(scc) - generic_card = False + # Avoid using channel 0 with a Modem to avoid context conflicts. + if isinstance(sl,ModemATCommandLink) and scc.lchan_nr == 0: + scc.cla_byte = '00' + (chan,sw) = scc.manage_channel('open') + scc.lchan_nr = int(chan) + card = card_detect(scc) if card is None: print("Warning: Could not detect card type - assuming a generic card type...") card = SimCardBase(scc) generic_card = True + else: + generic_card = False profile = CardProfile.pick(scc) if profile is None: diff --git a/pySim/cards.py b/pySim/cards.py index b7958f4..77a2949 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -40,7 +40,7 @@ rc = self._scc.reset_card() if rc == 1: return self._scc.get_atr() - return None + return [] #return empty ATR def set_apdu_parameter(self, cla: Hexstr, sel_ctrl: Hexstr) -> None: """Set apdu parameters (class byte and selection control bytes)""" diff --git a/pySim/transport/modem_atcmd.py b/pySim/transport/modem_atcmd.py index 340ed92..efe9847 100644 --- a/pySim/transport/modem_atcmd.py +++ b/pySim/transport/modem_atcmd.py @@ -56,7 +56,8 @@ if hasattr(self, '_sl'): self._sl.close() - def send_at_cmd(self, cmd, timeout=0.2, patience=0.002): + def send_at_cmd(self, cmd, timeout=1.5, patience=0.1): + _timeout = timeout # Convert from string to bytes, if needed bcmd = cmd if isinstance(cmd, bytes) else cmd.encode() bcmd += b'\r' @@ -76,6 +77,7 @@ its = 1 t_start = time.time() while True: + time.sleep(patience) rsp = rsp + self._sl.read(self._sl.in_waiting) lines = rsp.split(b'\r\n') if len(lines) >= 2: @@ -86,13 +88,14 @@ if res == b'ERROR' or res.startswith(b'+CME ERROR:'): log.error('Command failed with result: %s', res) break - if lines[-1].startswith(b'+CSIM:'): # Sequans Monarch GM02S Long APDU response is OK and then all multiple +CSIM - t_start = time.time() # Reset the timer on each additional +CSIM received + if res.startswith(b'+CSIM:'): # Sequans Monarch GM02S Long APDU response is OK and then followed by multiple +CSIM + if not res.startswith(b'+CSIM: 516'): # If max length, then high probability of one more incoming +CSIM + break + _timeout = timeout * (len(lines)-2) - if time.time() - t_start >= timeout: - log.info('Command finished with timeout >= %ss', timeout) + if time.time() - t_start >= _timeout: + log.info('Command finished with timeout >= %ss', _timeout) break - time.sleep(patience) its += 1 log.debug('Command took %0.6fs (%d cycles a %fs)', time.time() - t_start, its, patience) @@ -105,6 +108,9 @@ log.debug('Got response from modem: %s', rsp) return rsp + def get_atr(self) -> Hexstr: + return Hexstr('') + def _check_echo(self): """Verify the correct response to 'AT' command and detect if inputs are echoed by the device @@ -128,6 +134,13 @@ raise ReaderError('Interface \'%s\' does not respond to \'AT\' command' % self._device) def _reset_card(self): + # Rebooting the modem to force card reset + cfun = self.send_at_cmd('AT+CFUN?') # Reading current operation mode + if cfun[-1] != b'OK': + raise ReaderError('Failed to read modem operation mode') + if cfun[0].startswith(b'+CFUN:'): + self.send_at_cmd(f'AT+CFUN={cfun[0][-1]-0x30},1',timeout=3.5,patience=1) + # Reset the modem, just to be sure if self.send_at_cmd('ATZ') != [b'OK']: raise ReaderError('Failed to reset the modem') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38993?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3e45603a13496fff41b9f859de486143252fb28d Gerrit-Change-Number: 38993 Gerrit-PatchSet: 1 Gerrit-Owner: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca>

6 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: Handling Long APDU response

by JPM

JPM has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38992?usp=email ) Change subject: Handling Long APDU response ...................................................................... Handling Long APDU response Change-Id: I3c09d4dd1ed68bb982e23c90a6762fd9c2dfdd7f --- M pySim/transport/modem_atcmd.py 1 file changed, 22 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/92/38992/1 diff --git a/pySim/transport/modem_atcmd.py b/pySim/transport/modem_atcmd.py index e7614c0..340ed92 100644 --- a/pySim/transport/modem_atcmd.py +++ b/pySim/transport/modem_atcmd.py @@ -86,6 +86,8 @@ if res == b'ERROR' or res.startswith(b'+CME ERROR:'): log.error('Command failed with result: %s', res) break + if lines[-1].startswith(b'+CSIM:'): # Sequans Monarch GM02S Long APDU response is OK and then all multiple +CSIM + t_start = time.time() # Reset the timer on each additional +CSIM received if time.time() - t_start >= timeout: log.info('Command finished with timeout >= %ss', timeout) @@ -155,22 +157,29 @@ # Send AT+CSIM command to the modem rsp = self.send_at_cmd(cmd) - if rsp[-1].startswith(b'+CME ERROR:'): - raise ProtocolError('AT+CSIM failed with: %s' % str(rsp)) - if len(rsp) != 2 or rsp[-1] != b'OK': - raise ReaderError('APDU transfer failed: %s' % str(rsp)) - rsp = rsp[0] # Get rid of b'OK' - # Make sure that the response has format: b'+CSIM: %d,\"%s\"' - try: - result = re.match(b'\+CSIM: (\d+),\"([0-9A-F]+)\"', rsp) - (_rsp_tpdu_len, rsp_tpdu) = result.groups() - except Exception as exc: - raise ReaderError('Failed to parse response from modem: %s' % rsp) from exc + # AT+CSIM works with APDU, but returns the TPDU in multiple +CSIM answers (at least Sequans does it) + # In that case, the answer starts with OK, and then multiple +CSIM answers + rsp_apdu = b'' + for r in rsp: + if r.startswith(b'+CSIM:'): + try: + result = re.match(b'\+CSIM: (\d+),\"([0-9A-F]+)\"', r) + (_rsp_tpdu_len, _rsp_tpdu) = result.groups() + rsp_apdu = rsp_apdu + _rsp_tpdu + except Exception as exc: + raise ReaderError('Failed to parse response from modem: %s' % rsp) from exc + elif r.startswith(b'CME ERROR:'): + raise ProtocolError('AT+CSIM failed with: %s' % str(rsp)) + elif r == b'OK': + continue + else: + raise ReaderError('APDU transfer failed: %s' % str(rsp)) + # TODO: make sure we have at least SW - data = rsp_tpdu[:-4].decode().lower() - sw = rsp_tpdu[-4:].decode().lower() + data = rsp_apdu[:-4].decode().lower() + sw = rsp_apdu[-4:].decode().lower() log.debug('Command response: %s, %s', data, sw) return data, sw -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38992?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3c09d4dd1ed68bb982e23c90a6762fd9c2dfdd7f Gerrit-Change-Number: 38992 Gerrit-PatchSet: 1 Gerrit-Owner: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca>

6 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024