osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40304?usp=email )
Change subject: tsetenv: podman_install: tweak git commands
......................................................................
tsetenv: podman_install: tweak git commands
* Do not run them in podman: git is required to run testenv, by not
running it through podman the command in the log is shorter.
* Set advice.detachedHead=false for the git clone to avoid printing the
"You are in 'detached HEAD' state. You can look around ..." text block
that isn't useful in this context.
Change-Id: I2ee26764d1471e54eff748e11ec2cce6fb662667
---
M _testenv/testenv/podman_install.py
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/40304/1
diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py
index 13552b4..8fdd871 100644
--- a/_testenv/testenv/podman_install.py
+++ b/_testenv/testenv/podman_install.py
@@ -113,7 +113,7 @@
branch = "master"
url = f"https://gerrit.osmocom.org/{project}"
if testenv.args.binary_repo.endswith(":latest"):
- ls_remote = testenv.cmd.run(["git", "ls-remote", "--tags", url], capture_output=True, text=True)
+ ls_remote = testenv.cmd.run(["git", "ls-remote", "--tags", url], capture_output=True, text=True, no_podman=True)
tags = []
pattern = re.compile("^\d+\.\d+\.\d+$")
for line in ls_remote.stdout.split("\n"):
@@ -128,6 +128,8 @@
testenv.cmd.run(
[
"git",
+ "-c",
+ "advice.detachedHead=false",
"-C",
git_dir,
"clone",
@@ -136,7 +138,8 @@
"--branch",
branch,
url,
- ]
+ ],
+ no_podman=True,
)
show_commit(project, git_dir_project)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40304?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: I2ee26764d1471e54eff748e11ec2cce6fb662667
Gerrit-Change-Number: 40304
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40302?usp=email )
Change subject: sccp_scoc: Match local conn by src_ref, not dest_ref
......................................................................
sccp_scoc: Match local conn by src_ref, not dest_ref
SCRC Routing Failure is dispatched when a local SCCP Connection Oriented
message fails to be routed to a peer.
Hence, in order to figure out if the msg belons to a local conn, we need
to use the src_ref (the sender), not the dst_ref (the peer's id).
As a result, event SCOC_E_RCOC_ROUT_FAIL_IND was potentially being set
to the wrong connection FSM.
Change-Id: I0090f4088de407b476cfb0a6d652b384af714306
---
M src/sccp_scoc.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/02/40302/1
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index 48c0845..01a78d0 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -1582,7 +1582,7 @@
xua_hdr_dump(xua, &xua_dialect_sua));
/* try to dispatch to connection FSM (if any) */
- conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF);
+ conn_id = xua_msg_get_u32(xua, SUA_IEI_SRC_REF);
conn = conn_find_by_id(inst, conn_id);
if (conn) {
osmo_fsm_inst_dispatch(conn->fi,
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40302?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: I0090f4088de407b476cfb0a6d652b384af714306
Gerrit-Change-Number: 40302
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40298?usp=email )
Change subject: sccp_scoc.c: assert value of sua_addr_parse()
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40298?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I008ee6f9024247c14d986a2baba061cc12bf68ec
Gerrit-Change-Number: 40298
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 14 May 2025 12:40:42 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: clufn, fixeria, laforge, lynxis lazus.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40297?usp=email )
Change subject: gsup: Fix rx of AuthInfoReq without IP addr val
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Please @callumfarrbennett@yahoo.com make sure you run ttcn3-epdg-test testsuite locally before submitting patches next time. See https://osmocom.org/projects/cellular-infrastructure/wiki/Titan_TTCN3_Tests… for more information.
I also encourage you to write new tests in there for new features/scenarios you are introducing, to make sure we don't have regressions in the future.
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40297?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: Iaa4b45a00e472a324ad98f57a54db04454935130
Gerrit-Change-Number: 40297
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: clufn <callumfarrbennett(a)yahoo.com>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: clufn <callumfarrbennett(a)yahoo.com>
Gerrit-Comment-Date: Wed, 14 May 2025 12:27:29 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40297?usp=email )
Change subject: gsup: Fix rx of AuthInfoReq without IP addr val
......................................................................
gsup: Fix rx of AuthInfoReq without IP addr val
The var PdpAddress was being reassigned and erlang crashed when running
ttcn3-epdg-test with:
"""
{{badmatch,#{ipv4 => <<0,0,0,0>>}},[{gsup_server,rx_gsup,3,
[{file,"/tmp/osmo-epdg/src/gsup_server.erl"},{line,308}]},
{misc,'-spawn_wait_ret/2-fun-0-',2,
[{file,"/tmp/osmo-epdg/src/misc.erl"},{line,43}]}]}
"""
Fixes: 2d2e43c061652ae6c9fd409e9badc33d5d66e068
Change-Id: Iaa4b45a00e472a324ad98f57a54db04454935130
---
M src/gsup_server.erl
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/97/40297/1
diff --git a/src/gsup_server.erl b/src/gsup_server.erl
index c4c28cf..256522e 100644
--- a/src/gsup_server.erl
+++ b/src/gsup_server.erl
@@ -296,13 +296,14 @@
case maps:find(pdp_info_list, GsupMsgRx) of
{ok, [PdpInfo]} ->
#{pdp_context_id := _PDPCtxId,
- pdp_address := #{address := PdpAddress,
+ pdp_address := #{address := PdpAddressRx,
pdp_type_nr := PdpTypeNr,
pdp_type_org := 241},
access_point_name := Apn
} = PdpInfo,
- case maps:is_key(ipv4,PdpAddress) or maps:is_key(ipv6,PdpAddress) of
- true -> ok; %% Address received so do nothing
+ case maps:is_key(ipv4,PdpAddressRx) or maps:is_key(ipv6,PdpAddressRx) of
+ true -> %% Address received, use it
+ PdpAddress = PdpAddressRx;
false -> %% No address received from strongswan, use a default value
PdpTypeNr = ?GTP_PDP_ADDR_TYPE_NR_IPv4,
PdpAddress = #{ipv4 => <<0,0,0,0>>}
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40297?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: Iaa4b45a00e472a324ad98f57a54db04454935130
Gerrit-Change-Number: 40297
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email )
Change subject: Introduce tests/osmo-config-merge testsuite
......................................................................
Patch Set 4:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/1ea205f3_6972069e?… :
PS4, Line 7: testsuite
> Can you explain why is it a whole new testsuite and not just part of the existing testsuite?
There's several reasons:
* This is testing an app, not some parts of the library. Hence, it allows specifically testing the app, or skipping it later on if user is not interested about it.
* Given this app only function is to process text files, it feels natural to use the testsuite since it provides all the match and diff features. The natural way to test it is writing several input tests and validating the output. This means we'll potentially end up with tons of tests in the testsuite validating different scenarios.
* Te tests/testsuite is already quite convoluted with tons of different stuff
Does that mean it coudln't be in testsuite/test? It could be there. IMHO it's better to have it in a separate testsuite for the above reasons.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9
Gerrit-Change-Number: 40295
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 14 May 2025 11:57:30 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>