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

[S] Change in libosmo-netif[master]: Do not reconnect when receiving SCTP notification

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email ) Change subject: Do not reconnect when receiving SCTP notification ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: stream_sctp_recvmsg_trailer() in path should be printing more information about the event you are receiving, it should contain "NOTIFICATION" in the string. it should be loglevel INFO/NOTICE/ERROR depending on event. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic588e6d8a3eecde701778f7d6ff5599ab81eff2b Gerrit-Change-Number: 36568 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 16 Apr 2024 14:35:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in libosmo-netif[master]: Do not reconnect when receiving SCTP notification

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email ) Change subject: Do not reconnect when receiving SCTP notification ...................................................................... Patch Set 1: Code-Review-2 (1 comment) File src/stream_cli.c: https://gerrit.osmocom.org/c/libosmo-netif/+/36568/comment/7b0deb09_8508b6ce PS1, Line 500: if (res == -EAGAIN) { > Wait, that's wrong though, you are basically preventing stream_cli users to get SCTP notifications, […] You should be handling case "if (msgb_sctp_msg_flags(msg) & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION)" inside stream_cli_handle_connecting() imho, based on event you'll want to reconnect(). At least handle it inside switch case here in line 507. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic588e6d8a3eecde701778f7d6ff5599ab81eff2b Gerrit-Change-Number: 36568 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 16 Apr 2024 14:34:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in libosmo-netif[master]: Do not reconnect when receiving SCTP notification

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email ) Change subject: Do not reconnect when receiving SCTP notification ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/stream_cli.c: https://gerrit.osmocom.org/c/libosmo-netif/+/36568/comment/7c8db9c7_c61f745f PS1, Line 500: if (res == -EAGAIN) { > The res = -EAGAIN is more like "historical reasons" imho (I wrote further support there afterwards), […] Wait, that's wrong though, you are basically preventing stream_cli users to get SCTP notifications, which is wrong. osmo_ss7_asp.c expects to get those. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic588e6d8a3eecde701778f7d6ff5599ab81eff2b Gerrit-Change-Number: 36568 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 16 Apr 2024 14:17:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in libosmo-netif[master]: Do not reconnect when receiving SCTP notification

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email ) Change subject: Do not reconnect when receiving SCTP notification ...................................................................... Patch Set 1: (1 comment) File src/stream_cli.c: https://gerrit.osmocom.org/c/libosmo-netif/+/36568/comment/137e8852_3488b14f PS1, Line 500: if (res == -EAGAIN) { The res = -EAGAIN is more like "historical reasons" imho (I wrote further support there afterwards), you should better check the flags (set in stream_sctp_recvmsg_trailer()): if (msgb_sctp_msg_flags(msg) & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) See for instance: libosmo-sccp/src/osmo_ss7_asp.c:824 or line 998. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic588e6d8a3eecde701778f7d6ff5599ab81eff2b Gerrit-Change-Number: 36568 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 16 Apr 2024 14:17:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-hnbgw: osmo-hnbgw.cfg: Enable color in log file

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36570?usp=email ) Change subject: ttcn3-hnbgw: osmo-hnbgw.cfg: Enable color in log file ...................................................................... ttcn3-hnbgw: osmo-hnbgw.cfg: Enable color in log file Change-Id: Iffd28619ca075e0cf870e10989cfced6096ca8d7 --- M ttcn3-hnbgw-test/osmo-hnbgw.cfg 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/36570/1 diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index c0a00ac..fd74b51 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -8,7 +8,7 @@ ! log stderr logging filter all 1 - logging color 0 + logging color 1 logging print category-hex 0 logging print category 1 logging print level 1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36570?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iffd28619ca075e0cf870e10989cfced6096ca8d7 Gerrit-Change-Number: 36570 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-hnbgw: osmo-hnbgw.cfg: Switch from deprecated 'mgcp' node to 'mgw'

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36569?usp=email ) Change subject: ttcn3-hnbgw: osmo-hnbgw.cfg: Switch from deprecated 'mgcp' node to 'mgw' ...................................................................... ttcn3-hnbgw: osmo-hnbgw.cfg: Switch from deprecated 'mgcp' node to 'mgw' Change-Id: Ie27dcae05fa719cd0eac9faa6e2fb6b63581ac28 --- M ttcn3-hnbgw-test/osmo-hnbgw.cfg 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/36569/1 diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index e2692dc..c0a00ac 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -79,7 +79,7 @@ local-ip 172.18.35.20 local-port 29169 hnbap-allow-tmsi 1 - mgcp + mgw 0 mgw local-ip 172.18.35.20 mgw remote-ip 172.18.35.203 # don't spam RANAP RESET messages for up to eight CN links across all tests -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36569?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie27dcae05fa719cd0eac9faa6e2fb6b63581ac28 Gerrit-Change-Number: 36569 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in libosmo-netif[master]: Do not reconnect when receiving SCTP notification

by fixeria

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email ) Change subject: Do not reconnect when receiving SCTP notification ...................................................................... Patch Set 1: Verified+1 Code-Review+1 (1 comment) Patchset: PS1: Fixes the problem for me! -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic588e6d8a3eecde701778f7d6ff5599ab81eff2b Gerrit-Change-Number: 36568 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 16 Apr 2024 13:47:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in libosmo-netif[master]: Do not reconnect when receiving SCTP notification

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email ) Change subject: Do not reconnect when receiving SCTP notification ...................................................................... Do not reconnect when receiving SCTP notification If a notification is detected by stream_sctp_recvmsg_trailer(), it returns -EAGAIN. This is not an error that should cause the stream client to trigger a reconnect. It must drop that message, as it is done at the stream server. In both cases the unhandled msg must be freed. Change-Id: Ic588e6d8a3eecde701778f7d6ff5599ab81eff2b --- M src/stream_cli.c M src/stream_srv.c 2 files changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/68/36568/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 11c88ae..aeac78e 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -497,6 +497,10 @@ struct osmo_stream_cli *cli = osmo_iofd_get_data(iofd); res = stream_iofd_sctp_recvmsg_trailer(iofd, msg, res, msgh); + if (res == -EAGAIN) { + msgb_free(msg); + return; + } switch (cli->state) { case STREAM_CLI_STATE_CONNECTING: diff --git a/src/stream_srv.c b/src/stream_srv.c index a02c1c2..994015b 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -658,8 +658,10 @@ LOGSSRV(conn, LOGL_DEBUG, "message received (res=%d)\n", res); res = stream_iofd_sctp_recvmsg_trailer(iofd, msg, res, msgh); - if (res == -EAGAIN) + if (res == -EAGAIN) { + msgb_free(msg); return; + } if (OSMO_UNLIKELY(res <= 0)) { /* This connection is dead, destroy it. */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic588e6d8a3eecde701778f7d6ff5599ab81eff2b Gerrit-Change-Number: 36568 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: hnbap: Avoid calling duplicate getpeername() for each registered HNB

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36567?usp=email ) Change subject: hnbap: Avoid calling duplicate getpeername() for each registered HNB ...................................................................... hnbap: Avoid calling duplicate getpeername() for each registered HNB Change-Id: I980de31d1296c3b956146a461609bec76ed3d430 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/67/36567/1 diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 4fa59b9..a632311 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -478,6 +478,8 @@ const char *cell_id_str; struct timespec tp; HNBAP_Cause_t cause; + struct osmo_sockaddr cur_osa = {}; + socklen_t len = sizeof(cur_osa); rc = hnbap_decode_hnbregisterrequesties(&ies, in); if (rc < 0) { @@ -499,6 +501,15 @@ ctx->id.mnc = plmn.mnc; cell_id_str = umts_cell_id_name(&ctx->id); + if (getpeername(ofd->fd, &cur_osa.u.sa, &len) < 0) { + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "HNB-REGISTER-REQ %s: rejecting due to getpeername() error: %s\n", + cell_id_str, strerror(errno)); + hnbap_free_hnbregisterrequesties(&ies); + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_hNB_parameter_mismatch; + return hnbgw_tx_hnb_register_rej(ctx, &cause); + } + hnbp = hnb_persistent_find_by_id(&ctx->id); if (!hnbp && g_hnbgw->config.accept_all_hnb) hnbp = hnb_persistent_alloc(&ctx->id); @@ -510,6 +521,7 @@ cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_unauthorised_HNB; return hnbgw_tx_hnb_register_rej(ctx, &cause); } + ctx->persistent = hnbp; hnbp->ctx = ctx; @@ -523,22 +535,13 @@ * fault (bug), and we release the old context to keep going... */ struct osmo_fd *other_fd = osmo_stream_srv_get_ofd(hnb->conn); struct osmo_sockaddr other_osa = {}; - struct osmo_sockaddr cur_osa = {}; socklen_t len = sizeof(other_osa); if (getpeername(other_fd->fd, &other_osa.u.sa, &len) < 0) { LOGHNB(ctx, DHNBAP, LOGL_ERROR, "BUG! Found old registered HNB with invalid socket, releasing it\n"); hnb_context_release(hnb); continue; } - len = sizeof(cur_osa); - if (getpeername(ofd->fd, &cur_osa.u.sa, &len) < 0) { - LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Error getpeername(): %s\n", strerror(errno)); - if (osmo_sockaddr_cmp(&cur_osa, &other_osa) == 0) { - LOGHNB(ctx, DHNBAP, LOGL_ERROR, "BUG! Found old registered HNB with same remote address, releasing it\n"); - hnb_context_release(hnb); - continue; - } - } else if (osmo_sockaddr_cmp(&cur_osa, &other_osa) == 0) { + if (osmo_sockaddr_cmp(&cur_osa, &other_osa) == 0) { LOGHNB(ctx, DHNBAP, LOGL_ERROR, "BUG! Found old registered HNB with same remote address, releasing it\n"); hnb_context_release(hnb); continue; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36567?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I980de31d1296c3b956146a461609bec76ed3d430 Gerrit-Change-Number: 36567 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-hnbgw: Set STATSVTY.CTRL_HOSTNAME to correct IP address

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36565?usp=email ) Change subject: ttcn3-hnbgw: Set STATSVTY.CTRL_HOSTNAME to correct IP address ...................................................................... ttcn3-hnbgw: Set STATSVTY.CTRL_HOSTNAME to correct IP address Also update osmo-hnbgw.cfg to configure statsd, as done in osmo-ttcn3-hacks.git 904b5f1a56629b84f67807a75d5c0b356cc7d726. Change-Id: I80c228b7ad4b9fb06b1651f23a2932bf19374297 --- M ttcn3-hnbgw-test/HNBGW_Tests.cfg M ttcn3-hnbgw-test/osmo-hnbgw.cfg 2 files changed, 26 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-hnbgw-test/HNBGW_Tests.cfg b/ttcn3-hnbgw-test/HNBGW_Tests.cfg index 8ee08d2..a23f3c1 100644 --- a/ttcn3-hnbgw-test/HNBGW_Tests.cfg +++ b/ttcn3-hnbgw-test/HNBGW_Tests.cfg @@ -10,6 +10,7 @@ [TESTPORT_PARAMETERS] *.HNBGWVTY.CTRL_HOSTNAME := "172.18.35.20" +*.STATSVTY.CTRL_HOSTNAME := "172.18.35.20" [MODULE_PARAMETERS] HNBGW_Tests.mp_hnodeb_ip := "172.18.35.203"; diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index bed6f51..e2692dc 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -19,10 +19,21 @@ ! line vty no login - bind 0.0.0.0 + bind 172.18.35.20 ctrl - bind 0.0.0.0 + bind 172.18.35.20 ! + +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 172.18.35.203 + remote-port 8125 + flush-period 1 + mtu 1024 + enable + cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua local-ip 172.18.35.20 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36565?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I80c228b7ad4b9fb06b1651f23a2932bf19374297 Gerrit-Change-Number: 36565 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2024