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

[L] Change in pysim[master]: pySim-smpp2sim.py: Simulate SMSC+CN+RAN+UE for OTA testing

by osmith

Attention is currently required from: dexter, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37456?usp=email ) Change subject: pySim-smpp2sim.py: Simulate SMSC+CN+RAN+UE for OTA testing ...................................................................... Patch Set 4: (1 comment) Patchset: PS3: > strange enough, I can manually install the package using "pip install git+https://github. […] For "distcheck" we run "pip install .", see contrib/jenkins.sh. I've reproduced it locally, and fixed it like this: ```diff diff --git a/requirements.txt b/requirements.txt index ec04b6e..4e094b2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,4 @@ cryptography git+https://github.com/osmocom/asn1tools packaging git+https://github.com/hologram-io/smpp.pdu -git+https://github.com/jookies/smpp.twisted +smpp.twisted3 @ git+https://github.com/jookies/smpp.twisted diff --git a/setup.py b/setup.py index e9ffd97..2cd0e8f 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ setup( "pycryptodomex", "packaging", "smpp.pdu @ git+https://github.com/hologram-io/smpp.pdu", - "smpp.twisted @ git+https://github.com/jookies/smpp.twisted", + "smpp.twisted3 @ git+https://github.com/jookies/smpp.twisted", ], scripts=[ 'pySim-prog.py', ``` NOTE: I would suggest referencing a specific commit instead of current master, otherwise it may break at some point in a non-obvious way. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37456?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie5bae9d823bca6f6c658bd455303f63bace2258c Gerrit-Change-Number: 37456 Gerrit-PatchSet: 4 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-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 Jul 2024 09:50:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

11 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: transport: Implement treatment of 62xx and 63xx warning/error responses

by osmith

Attention is currently required from: dexter, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37452?usp=email ) Change subject: transport: Implement treatment of 62xx and 63xx warning/error responses ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37452?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibb1398194a16fc1f1f9bc46af6c66fb6575240cd Gerrit-Change-Number: 37452 Gerrit-PatchSet: 2 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 Jul 2024 09:33:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ttcn3-asterisk: Introduce test TC_ims_call_mo_2nd_mt_rejected

by jolly

Attention is currently required from: laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37481?usp=email ) Change subject: ttcn3-asterisk: Introduce test TC_ims_call_mo_2nd_mt_rejected ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id6577d0e9137c86855469904d347e95b5bcfa4a7 Gerrit-Change-Number: 37481 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 Jul 2024 08:13:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 2 weeks

1
0
0 0

[L] Change in ...osmo-s1gw[master]: sctp_proxy: maintain opaque state for s1ap_proxy

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37462?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: sctp_proxy: maintain opaque state for s1ap_proxy ...................................................................... sctp_proxy: maintain opaque state for s1ap_proxy Change-Id: I6ea8479c1a66bca330a7d4030cc7cdf55a76b12c --- M src/s1ap_proxy.erl M src/sctp_proxy.erl M test/s1ap_proxy_test.erl 3 files changed, 181 insertions(+), 104 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/62/37462/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I6ea8479c1a66bca330a7d4030cc7cdf55a76b12c Gerrit-Change-Number: 37462 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

11 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: saip-tool: Fix output of TAR values in "print" subcommand

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37487?usp=email ) Change subject: saip-tool: Fix output of TAR values in "print" subcommand ...................................................................... saip-tool: Fix output of TAR values in "print" subcommand Change-Id: Ifba1048e3000829d54769b0420f5134e2f9b04e1 --- M contrib/saip-tool.py 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/87/37487/1 diff --git a/contrib/saip-tool.py b/contrib/saip-tool.py index d73cc90..8208602 100755 --- a/contrib/saip-tool.py +++ b/contrib/saip-tool.py @@ -197,11 +197,13 @@ print("Number of RFM instances: %u" % len(rfms)) for rfm in rfms: inst_aid = rfm.decoded['instanceAID'] - print("RFM instanceAID: %s (-> TAR: %s)" % (b2h(inst_aid), b2h(inst_aid[-3:]))) + print("RFM instanceAID: %s" % b2h(inst_aid)) print("\tMSL: 0x%02x" % rfm.decoded['minimumSecurityLevel'][0]) adf = rfm.decoded.get('adfRFMAccess', None) if adf: print("\tADF AID: %s" % b2h(adf['adfAID'])) + for tar in rfm.decoded['tarList']: + print("\tTAR: %s" % b2h(tar)) def do_extract_apps(pes:ProfileElementSequence, opts): apps = pes.pe_by_type.get('application', []) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifba1048e3000829d54769b0420f5134e2f9b04e1 Gerrit-Change-Number: 37487 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

11 months, 2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_proxy: handle_pdu/2: print stacktrace on exception

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37460?usp=email ) Change subject: sctp_proxy: handle_pdu/2: print stacktrace on exception ...................................................................... sctp_proxy: handle_pdu/2: print stacktrace on exception Change-Id: I7fef18d4462af4b629318922e59cb5aa161fed93 --- M src/sctp_proxy.erl 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 85b5c3d..ab147e6 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -204,8 +204,8 @@ try s1ap_proxy:handle_pdu(Data) of NewData -> NewData catch - Exception:Reason -> - ?LOG_ERROR("An exception occurred: ~p, ~p", [Exception, Reason]), + Exception:Reason:StackTrace -> + ?LOG_ERROR("An exception occurred: ~p, ~p, ~p", [Exception, Reason, StackTrace]), Data %% proxy as-is end. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I7fef18d4462af4b629318922e59cb5aa161fed93 Gerrit-Change-Number: 37460 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_server: do not let sctp_proxy:shutdown() crash the server

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37461?usp=email ) Change subject: sctp_server: do not let sctp_proxy:shutdown() crash the server ...................................................................... sctp_server: do not let sctp_proxy:shutdown() crash the server Change-Id: Iaeedbc66cab21ec7274f864c8daf86c87f21e633 --- M src/sctp_server.erl 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/sctp_server.erl b/src/sctp_server.erl index d0484e6..8ea311f 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -197,7 +197,9 @@ client_del(Clients, Aid) -> case dict:find(Aid, Clients) of {ok, Client} -> - sctp_proxy:shutdown(Client#client_state.pid), + %% the proxy process might be already dead, so we guard + %% against exceptions like noproc or {nodedown,Node}. + catch sctp_proxy:shutdown(Client#client_state.pid), dict:erase(Aid, Clients); error -> Clients @@ -228,7 +230,9 @@ {FromAddr, FromPort} = Client#client_state.addr_port, ?LOG_NOTICE("Terminating eNB connection (id=~p, ~p:~p)", [Aid, FromAddr, FromPort]), %% request to terminate an MME connection - sctp_proxy:shutdown(Client#client_state.pid), + %% the proxy process might be already dead, so we guard + %% against exceptions like noproc or {nodedown,Node}. + catch sctp_proxy:shutdown(Client#client_state.pid), %% gracefully close an eNB connection gen_sctp:eof(Sock, #sctp_assoc_change{assoc_id = Aid}), %% ... and so for the remaining clients -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37461?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Iaeedbc66cab21ec7274f864c8daf86c87f21e633 Gerrit-Change-Number: 37461 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_proxy: add type hints for public API

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37458?usp=email ) Change subject: sctp_proxy: add type hints for public API ...................................................................... sctp_proxy: add type hints for public API Change-Id: I307e51f1130f08c219c6817629b856764ef7df59 --- M src/sctp_proxy.erl 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 350f655..d325622 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -53,14 +53,19 @@ %% public API %% ------------------------------------------------------------------ +-spec start_link(gen_sctp:assoc_id(), + sctp_client:loc_rem_addr(), + inet:port_number()) -> gen_statem:start_ret(). start_link(Aid, MmeAddr, MmePort) -> gen_statem:start_link(?MODULE, [Aid, MmeAddr, MmePort], []). +-spec send_data(pid(), binary()) -> ok. send_data(Pid, Data) -> gen_statem:cast(Pid, {send_data, Data}). +-spec shutdown(pid()) -> ok. shutdown(Pid) -> gen_statem:stop(Pid). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37458?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I307e51f1130f08c219c6817629b856764ef7df59 Gerrit-Change-Number: 37458 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_client: add type hints

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37457?usp=email ) Change subject: sctp_client: add type hints ...................................................................... sctp_client: add type hints Change-Id: I89f237706dfbd6004e7644b3b68446fab7f31c7c --- M src/sctp_client.erl 1 file changed, 28 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/sctp_client.erl b/src/sctp_client.erl index 24ec75d..ab02791 100644 --- a/src/sctp_client.erl +++ b/src/sctp_client.erl @@ -46,16 +46,33 @@ -include("s1ap.hrl"). + +-type loc_addr() :: any | list() | inet:ip_address(). +-type rem_addr() :: localhost | list() | inet:ip_address(). +-type loc_rem_addr() :: {loc_addr(), rem_addr()}. +-type connect_result() :: {ok, gen_sctp:sctp_socket()}. +-type sock_aid() :: {gen_sctp:sctp_socket(), + gen_sctp:assoc_id()}. + +-export_type([loc_addr/0, + rem_addr/0, + loc_rem_addr/0, + connect_result/0, + sock_aid/0]). + %% ------------------------------------------------------------------ %% public API %% ------------------------------------------------------------------ +-spec connect() -> connect_result(). connect() -> connect({any, localhost}). +-spec connect(loc_rem_addr()) -> connect_result(). connect(LocRemAddr) -> connect(LocRemAddr, ?S1AP_PORT). +-spec connect(loc_rem_addr(), inet:port_number()) -> connect_result(). connect({LocAddrStr, RemAddr}, Port) when is_list(LocAddrStr) -> {ok, LocAddr} = inet:parse_address(LocAddrStr), connect({LocAddr, RemAddr}, Port); @@ -72,12 +89,14 @@ {ok, Sock}. +-spec send_data(sock_aid(), binary()) -> ok | {error, term()}. send_data({Sock, Aid}, Data) -> gen_sctp:send(Sock, #sctp_sndrcvinfo{stream = ?S1AP_SCTP_STREAM, ppid = ?S1AP_SCTP_PPID, assoc_id = Aid}, Data). +-spec disconnect(sock_aid()) -> ok | {error, term()}. disconnect({Sock, Aid}) -> gen_sctp:eof(Sock, #sctp_assoc_change{assoc_id = Aid}). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37457?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I89f237706dfbd6004e7644b3b68446fab7f31c7c Gerrit-Change-Number: 37457 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_proxy: fix typo in field name: s/mmr_port/mme_port/g

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37459?usp=email ) Change subject: sctp_proxy: fix typo in field name: s/mmr_port/mme_port/g ...................................................................... sctp_proxy: fix typo in field name: s/mmr_port/mme_port/g Change-Id: I0c3d5a979aaa494cb0b2bd3da9118d9fedf7027f --- M src/sctp_proxy.erl 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index d325622..85b5c3d 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -78,7 +78,7 @@ {ok, connecting, #{enb_aid => Aid, mme_addr => MmeAddr, - mmr_port => MmePort, + mme_port => MmePort, tx_queue => []}}. @@ -88,7 +88,7 @@ %% CONNECTING state connecting(enter, OldState, - #{mme_addr := MmeAddr, mmr_port := MmePort} = S) -> + #{mme_addr := MmeAddr, mme_port := MmePort} = S) -> ?LOG_INFO("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), %% Initiate connection establishment with the MME {ok, Sock} = sctp_client:connect(MmeAddr, MmePort), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37459?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I0c3d5a979aaa494cb0b2bd3da9118d9fedf7027f Gerrit-Change-Number: 37459 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024