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

[S] Change in libosmo-sccp[master]: vty_test_runner: Avoid bogus erro messages like "AssertionError: Fals...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35939?usp=email ) Change subject: vty_test_runner: Avoid bogus erro messages like "AssertionError: False is not true" ...................................................................... vty_test_runner: Avoid bogus erro messages like "AssertionError: False is not true" "self.assertTrue(False)" is abusing python unittests. If you want to fail, either call the fail() method, or simply raise an exception... Change-Id: Ib683d6e166a9fca22dd2eb26e066e47034cda750 --- M tests/vty/vty_test_runner.py 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/tests/vty/vty_test_runner.py b/tests/vty/vty_test_runner.py index dff26c3..fce3654 100755 --- a/tests/vty/vty_test_runner.py +++ b/tests/vty/vty_test_runner.py @@ -131,7 +131,7 @@ s.connect(('127.0.0.2',2905)) except socket.error as msg: s.close() - self.assertTrue(False) + self.fail("Failed to connect IPv4 socket: %s" % msg) print("Connected to STP through SCTP (IPv4)") s.close() # IPv6: @@ -141,7 +141,7 @@ s.connect(('::1',2905)) except socket.error as msg: s.close() - self.assertTrue(False) + self.fail("Failed to connect IPv6 socket: %s" % msg) print("Connected to STP through SCTP (IPv6)") s.close() -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35939?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ib683d6e166a9fca22dd2eb26e066e47034cda750 Gerrit-Change-Number: 35939 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

1 year, 4 months

1
0
0 0

[S] Change in libosmo-sccp[master]: Add new "cs7 instance <0-15> asp NAME disconnect" VTY command

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35938?usp=email ) Change subject: Add new "cs7 instance <0-15> asp NAME disconnect" VTY command ...................................................................... Add new "cs7 instance <0-15> asp NAME disconnect" VTY command This allows the user to administratively disconnect the current transport connection of a given ASP. If issued on the client side, the default layer manager will trigger an automatic re-connect. If issued on the server side, we expect the client will re-connect. Change-Id: I2077121ab860fafb70951454d029c3afa9ee2818 --- M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 43 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 1483ac0..836b3fd 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -698,6 +698,31 @@ return CMD_SUCCESS; } +DEFUN(cs7_asp_disconnect, cs7_asp_disconnect_cmd, + "cs7 instance <0-15> asp NAME disconnect", + CS7_STR "Instance related commands\n" "SS7 Instance Number\n" + "ASP related commands\n" "Name of ASP\n" + "Disconnect the ASP (client will reconnect)\n") +{ + struct osmo_ss7_instance *inst; + struct osmo_ss7_asp *asp; + + inst = osmo_ss7_instance_find(atoi(argv[0])); + if (!inst) { + vty_out(vty, "unknown instance '%s'%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + asp = osmo_ss7_asp_find_by_name(inst, argv[1]); + if (!asp) { + vty_out(vty, "unknown ASP '%s'%s", argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + + osmo_ss7_asp_disconnect(asp); + return CMD_SUCCESS; +} + /*********************************************************************** * Application Server Process @@ -2838,6 +2863,7 @@ install_lib_element_ve(&show_cs7_user_cmd); install_lib_element_ve(&show_cs7_xua_cmd); install_lib_element_ve(&show_cs7_config_cmd); + install_lib_element(ENABLE_NODE, &cs7_asp_disconnect_cmd); /* the mother of all VTY config nodes */ install_lib_element(CONFIG_NODE, &cs7_instance_cmd); diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 914d8d4..d91df24 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -24,6 +24,7 @@ show cs7 instance <0-15> users show cs7 (sua|m3ua|ipa) [<0-65534>] show cs7 config + cs7 instance <0-15> asp NAME disconnect show cs7 instance <0-15> asp show cs7 instance <0-15> asp name ASP_NAME show cs7 instance <0-15> asp-remaddr -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35938?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I2077121ab860fafb70951454d029c3afa9ee2818 Gerrit-Change-Number: 35938 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in libosmo-sccp[master]: xua_asp_fsm: Log ERROR message when we send a MGMT:ERR message

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35937?usp=email ) Change subject: xua_asp_fsm: Log ERROR message when we send a MGMT:ERR message ...................................................................... xua_asp_fsm: Log ERROR message when we send a MGMT:ERR message We've always been logging received MGMT:ERR messages, but we somehow didn't log the transmission of them. So whenever osmo-stp generates some error to a connected peer, the peer would show it, but not osmo-stp itself. Let's fix that. Change-Id: I50c05409646fd47e70d904fb95bbc2fa15703b3e --- M src/xua_asp_fsm.c 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 701e081..8bb5b64 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -293,6 +293,8 @@ struct xua_msg *xua = xua_msg_alloc(); struct msgb *msg; + LOGPFSML(fi, LOGL_ERROR, "Tx MGMT_ERR '%s'\n", get_value_string(m3ua_err_names, err_code)); + xua->hdr = XUA_HDR(SUA_MSGC_MGMT, SUA_MGMT_ERR); xua->hdr.version = SUA_VERSION; xua_msg_add_u32(xua, SUA_IEI_ERR_CODE, err_code); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35937?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I50c05409646fd47e70d904fb95bbc2fa15703b3e Gerrit-Change-Number: 35937 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

1 year, 4 months

1
0
0 0

[S] Change in libosmo-sccp[master]: vty_test_runner: Don't wait for more than 10s when connecting to sockets

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35940?usp=email ) Change subject: vty_test_runner: Don't wait for more than 10s when connecting to sockets ...................................................................... vty_test_runner: Don't wait for more than 10s when connecting to sockets Change-Id: Iadb437ce0bafb28baa978d287dbb1006ec97f236 --- M tests/vty/vty_test_runner.py 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/tests/vty/vty_test_runner.py b/tests/vty/vty_test_runner.py index fce3654..ba1d90b 100755 --- a/tests/vty/vty_test_runner.py +++ b/tests/vty/vty_test_runner.py @@ -30,6 +30,8 @@ # to be able to find $top_srcdir/doc/... confpath = os.path.join(sys.path[0], '..') +TIMEOUT = 10 + class TestVTYBase(unittest.TestCase): def checkForEndAndExit(self): @@ -127,6 +129,7 @@ # IPv4: s = socket.socket(socket.AF_INET, socket.SOCK_STREAM, proto) s.bind(('127.0.0.3', 0)) + s.settimeout(TIMEOUT) try: s.connect(('127.0.0.2',2905)) except socket.error as msg: @@ -137,6 +140,7 @@ # IPv6: s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, proto) s.bind(('::1', 0)) + s.settimeout(TIMEOUT) try: s.connect(('::1',2905)) except socket.error as msg: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35940?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iadb437ce0bafb28baa978d287dbb1006ec97f236 Gerrit-Change-Number: 35940 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: s2b: Increment gtp SeqNo after transmitting message

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35948?usp=email ) Change subject: s2b: Increment gtp SeqNo after transmitting message ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35948?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia65ef7380f01d080ca05393887661d4af698646a Gerrit-Change-Number: 35948 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: Mon, 12 Feb 2024 13:29:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: s2b: Use provided APN in CreateSessionReq

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35947?usp=email ) Change subject: s2b: Use provided APN in CreateSessionReq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35947?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I9e48c531aec837aade44a8c87d61a67f6bb44ca9 Gerrit-Change-Number: 35947 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: Mon, 12 Feb 2024 13:29:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: cosmetic: s2b: Drop done TODO comment

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35946?usp=email ) Change subject: cosmetic: s2b: Drop done TODO comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35946?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Idf99168dccc7373ffc75e5871f2ea9516b9854c5 Gerrit-Change-Number: 35946 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: Mon, 12 Feb 2024 13:29:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: Create pdp context in the tundev

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35944?usp=email ) Change subject: Create pdp context in the tundev ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35944?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I4e0b3fe0e3e156c9a20df0ab8cdfc447fd9bb1eb Gerrit-Change-Number: 35944 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: Mon, 12 Feb 2024 13:29:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Use gtp_u_kmod to create a gtp tundev

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35943?usp=email ) Change subject: Use gtp_u_kmod to create a gtp tundev ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35943?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ie7718e1b161477bd738fa75f803ab37e9f35121d Gerrit-Change-Number: 35943 Gerrit-PatchSet: 6 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: Mon, 12 Feb 2024 13:28:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: s2b: Increment gtp SeqNo after transmitting message

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35948?usp=email ) Change subject: s2b: Increment gtp SeqNo after transmitting message ...................................................................... s2b: Increment gtp SeqNo after transmitting message Change-Id: Ia65ef7380f01d080ca05393887661d4af698646a --- M src/epdg_gtpc_s2b.erl 1 file changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/48/35948/1 diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 313e101..95c4d10 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -146,19 +146,19 @@ #gtp_session{pid = Pid, apn = list_to_binary(Apn)}, State0), Req = gen_create_session_request(Sess0, State1), - %TODO: increment State.seq_no. tx_gtp(Req, State1), + State2 = inc_seq_no(State1), lager:debug("Waiting for CreateSessionResponse~n", []), - {reply, ok, State1}; + {reply, ok, State2}; handle_call({gtpc_delete_session_req, {Imsi}}, _From, State) -> Sess = find_gtp_session_by_imsi(Imsi, State), case Sess of #gtp_session{imsi = Imsi} -> Req = gen_delete_session_request(Sess, State), - %TODO: increment State.seq_no. tx_gtp(Req, State), - {reply, ok, State}; + State1 = inc_seq_no(State), + {reply, ok, State1}; undefined -> {reply, {error, imsi_unknown}, State} end. @@ -199,6 +199,10 @@ %% Internal Function Definitions %% ------------------------------------------------------------------ +inc_seq_no(State) -> + NewSeqNr = State#gtp_state.seq_no +1, + State#gtp_state{seq_no = NewSeqNr}. + new_gtp_session(Imsi, SessTpl, State) -> % TODO: find non-used local TEI inside State DefaultBearer = #gtp_bearer{ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35948?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia65ef7380f01d080ca05393887661d4af698646a Gerrit-Change-Number: 35948 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024