Attention is currently required from: fixeria, osmith.
pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210?usp=email )
Change subject: Common.cfg: Logging: add %p to LogFile format
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210/comment/684f8bff_1147… :
PS1, Line 18: the file name with any of the meta characters, I've tried it out.
> Well, 'name of the TTCN-3 executable' != `testsuite name`. Does not sound like a bug to me.
I didn't mean it's a bug, I simply meant there should be a way to easily access the testsuite name with a meta character.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0a2a376cd11784addff8ca228e3cc3e831b418a2
Gerrit-Change-Number: 40210
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 05 May 2025 11:13:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40214?usp=email )
Change subject: asp: Avoid accessing dyn sctp-server ASP after closing conn during restart
......................................................................
asp: Avoid accessing dyn sctp-server ASP after closing conn during restart
This happens for instance if a dynamic ASP is shut down through VTY.
Change-Id: Ic9f2b01ddcf38d93396701cf5d406d1cfd18704d
---
M src/osmo_ss7_asp.c
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/14/40214/1
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 56767e9..1c303b6 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -735,6 +735,7 @@
{
int rc;
char bufloc[512], bufrem[512];
+ bool destroyed = asp->dyn_allocated && asp->cfg.is_server;
OSMO_ASSERT(ss7_initialized);
ss7_asp_peer_snprintf(bufloc, sizeof(bufloc), &asp->cfg.local);
@@ -745,6 +746,10 @@
/* First tear down previous state if existing: */
ss7_asp_disconnect_stream(asp);
+ /* Dynamic ASPs in SCTP=server are destroyed when connection is closed. */
+ if (destroyed)
+ return 0;
+
/* The ASP FSM must be terminated *after* tearing down the conn, so that
* DISCONNECT events go up the stack */
if (asp->fi) {
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40214?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ic9f2b01ddcf38d93396701cf5d406d1cfd18704d
Gerrit-Change-Number: 40214
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: osmith, pespin.
fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210?usp=email )
Change subject: Common.cfg: Logging: add %p to LogFile format
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210/comment/86c6b96f_1e32… :
PS1, Line 18: the file name with any of the meta characters, I've tried it out.
> So we shall maybe open a bug report upstream about the missing feature?
Well, 'name of the TTCN-3 executable' != `testsuite name`. Does not sound like a bug to me.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0a2a376cd11784addff8ca228e3cc3e831b418a2
Gerrit-Change-Number: 40210
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 05 May 2025 11:11:24 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Attention is currently required from: osmith.
pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40213?usp=email )
Change subject: log_merge: use same prefix as for pcap files
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40213?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Id2937d711a54a34c0d87d080199b4c3d5a5d6e06
Gerrit-Change-Number: 40213
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 05 May 2025 10:54:57 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: osmith.
pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40212?usp=email )
Change subject: log_merge: ensure we don't overwrite the log file
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40212?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ieda3d95c60dfae208959b80d55a1e8c3925a9dad
Gerrit-Change-Number: 40212
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 05 May 2025 10:53:58 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: osmith.
pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210?usp=email )
Change subject: Common.cfg: Logging: add %p to LogFile format
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210/comment/6bdb9a89_ab1c… :
PS1, Line 18: the file name with any of the meta characters, I've tried it out.
So we shall maybe open a bug report upstream about the missing feature?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0a2a376cd11784addff8ca228e3cc3e831b418a2
Gerrit-Change-Number: 40210
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 05 May 2025 10:53:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210?usp=email )
Change subject: Common.cfg: Logging: add %p to LogFile format
......................................................................
Common.cfg: Logging: add %p to LogFile format
Add the process ID at the end of the log file that ttnc3 writes, to
avoid potential conflicts:
> Otherwise if you have eg TC_foobar in STP_Tests_M3UA and
> STP_Tests_IPA, you may end up rewriting one of them since both would be
> written with the same file name.
%e is the name of the TTCN-3 executable, e.g. STP_Tests even if the test
case is in STP_Tests_M3UA. It is not possible to get STP_Tests_M3UA into
the file name with any of the meta characters, I've tried it out.
Related: https://gitlab.eclipse.org/eclipse/titan/titan.core/-/blob/9.0.0/usrguide/r…
Change-Id: I0a2a376cd11784addff8ca228e3cc3e831b418a2
---
M Common.cfg
M log_merge.sh
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/40210/1
diff --git a/Common.cfg b/Common.cfg
index b8c76e6..045a745 100644
--- a/Common.cfg
+++ b/Common.cfg
@@ -6,7 +6,7 @@
TCPDUMP_STOP := $TTCN3_HACKS_PATH"/ttcn3-tcpdump-stop.sh"
[LOGGING]
-LogFile := "%e-%c-%h-%r.%s"
+LogFile := "%e-%c-%h-%r-%p.%s"
AppendFile := Yes;
SourceInfoFormat := Single;
LogSourceInfo := Yes;
diff --git a/log_merge.sh b/log_merge.sh
index 886b788..d3d5986 100755
--- a/log_merge.sh
+++ b/log_merge.sh
@@ -3,7 +3,7 @@
# This script generates per-testcase merged logs.
# In order to work, you need to set the following test config:
# [LOGGING]
-# LogFile := "%e-%c-%h-%r.%s"
+# LogFile := "%e-%c-%h-%r-%p.%s"
#
# the output files will be called "Module-Testcase.merged"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0a2a376cd11784addff8ca228e3cc3e831b418a2
Gerrit-Change-Number: 40210
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>