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

Change in libosmo-pfcp[master]: fix wrong constants used in osmo_pfcp_tdefs (typo)

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28749 ) Change subject: fix wrong constants used in osmo_pfcp_tdefs (typo) ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: obvious / trivial -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Iaecce86064b65aa003e9903d09f60d760e0689c3 Gerrit-Change-Number: 28749 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 23 Jul 2022 14:15:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmo-pfcp[master]: fix wrong constants used in osmo_pfcp_tdefs (typo)

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28749 ) Change subject: fix wrong constants used in osmo_pfcp_tdefs (typo) ...................................................................... fix wrong constants used in osmo_pfcp_tdefs (typo) s/MSGT/TIMER Related: SYS#5599 Change-Id: Iaecce86064b65aa003e9903d09f60d760e0689c3 --- M src/libosmo-pfcp/pfcp_endpoint.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/49/28749/1 diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c index 32bcd0e..f446858 100644 --- a/src/libosmo-pfcp/pfcp_endpoint.c +++ b/src/libosmo-pfcp/pfcp_endpoint.c @@ -78,10 +78,10 @@ } struct osmo_tdef osmo_pfcp_tdefs[] = { - { .T = OSMO_PFCP_MSGT_HEARTBEAT_REQ, .default_val = 15, .unit = OSMO_TDEF_S, + { .T = OSMO_PFCP_TIMER_HEARTBEAT_REQ, .default_val = 15, .unit = OSMO_TDEF_S, .desc = "PFCP Heartbeat Request period, how long to wait between issuing requests" }, - { .T = OSMO_PFCP_MSGT_HEARTBEAT_RESP, .default_val = 15, .unit = OSMO_TDEF_S, + { .T = OSMO_PFCP_TIMER_HEARTBEAT_RESP, .default_val = 15, .unit = OSMO_TDEF_S, .desc = "PFCP Heartbeat Response timeout, the time after which to regard a non-responding peer as disconnected" }, { .T = OSMO_PFCP_TIMER_GRACEFUL_REL, .default_val = 15, .unit = OSMO_TDEF_S, -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Iaecce86064b65aa003e9903d09f60d760e0689c3 Gerrit-Change-Number: 28749 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmocom-bb[master]: trxcon: make l1sched logging configurable, append trxcon->fi prefix

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28744 to look at the new patch set (#2). Change subject: trxcon: make l1sched logging configurable, append trxcon->fi prefix ...................................................................... trxcon: make l1sched logging configurable, append trxcon->fi prefix This change adds struct l1sched_cfg, which needs to be passed to l1sched_alloc(). This structure allows to configure logging categories for common and data messages, as well as a logging context callback. The later is used to prepend some context to the l1sched related logging: let's use trxcon->fi for that. Change-Id: I26da1a506b02502a3a6a887533c35fb09c13c429 Related: OS#5599, OS#3761 --- M src/host/trxcon/include/osmocom/bb/l1sched/Makefile.am M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h A src/host/trxcon/include/osmocom/bb/l1sched/logging.h M src/host/trxcon/src/sched_clck.c M src/host/trxcon/src/sched_lchan_common.c M src/host/trxcon/src/sched_lchan_pdtch.c M src/host/trxcon/src/sched_lchan_rach.c M src/host/trxcon/src/sched_lchan_sch.c M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c M src/host/trxcon/src/sched_lchan_xcch.c M src/host/trxcon/src/sched_mframe.c M src/host/trxcon/src/sched_prim.c M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon.c 15 files changed, 248 insertions(+), 201 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/44/28744/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I26da1a506b02502a3a6a887533c35fb09c13c429 Gerrit-Change-Number: 28744 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in osmocom-bb[master]: trxcon: move fn_counter_advance to struct l1sched_cfg

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28745 to look at the new patch set (#2). Change subject: trxcon: move fn_counter_advance to struct l1sched_cfg ...................................................................... trxcon: move fn_counter_advance to struct l1sched_cfg Change-Id: I733761e46ffe03473f03f76f7612a548c9723d99 Related: OS#5599, OS#3761 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon.c 3 files changed, 9 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/28745/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I733761e46ffe03473f03f76f7612a548c9723d99 Gerrit-Change-Number: 28745 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in pysim[master]: tag version 1.1 of pySim

by laforge

laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/pysim/+/28748 ) Change subject: tag version 1.1 of pySim ...................................................................... tag version 1.1 of pySim Closes: OS#5458 Change-Id: Id78fb776eeab3370663cccefaf3fb31e5b2f5b04 --- M setup.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/28748/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id78fb776eeab3370663cccefaf3fb31e5b2f5b04 Gerrit-Change-Number: 28748 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in pysim[master]: tag version 1.1 of pySim

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28748 ) Change subject: tag version 1.1 of pySim ...................................................................... tag version 1.1 of pySim Change-Id: Id78fb776eeab3370663cccefaf3fb31e5b2f5b04 --- M setup.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/28748/1 diff --git a/setup.py b/setup.py index ec1a76a..ca7745c 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pySim', - version='1.0', + version='1.1', packages=['pySim', 'pySim.transport'], url='https://osmocom.org/projects/pysim/wiki', license='GPLv2', -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id78fb776eeab3370663cccefaf3fb31e5b2f5b04 Gerrit-Change-Number: 28748 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in pysim[master]: sim-rest-server: Report meaningful error message if PIN is blocked

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28747 ) Change subject: sim-rest-server: Report meaningful error message if PIN is blocked ...................................................................... sim-rest-server: Report meaningful error message if PIN is blocked Instead of a cryptic backtrace, we now return a meaningful error like this: {"error": {"message": "Security Status not satisfied - Card PIN enabled?", "status_word": "6982"} Change-Id: I6dafd37dfd9fa3d52ca2c2e5ec37a6d274ba651b Closes: OS#5606 --- M contrib/sim-rest-server.py 1 file changed, 15 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved; Verified diff --git a/contrib/sim-rest-server.py b/contrib/sim-rest-server.py index 62498b4..f2ed63e 100755 --- a/contrib/sim-rest-server.py +++ b/contrib/sim-rest-server.py @@ -2,7 +2,7 @@ # RESTful HTTP service for performing authentication against USIM cards # -# (C) 2021 by Harald Welte <laforge(a)osmocom.org> +# (C) 2021-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 @@ -51,11 +51,15 @@ return tp, scc, card class ApiError: - def __init__(self, msg:str): + def __init__(self, msg:str, sw=None): self.msg = msg + self.sw = sw def __str__(self): - return json.dumps({'error': {'message':self.msg}}) + d = {'error': {'message':self.msg}} + if self.sw: + d['error']['status_word'] = self.sw + return json.dumps(d) def set_headers(request): @@ -80,13 +84,19 @@ def protocol_error(self, request, failure): set_headers(request) request.setResponseCode(500) - return str(ApiError("Protocol Error")) + return str(ApiError("Protocol Error: %s" % failure.value)) @app.handle_errors(SwMatchError) def sw_match_error(self, request, failure): set_headers(request) request.setResponseCode(500) - return str(ApiError("Card Communication Error %s" % failure)) + sw = failure.value.sw_actual + if sw == '9862': + return str(ApiError("Card Authentication Error - Incorrect MAC", sw)) + elif sw == '6982': + return str(ApiError("Security Status not satisfied - Card PIN enabled?", sw)) + else: + return str(ApiError("Card Communication Error %s" % failure.value), sw) @app.route('/sim-auth-api/v1/slot/<int:slot>') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6dafd37dfd9fa3d52ca2c2e5ec37a6d274ba651b Gerrit-Change-Number: 28747 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in pysim[master]: sim-rest-server: Report meaningful error message if PIN is blocked

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28747 ) Change subject: sim-rest-server: Report meaningful error message if PIN is blocked ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6dafd37dfd9fa3d52ca2c2e5ec37a6d274ba651b Gerrit-Change-Number: 28747 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 23 Jul 2022 12:28:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in pysim[master]: sim-rest-server: Render error messages as JSON

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28746 ) Change subject: sim-rest-server: Render error messages as JSON ...................................................................... sim-rest-server: Render error messages as JSON Let's make sure even error messages are returned in JSON format. While at it, also reduce some code duplication between the 'auth' and 'info' route handlers by using the klein handle_errors decorator instead of manual exception catching. Change-Id: I1e0364e28ba7ce7451993f57c8228f9a7ade6b0e Closes: OS#5607 --- M contrib/sim-rest-server.py 1 file changed, 64 insertions(+), 54 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/sim-rest-server.py b/contrib/sim-rest-server.py index a31aeed..62498b4 100755 --- a/contrib/sim-rest-server.py +++ b/contrib/sim-rest-server.py @@ -21,7 +21,7 @@ import sys import argparse -from klein import run, route +from klein import Klein from pySim.transport import ApduTracer from pySim.transport.pcsc import PcscSimLink @@ -50,78 +50,87 @@ return tp, scc, card +class ApiError: + def __init__(self, msg:str): + self.msg = msg + + def __str__(self): + return json.dumps({'error': {'message':self.msg}}) + + def set_headers(request): request.setHeader('Content-Type', 'application/json') -@route('/sim-auth-api/v1/slot/<int:slot>') -def auth(request, slot): - """REST API endpoint for performing authentication against a USIM. - Expects a JSON body containing RAND and AUTN. - Returns a JSON body containing RES, CK, IK and Kc.""" - try: - # there are two hex-string JSON parameters in the body: rand and autn - content = json.loads(request.content.read()) - rand = content['rand'] - autn = content['autn'] - except: - request.setResponseCode(400) - return "Malformed Request" +class SimRestServer: + app = Klein() - try: - tp, scc, card = connect_to_card(slot) - except ReaderError: - request.setResponseCode(404) - return "Specified SIM Slot doesn't exist" - except ProtocolError: - request.setResponseCode(500) - return "Error" - except NoCardError: + @app.handle_errors(NoCardError) + def no_card_error(self, request, failure): + set_headers(request) request.setResponseCode(410) - return "No SIM card inserted in slot" + return str(ApiError("No SIM card inserted in slot")) - try: + @app.handle_errors(ReaderError) + def reader_error(self, request, failure): + set_headers(request) + request.setResponseCode(404) + return str(ApiError("Reader Error: Specified SIM Slot doesn't exist")) + + @app.handle_errors(ProtocolError) + def protocol_error(self, request, failure): + set_headers(request) + request.setResponseCode(500) + return str(ApiError("Protocol Error")) + + @app.handle_errors(SwMatchError) + def sw_match_error(self, request, failure): + set_headers(request) + request.setResponseCode(500) + return str(ApiError("Card Communication Error %s" % failure)) + + + @app.route('/sim-auth-api/v1/slot/<int:slot>') + def auth(self, request, slot): + """REST API endpoint for performing authentication against a USIM. + Expects a JSON body containing RAND and AUTN. + Returns a JSON body containing RES, CK, IK and Kc.""" + try: + # there are two hex-string JSON parameters in the body: rand and autn + content = json.loads(request.content.read()) + rand = content['rand'] + autn = content['autn'] + except: + set_headers(request) + request.setResponseCode(400) + return str(ApiError("Malformed Request")) + + tp, scc, card = connect_to_card(slot) + card.select_adf_by_aid(adf='usim') res, sw = scc.authenticate(rand, autn) - except SwMatchError as e: - request.setResponseCode(500) - return "Communication Error %s" % e - tp.disconnect() + tp.disconnect() - set_headers(request) - return json.dumps(res, indent=4) + set_headers(request) + return json.dumps(res, indent=4) -@route('/sim-info-api/v1/slot/<int:slot>') -def info(request, slot): - """REST API endpoint for obtaining information about an USIM. - Expects empty body in request. - Returns a JSON body containing ICCID, IMSI.""" + @app.route('/sim-info-api/v1/slot/<int:slot>') + def info(self, request, slot): + """REST API endpoint for obtaining information about an USIM. + Expects empty body in request. + Returns a JSON body containing ICCID, IMSI.""" - try: tp, scc, card = connect_to_card(slot) - except ReaderError: - request.setResponseCode(404) - return "Specified SIM Slot doesn't exist" - except ProtocolError: - request.setResponseCode(500) - return "Error" - except NoCardError: - request.setResponseCode(410) - return "No SIM card inserted in slot" - try: card.select_adf_by_aid(adf='usim') iccid, sw = card.read_iccid() imsi, sw = card.read_imsi() res = {"imsi": imsi, "iccid": iccid } - except SwMatchError as e: - request.setResponseCode(500) - return "Communication Error %s" % e - tp.disconnect() + tp.disconnect() - set_headers(request) - return json.dumps(res, indent=4) + set_headers(request) + return json.dumps(res, indent=4) def main(argv): @@ -132,7 +141,8 @@ args = parser.parse_args() - run(args.host, args.port) + srr = SimRestServer() + srr.app.run(args.host, args.port) if __name__ == "__main__": main(sys.argv) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1e0364e28ba7ce7451993f57c8228f9a7ade6b0e Gerrit-Change-Number: 28746 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in pysim[master]: sim-rest-server: Render error messages as JSON

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28746 ) Change subject: sim-rest-server: Render error messages as JSON ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1e0364e28ba7ce7451993f57c8228f9a7ade6b0e Gerrit-Change-Number: 28746 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 23 Jul 2022 12:28:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022