Attention is currently required from: daniel, fixeria, lynxis lazus.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34285?usp=email )
Change subject: gsup: implement a (re-)connect the GSUP link if it fails
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34285?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo_dia2gsup
Gerrit-Branch: master
Gerrit-Change-Id: Id531d202ded123786d7a41dd0d7c3695af59fc2d
Gerrit-Change-Number: 34285
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Sun, 03 Sep 2023 15:26:12 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34282?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: server_cb: use a define for the VENDOR_3GPP code
......................................................................
server_cb: use a define for the VENDOR_3GPP code
Also use a proper variable name
Change-Id: I9bd99998963624f7688b972cbb3908fae5686231
---
M src/server_cb.erl
1 file changed, 13 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/server_cb.erl b/src/server_cb.erl
index 26a7ac2..862b9e7 100644
--- a/src/server_cb.erl
+++ b/src/server_cb.erl
@@ -6,6 +6,7 @@
-include_lib("diameter_3gpp_ts29_272.hrl").
-include_lib("osmo_gsup/include/gsup_protocol.hrl").
+-define(DIA_VENDOR_3GPP, 10415).
%% diameter callbacks
-export([peer_up/3, peer_down/3, pick_peer/4, prepare_request/3, prepare_retransmit/3,
@@ -180,7 +181,7 @@
-define(GMM_CAUSE_INV_MAND_INFO, 16#60).
-define(GMM_CAUSE_PROTO_ERR_UNSPEC, 16#6f).
--define(EXP_RES(Foo), #'Experimental-Result'{'Vendor-Id'=10415, 'Experimental-Result-Code'=Foo}).
+-define(EXP_RES(Exp), #'Experimental-Result'{'Vendor-Id'=?DIA_VENDOR_3GPP, 'Experimental-Result-Code'=Exp}).
%% see 29.272 Annex A/B
-type empty_or_intl() :: [] | [integer()].
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34282?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo_dia2gsup
Gerrit-Branch: master
Gerrit-Change-Id: I9bd99998963624f7688b972cbb3908fae5686231
Gerrit-Change-Number: 34282
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: daniel, pespin.
arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34224?usp=email )
Change subject: stream tests: Eliminate timestamps from output
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> I submitted the srv_destroy fix from daniel here for review (changed order of calls bit): […]
Thank you both for the input.
If the aim is to understand what changed the behavior of a patch that used to produce predictable timestamps and then did not, we don't get an answer by changing said patch. That's why I posted the earlier comment here after looking at what happened in between it working and then suddenly not working anymore (essentially) after rebasing (apart from the additional output causing test failure, only talking about the timestamp behavior).
I did try destroying the 'server link' and reconnecting in between running the server side test (iirc I even added a sleep for a second to see if the problem was the new connection for the other test need variable amounts of time to reconnect) and the client side test and the problem persisted.
Or maybe something else in the check was failing and I overlooked that.
Now (using Daniels branch origin/daniel/stream_tests_lsan), the only thing I need to get predictable output is
```
test_segm_ipa_stream_srv_run(tall_test, host, port, srv);
osmo_stream_srv_link_destroy(srv);
srv = osmo_stream_srv_link_create(tall_test);
if (!srv) {
printf("Unable to create server\n");
return EXIT_FAILURE;
}
test_segm_ipa_stream_cli_run(tall_test, host, port, srv);
```
diff:
```
diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c
index 1cf2687..b51dc0f 100644
--- a/tests/stream/stream_test.c
+++ b/tests/stream/stream_test.c
@@ -879,10 +879,17 @@ int main(void)
test_recon(tall_test, host, port, 8, srv, false);
test_segm_ipa_stream_srv_run(tall_test, host, port, srv);
- test_segm_ipa_stream_cli_run(tall_test, host, port, srv);
osmo_stream_srv_link_destroy(srv);
+ srv = osmo_stream_srv_link_create(tall_test);
+ if (!srv) {
+ printf("Unable to create server\n");
+ return EXIT_FAILURE;
+ }
+
+ test_segm_ipa_stream_cli_run(tall_test, host, port, srv);
+
talloc_report_full(tall_test, stderr);
printf("Stream tests completed\n");
```
Daniels branch alone *did not* do it for me, not on a fresh clone of libosmo-netif, either.
I still find it weird that that either change would suddenly be needed. Shouldn't the two tests still be printing predictable timestamps without recreating the server link in between?
At least that used to be the case.
There also wasn't really any memleak *affecting* the test process from my understanding, because even if a destroy was missing in between, it's not like the test was continuously spamming allocs (?)
Maybe it runs differently for the two of you, because you are running it with the sanitizer enabled?
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34224?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: I7faed932927d4f6e328a28c7f30a647a7272e89c
Gerrit-Change-Number: 34224
Gerrit-PatchSet: 2
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 02 Sep 2023 20:00:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: daniel, fixeria, pespin.
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259?usp=email )
Change subject: Translate GSUP Auth Info Answer error Cause in Diamater AIA
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS1:
> @lynxis please feel free to take over and update the errors as you see fit, I didn't see the table y […]
Done
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo_dia2gsup
Gerrit-Branch: master
Gerrit-Change-Id: I32622713c2c1f40e1d9c5597ffab8cb211171fc2
Gerrit-Change-Number: 34259
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: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 02 Sep 2023 15:52:26 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment