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

[L] Change in osmo-ttcn3-hacks[master]: Split GTP_CodecPort/GTP_Templates into C and U variants

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email ) Change subject: Split GTP_CodecPort/GTP_Templates into C and U variants ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: With this patch I can add GTPv1-U support to GTPv2C_Emulation without having to includes tons of GTPC related code. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d Gerrit-Change-Number: 36126 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 29 Feb 2024 19:56:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Split GTP_CodecPort/GTP_Templates into C and U variants

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Split GTP_CodecPort/GTP_Templates into C and U variants ...................................................................... Split GTP_CodecPort/GTP_Templates into C and U variants The Types are already split in the dependent modules in GTPC_Types and GTPU_Types. There's no point in keeping them together in the same file since those 2 protocols are mostly independent. Furthermore, testsuites using GTPv2C + GTPv1U don't need GTPv1C. Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d --- M gbproxy/gen_links.sh M gbproxy/regen_makefile.sh M ggsn_tests/GGSN_Tests.default M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M ggsn_tests/regen_makefile.sh M hnodeb/HNBGW_ConnectionHandler.ttcn M hnodeb/HNB_Tests.ttcn M hnodeb/gen_links.sh M hnodeb/regen_makefile.sh M library/GTP_Emulation.ttcn R library/GTPv1C_CodecPort.ttcn R library/GTPv1C_CodecPort_CtrlFunct.ttcn R library/GTPv1C_CodecPort_CtrlFunctDef.cc R library/GTPv1C_Templates.ttcn A library/GTPv1U_CodecPort.ttcn A library/GTPv1U_CodecPort_CtrlFunct.ttcn A library/GTPv1U_CodecPort_CtrlFunctDef.cc A library/GTPv1U_Templates.ttcn M library/GTPv2_CodecPort.ttcn M library/GTPv2_Emulation.ttcn M mme/MME_Tests.ttcn M mme/gen_links.sh M mme/regen_makefile.sh M pgw/gen_links.sh M pgw/regen_makefile.sh M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/regen_makefile.sh 29 files changed, 375 insertions(+), 294 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/36126/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d Gerrit-Change-Number: 36126 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 month, 4 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Split GTP_CodecPort/GTP_Templates into C and U variants

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Split GTP_CodecPort/GTP_Templates into C and U variants ...................................................................... Split GTP_CodecPort/GTP_Templates into C and U variants The Types are already split in the dependent modules in GTPC_Types and GTPU_Types. There's no point in keeping them together in the same file since those 2 protocols are mostly independent. Furthermore, testsuites using GTPv2C + GTPv1U don't need GTPv1C. Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d --- M gbproxy/gen_links.sh M gbproxy/regen_makefile.sh M ggsn_tests/GGSN_Tests.default M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M ggsn_tests/regen_makefile.sh M hnodeb/HNBGW_ConnectionHandler.ttcn M hnodeb/HNB_Tests.ttcn M hnodeb/gen_links.sh M hnodeb/regen_makefile.sh M library/GTP_Emulation.ttcn R library/GTPv1C_CodecPort.ttcn R library/GTPv1C_CodecPort_CtrlFunct.ttcn R library/GTPv1C_CodecPort_CtrlFunctDef.cc R library/GTPv1C_Templates.ttcn A library/GTPv1U_CodecPort.ttcn A library/GTPv1U_CodecPort_CtrlFunct.ttcn A library/GTPv1U_CodecPort_CtrlFunctDef.cc A library/GTPv1U_Templates.ttcn M library/GTPv2_CodecPort.ttcn M library/GTPv2_Emulation.ttcn M mme/MME_Tests.ttcn M mme/gen_links.sh M mme/regen_makefile.sh M pgw/gen_links.sh M pgw/regen_makefile.sh M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/regen_makefile.sh 29 files changed, 377 insertions(+), 294 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/36126/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d Gerrit-Change-Number: 36126 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 month, 4 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Split GTP_CodecPort/GTP_Templates into C and U variants

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Split GTP_CodecPort/GTP_Templates into C and U variants ...................................................................... Split GTP_CodecPort/GTP_Templates into C and U variants The Types are already split in the dependent modules in GTPC_Types and GTPU_Types. There's no point in keeping them together in the same file since those 2 protocols are mostly independent. Furthermore, testsuites using GTPv2C + GTPv1U don't need GTPv1C. Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d --- M gbproxy/gen_links.sh M gbproxy/regen_makefile.sh M ggsn_tests/GGSN_Tests.default M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M ggsn_tests/regen_makefile.sh M hnodeb/HNBGW_ConnectionHandler.ttcn M hnodeb/HNB_Tests.ttcn M hnodeb/gen_links.sh M hnodeb/regen_makefile.sh M library/GTP_Emulation.ttcn R library/GTPv1C_CodecPort.ttcn R library/GTPv1C_CodecPort_CtrlFunct.ttcn R library/GTPv1C_CodecPort_CtrlFunctDef.cc R library/GTPv1C_Templates.ttcn A library/GTPv1U_CodecPort.ttcn A library/GTPv1U_CodecPort_CtrlFunct.ttcn A library/GTPv1U_CodecPort_CtrlFunctDef.cc A library/GTPv1U_Templates.ttcn M library/GTPv2_CodecPort.ttcn M library/GTPv2_Emulation.ttcn M mme/MME_Tests.ttcn M mme/gen_links.sh M mme/regen_makefile.sh M pgw/gen_links.sh M pgw/regen_makefile.sh M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/regen_makefile.sh 29 files changed, 377 insertions(+), 294 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/36126/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d Gerrit-Change-Number: 36126 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 month, 4 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Split GTP_CodecPort/GTP_Templates into C and U variants

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email ) Change subject: Split GTP_CodecPort/GTP_Templates into C and U variants ...................................................................... Split GTP_CodecPort/GTP_Templates into C and U variants The Types are already split in the dependent modules in GTPC_Types and GTPU_Types. There's no point in keeping them together in the same file since those 2 protocols are mostly independent. Furthermore, testsuites using GTPv2C + GTPv1U don't need GTPv1C. Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d --- M gbproxy/gen_links.sh M gbproxy/regen_makefile.sh M ggsn_tests/GGSN_Tests.default M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M ggsn_tests/regen_makefile.sh M hnodeb/HNBGW_ConnectionHandler.ttcn M hnodeb/HNB_Tests.ttcn M hnodeb/gen_links.sh M hnodeb/regen_makefile.sh M library/GTP_Emulation.ttcn R library/GTPv1C_CodecPort.ttcn R library/GTPv1C_CodecPort_CtrlFunct.ttcn R library/GTPv1C_CodecPort_CtrlFunctDef.cc R library/GTPv1C_Templates.ttcn A library/GTPv1U_CodecPort.ttcn A library/GTPv1U_CodecPort_CtrlFunct.ttcn A library/GTPv1U_CodecPort_CtrlFunctDef.cc A library/GTPv1U_Templates.ttcn M mme/MME_Tests.ttcn M mme/gen_links.sh M mme/regen_makefile.sh M pgw/gen_links.sh M pgw/regen_makefile.sh M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/regen_makefile.sh 27 files changed, 353 insertions(+), 258 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/36126/1 diff --git a/gbproxy/gen_links.sh b/gbproxy/gen_links.sh index 17328f7..c7756ec 100755 --- a/gbproxy/gen_links.sh +++ b/gbproxy/gen_links.sh @@ -91,8 +91,8 @@ FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " # IPA_Emulation + dependencies FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn -GTP_Templates.ttcn IPCP_Types.ttcn " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn +GTPv1C_Templates.ttcn IPCP_Types.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh index e4982ae..cd17d5c 100755 --- a/gbproxy/regen_makefile.sh +++ b/gbproxy/regen_makefile.sh @@ -10,7 +10,8 @@ BSSGP_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc diff --git a/ggsn_tests/GGSN_Tests.default b/ggsn_tests/GGSN_Tests.default index 33b96cb..9832ba1 100644 --- a/ggsn_tests/GGSN_Tests.default +++ b/ggsn_tests/GGSN_Tests.default @@ -21,6 +21,6 @@ GGSN_Tests.m_ggsn_ip6_dns1 := "2001:4860:4860::8888" GGSN_Tests.m_ggsn_ip6_dns2 := "2001:4860:4860::8844" Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoGGSN"; -GTP_CodecPort.mp_pl_SystemUnderTest := GGSN; +GTPv1C_CodecPort.mp_pl_SystemUnderTest := GGSN; [EXECUTE] diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index c949dc9..45587f1 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -18,11 +18,14 @@ import from Misc_Helpers all; import from IPL4asp_PortType all; import from IPL4asp_Types all; - import from GTP_CodecPort all; - import from GTP_CodecPort_CtrlFunct all; - import from GTP_Templates all; + import from GTPv1C_CodecPort all; + import from GTPv1U_CodecPort all; + import from GTPv1C_CodecPort_CtrlFunct all; + import from GTPv1U_CodecPort_CtrlFunct all; import from GTPC_Types all; import from GTPU_Types all; + import from GTPv1C_Templates all; + import from GTPv1U_Templates all; import from IPCP_Types all; import from PAP_Types all; import from IP_Types all; @@ -279,12 +282,12 @@ var Result res; map(self:GTPC, system:GTPC); - res := GTP_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, m_bind_ip_gtpc, GTP1C_PORT, {udp:={}}); + res := GTPv1C_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, m_bind_ip_gtpc, GTP1C_PORT, {udp:={}}); log("GTP1C ConnectionID: ", res.connId); g_peer_c.connId := res.connId; map(self:GTPU, system:GTPU); - res := GTP_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, m_bind_ip_gtpu, GTP1U_PORT, {udp:={}}); + res := GTPv1U_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, m_bind_ip_gtpu, GTP1U_PORT, {udp:={}}); g_peer_u.connId:= res.connId; g_restart_ctr := f_rnd_octstring(1); diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index 4981e64..ebeb94b 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -59,7 +59,8 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn PAP_Types.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index bd1b958..ce8e15a 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -9,7 +9,8 @@ DIAMETER_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc ICMP_EncDec.cc ICMPv6_EncDec.cc IPL4asp_PT.cc diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn index 8e95616..5d5417d 100644 --- a/hnodeb/HNBGW_ConnectionHandler.ttcn +++ b/hnodeb/HNBGW_ConnectionHandler.ttcn @@ -35,8 +35,8 @@ import from HNBLLIF_Templates all; import from GTP_Emulation all; -import from GTP_Templates all; -import from GTP_CodecPort all; +import from GTPv1C_Templates all; +import from GTPv1U_CodecPort all; import from GTPU_Types all; /* this component represents a single Iuh connection at the HNBGW. */ diff --git a/hnodeb/HNB_Tests.ttcn b/hnodeb/HNB_Tests.ttcn index df7a04c..1178695 100644 --- a/hnodeb/HNB_Tests.ttcn +++ b/hnodeb/HNB_Tests.ttcn @@ -53,7 +53,7 @@ import from HNBLLIF_Templates all; import from GTPU_Types all; -import from GTP_Templates all; +import from GTPv1U_Templates all; import from GTP_Emulation all; import from IuUP_Types all; diff --git a/hnodeb/gen_links.sh b/hnodeb/gen_links.sh index 84495e9..4f42c5f 100755 --- a/hnodeb/gen_links.sh +++ b/hnodeb/gen_links.sh @@ -63,7 +63,9 @@ FILES+="Iuh_Types.ttcn Iuh_CodecPort.ttcn Iuh_CodecPort_CtrlFunctDef.cc Iuh_CodecPort_CtrlFunct.ttcn Iuh_Emulation.ttcn DNS_Helpers.ttcn " FILES+="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn GSM_Types.ttcn " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " +FILES+="GTP_Emulation.ttcn IPCP_Types.ttcn GSM_Types.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/hnodeb/regen_makefile.sh b/hnodeb/regen_makefile.sh index 10f5c21..cf5fed3 100755 --- a/hnodeb/regen_makefile.sh +++ b/hnodeb/regen_makefile.sh @@ -27,7 +27,8 @@ UD_PT.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc " export CPPFLAGS_TTCN3=" diff --git a/library/GTP_Emulation.ttcn b/library/GTP_Emulation.ttcn index 689fb0d..f5c0eef 100644 --- a/library/GTP_Emulation.ttcn +++ b/library/GTP_Emulation.ttcn @@ -16,8 +16,10 @@ import from Osmocom_Types all; import from GTPC_Types all; import from GTPU_Types all; -import from GTP_CodecPort all; -import from GTP_CodecPort_CtrlFunct all; +import from GTPv1C_CodecPort all; +import from GTPv1U_CodecPort all; +import from GTPv1C_CodecPort_CtrlFunct all; +import from GTPv1U_CodecPort_CtrlFunct all; /*********************************************************************** * Main Emulation Component @@ -172,13 +174,13 @@ var Result res; map(self:GTPC, system:GTPC); - res := GTP_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, cfg.gtpc_bind_ip, + res := GTPv1C_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, cfg.gtpc_bind_ip, cfg.gtpc_bind_port, {udp:={}}); g_gtpc_id := res.connId; if (isvalue(cfg.gtpu_bind_ip) and isvalue(cfg.gtpu_bind_port)) { map(self:GTPU, system:GTPU); - res := GTP_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, cfg.gtpu_bind_ip, + res := GTPv1U_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, cfg.gtpu_bind_ip, cfg.gtpu_bind_port, {udp:={}}); g_gtpu_id := res.connId; } diff --git a/library/GTP_CodecPort.ttcn b/library/GTPv1C_CodecPort.ttcn similarity index 61% rename from library/GTP_CodecPort.ttcn rename to library/GTPv1C_CodecPort.ttcn index b516611..956a674 100644 --- a/library/GTP_CodecPort.ttcn +++ b/library/GTPv1C_CodecPort.ttcn @@ -1,4 +1,4 @@ -/* dual-faced port sitting on top of IPL4_asp UDP to encode/decode GTP +/* dual-faced port sitting on top of IPL4_asp UDP to encode/decode GTPv1C * (C) 2017 Harald Welte <laforge(a)gnumonks.org> * All rights reserved. * @@ -9,11 +9,10 @@ */ -module GTP_CodecPort { +module GTPv1C_CodecPort { import from IPL4asp_PortType all; import from IPL4asp_Types all; import from GTPC_Types all; - import from GTPU_Types all; import from Misc_Helpers all; modulepar { @@ -21,7 +20,7 @@ } /* identifies a remote peer (sender or receiver) */ - type record GtpPeer { + type record Gtp1cPeer { ConnectionId connId, HostName remName, PortNumber remPort @@ -29,16 +28,10 @@ /* Decoded GTP1C (Control Plane), used in send and receive direction */ type record Gtp1cUnitdata { - GtpPeer peer, + Gtp1cPeer peer, PDU_GTPC gtpc } - /* Decoded GTP1U (User Plane), used in send and receive direction */ - type record Gtp1uUnitdata { - GtpPeer peer, - PDU_GTPU gtpu - } - /* Translation port on top of IPL4asp; ASP_Event passed through transparently */ type port GTPC_PT message { out Gtp1cUnitdata; @@ -69,33 +62,4 @@ log2str("Rx GTPv1-C with field length ", out_ud.gtpc.lengthf, " + 8 != exp ", lengthof(in_ud.msg))); } } with { extension "prototype(fast)" }; - - - /* dual-faced port on top of IPL4asp; ASP_Event passed through transparently */ - type port GTPU_PT message { - out Gtp1uUnitdata; - in Gtp1uUnitdata, - ASP_ConnId_ReadyToRelease, - ASP_Event; - } with { extension "user IPL4asp_PT - out(Gtp1uUnitdata -> ASP_SendTo: function(f_enc_Gtp1uUD)) - in(ASP_RecvFrom -> Gtp1uUnitdata: function(f_dec_Gtp1uUD); - ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; - ASP_Event -> ASP_Event: simple)" } - - function f_enc_Gtp1uUD(in Gtp1uUnitdata in_ud, out ASP_SendTo out_ud) { - out_ud.connId := in_ud.peer.connId; - out_ud.remName := in_ud.peer.remName; - out_ud.remPort := in_ud.peer.remPort; - out_ud.proto := { udp := {} }; - out_ud.msg := enc_PDU_GTPU(in_ud.gtpu); - } with { extension "prototype(fast)" }; - - function f_dec_Gtp1uUD(in ASP_RecvFrom in_ud, out Gtp1uUnitdata out_ud) { - out_ud.peer.connId := in_ud.connId; - out_ud.peer.remName := in_ud.remName; - out_ud.peer.remPort := in_ud.remPort; - out_ud.gtpu := dec_PDU_GTPU(in_ud.msg); - } with { extension "prototype(fast)" }; - } diff --git a/library/GTP_CodecPort_CtrlFunct.ttcn b/library/GTPv1C_CodecPort_CtrlFunct.ttcn similarity index 78% rename from library/GTP_CodecPort_CtrlFunct.ttcn rename to library/GTPv1C_CodecPort_CtrlFunct.ttcn index 4f61af7..e0a5ee7 100644 --- a/library/GTP_CodecPort_CtrlFunct.ttcn +++ b/library/GTPv1C_CodecPort_CtrlFunct.ttcn @@ -1,6 +1,6 @@ -module GTP_CodecPort_CtrlFunct { +module GTPv1C_CodecPort_CtrlFunct { - import from GTP_CodecPort all; + import from GTPv1C_CodecPort all; import from IPL4asp_Types all; external function f_IPL4_listen( @@ -39,12 +39,4 @@ in ConnectionId id, out UserData userData ) return Result; - - external function f_GTPU_listen( - inout GTPU_PT portRef, - in HostName locName, - in PortNumber locPort, - in ProtoTuple proto, - in OptionList options := {} - ) return Result; } diff --git a/library/GTP_CodecPort_CtrlFunctDef.cc b/library/GTPv1C_CodecPort_CtrlFunctDef.cc similarity index 69% rename from library/GTP_CodecPort_CtrlFunctDef.cc rename to library/GTPv1C_CodecPort_CtrlFunctDef.cc index c0b9391..2227fe1 100644 --- a/library/GTP_CodecPort_CtrlFunctDef.cc +++ b/library/GTPv1C_CodecPort_CtrlFunctDef.cc @@ -1,11 +1,11 @@ #include "IPL4asp_PortType.hh" #include "IPL4asp_PT.hh" -#include "GTP_CodecPort.hh" +#include "GTPv1C_CodecPort.hh" -namespace GTP__CodecPort__CtrlFunct { +namespace GTPv1C__CodecPort__CtrlFunct { IPL4asp__Types::Result f__IPL4__listen( - GTP__CodecPort::GTPC__PT& portRef, + GTPv1C__CodecPort::GTPC__PT& portRef, const IPL4asp__Types::HostName& locName, const IPL4asp__Types::PortNumber& locPort, const IPL4asp__Types::ProtoTuple& proto, @@ -13,9 +13,9 @@ { return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); } - + IPL4asp__Types::Result f__IPL4__connect( - GTP__CodecPort::GTPC__PT& portRef, + GTPv1C__CodecPort::GTPC__PT& portRef, const IPL4asp__Types::HostName& remName, const IPL4asp__Types::PortNumber& remPort, const IPL4asp__Types::HostName& locName, @@ -29,38 +29,27 @@ } IPL4asp__Types::Result f__IPL4__close( - GTP__CodecPort::GTPC__PT& portRef, - const IPL4asp__Types::ConnectionId& connId, + GTPv1C__CodecPort::GTPC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, const IPL4asp__Types::ProtoTuple& proto) { return f__IPL4__PROVIDER__close(portRef, connId, proto); } IPL4asp__Types::Result f__IPL4__setUserData( - GTP__CodecPort::GTPC__PT& portRef, + GTPv1C__CodecPort::GTPC__PT& portRef, const IPL4asp__Types::ConnectionId& connId, const IPL4asp__Types::UserData& userData) { return f__IPL4__PROVIDER__setUserData(portRef, connId, userData); } - + IPL4asp__Types::Result f__IPL4__getUserData( - GTP__CodecPort::GTPC__PT& portRef, + GTPv1C__CodecPort::GTPC__PT& portRef, const IPL4asp__Types::ConnectionId& connId, IPL4asp__Types::UserData& userData) { return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); } - - IPL4asp__Types::Result f__GTPU__listen( - GTP__CodecPort::GTPU__PT& portRef, - const IPL4asp__Types::HostName& locName, - const IPL4asp__Types::PortNumber& locPort, - const IPL4asp__Types::ProtoTuple& proto, - const IPL4asp__Types::OptionList& options) - { - return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); - } - } diff --git a/library/GTP_Templates.ttcn b/library/GTPv1C_Templates.ttcn similarity index 92% rename from library/GTP_Templates.ttcn rename to library/GTPv1C_Templates.ttcn index 30346d4..7a2a993 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTPv1C_Templates.ttcn @@ -1,4 +1,4 @@ -/* GTP Templates in TTCN-3 +/* GTPv1-C Templates in TTCN-3 * (C) 2018 Harald Welte <laforge(a)gnumonks.org> * contributions by sysmocom - s.f.m.c. GmbH * All rights reserved. @@ -9,13 +9,12 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -module GTP_Templates { +module GTPv1C_Templates { import from General_Types all; import from Osmocom_Types all; import from GTPC_Types all; - import from GTPU_Types all; - import from GTP_CodecPort all; + import from GTPv1C_CodecPort all; import from IPCP_Types all; import from GSM_Types all; // RoutingAreaIdentification, CellIdentity @@ -1765,157 +1764,6 @@ sON_TransferApplicationIdentity := son_app_id } - /* GTP-U */ - - template (present) PDU_GTPU tr_GTP1U_PDU(template (present) OCT1 msg_type, - template (present) OCT4 teid, - template (present) GTPU_IEs ies := ?) := { - pn_bit := ?, - s_bit := ?, - e_bit := ?, - spare := ?, - /* Protocol Type flag (PT) shall be set to '1' in GTP */ - pt := '1'B, - /* Version shall be set to decimal 1 ('001'). */ - version := '001'B, - messageType := msg_type, - lengthf := ?, - teid := teid, - opt_part := *, - gtpu_IEs := ies - } - - function f_GTPU_s_bit(template (omit) uint16_t seq) return BIT1 { - if (istemplatekind(seq, "omit")) { - return '0'B; - } - return '1'B; - } - - function f_GTPU_opt_part(template (omit) uint16_t seq) return template (omit) GTPU_Header_optional_part { - if (istemplatekind(seq, "omit")) { - return omit; - } - var GTPU_Header_optional_part ret := { - sequenceNumber := int2oct(valueof(seq), 2), - npduNumber := '00'O, - nextExtHeader := '00'O, - gTPU_extensionHeader_List := omit - }; - return ret; - } - - /* generalized GTP-U send template */ - template (value) PDU_GTPU ts_GTP1U_PDU(OCT1 msg_type, template (omit) uint16_t seq, OCT4 teid, GTPU_IEs ies) := { - /* N-PDU Number flag (PN): the GTP-U header contains a meaningful N-PDU Number field if the PN - * flag is set to 1. */ - pn_bit := '0'B, /* we assume the encoder overwrites this if an optional part is given */ - /* If the Sequence Number flag (S) is set to '1' the sequence number field is present and - * meaningful otherwise it is set to '0'. For GTP-U messages Echo Request, Echo Response, - * Error Indication and Supported Extension Headers Notification, the S flag shall be set to '1'. - * - * Note that the caller must ensure that these conditions hold. - * The caller can either pass a sequence number (we set s_bit to '1'B) when appropriate, - * or may omit the sequence number (we set s_bit to '0'B). */ - s_bit := f_GTPU_s_bit(seq), - /* Extension header presence */ - e_bit := '0'B, - spare := '0'B, - /* Protocol Type flag (PT) shall be set to '1' in GTP */ - pt := '1'B, - /* Version shall be set to decimal 1 ('001'). */ - version := '001'B, - messageType := msg_type, - lengthf := 0, /* we assume encoder overwrites this */ - teid := teid, - opt_part := f_GTPU_opt_part(seq), - gtpu_IEs := ies - } - - template (present) Gtp1uUnitdata tr_GTPU_MsgType(template (present) GtpPeer peer, - template (present) OCT1 msg_type, - template (present) OCT4 teid) := { - peer := peer, - gtpu := tr_GTP1U_PDU(msg_type, teid) - } - - - /* template matching reception of GTP-U echo-request/response */ - template (present) Gtp1uUnitdata tr_GTPU_PING(template (present) GtpPeer peer) := tr_GTPU_MsgType(peer, echoRequest, '00000000'O); - template (present) Gtp1uUnitdata tr_GTPU_PONG(template (present) GtpPeer peer) := tr_GTPU_MsgType(peer, echoResponse, '00000000'O); - - /* template matching reception of GTP-U GPDU */ - template GTPU_IEs t_GPDU(template (present) octetstring data) := { - g_PDU_IEs := { - data := data - } - } - template (present) Gtp1uUnitdata tr_GTPU_GPDU(template (present) GtpPeer peer, - template (present) OCT4 teid, - template (present) octetstring data := ?) := { - peer := peer, - gtpu := tr_GTP1U_PDU('FF'O, teid, t_GPDU(data)) - } - - template (present) GTPU_IEs ts_UEchoReqPDU := { - echoRequest_IEs := { - private_extension_gtpu := omit - } - } - - /* master template for sending a GTP-C echo request */ - template (value) Gtp1uUnitdata ts_GTPU_PING(GtpPeer peer, uint16_t seq) := { - peer := peer, - gtpu := ts_GTP1U_PDU(echoRequest, seq, '00000000'O, valueof(ts_UEchoReqPDU)) - } - - template GTPU_IEs ts_UEchoRespPDU(OCT1 restart_counter) := { - echoResponse_IEs := { - recovery_gtpu := { - type_gtpu := '00'O, /* we assume encoder fixes? */ - restartCounter := restart_counter - }, - private_extension_gtpu := omit - } - } - - /* master template for sending a GTP-U echo response */ - template (present) Gtp1uUnitdata ts_GTPU_PONG(GtpPeer peer, uint16_t seq, OCT1 rest_ctr) := { - peer := peer, - gtpu := ts_GTP1U_PDU(echoResponse, seq, '00000000'O, valueof(ts_UEchoRespPDU(rest_ctr))) - } - - template (value) GSNAddress_gtpu ts_UGsnAddr(octetstring ip_addr) := { - type_gtpu := '85'O, - lengthf := lengthof(ip_addr), - gSNAddressValue := ip_addr - } - - template (value) TeidDataI_gtpu ts_UteidDataI(OCT4 teid) := { - type_gtpu := '10'O, - teidDataI := teid - } - - template (value) GTPU_IEs ts_UErrorIndication(OCT4 teid, octetstring gsn_addr) := { - errorIndication_IEs := { - teidDataI_gtpu := ts_UteidDataI(teid), - gSNAddress_gtpu := ts_UGsnAddr(gsn_addr), - private_extension_gtpu := omit - } - } - - /* master template for sending a GTP-U Error indication */ - template (value) Gtp1uUnitdata ts_GTPU_ErrorIndication(GtpPeer peer, uint16_t seq, OCT4 teid, octetstring gsn_addr) := { - peer := peer, - gtpu := ts_GTP1U_PDU('1A'O, seq, '00000000'O, valueof(ts_UErrorIndication(teid, gsn_addr))) - } - - /* master template for sending a GTP-U user plane data */ - template (value) Gtp1uUnitdata ts_GTP1U_GPDU(GtpPeer peer, template (omit) uint16_t seq, OCT4 teid, octetstring data) := { - peer := peer, - gtpu := ts_GTP1U_PDU('FF'O, seq, teid, { g_PDU_IEs := { data := data }}) - } - /* 3GPP TS 29.060, section 7.7.57 */ template (value) RIM_RoutingAddress ts_RIM_RoutingAddress(octetstring addr_value) := { type_gtpc := '9F'O, diff --git a/library/GTPv1U_CodecPort.ttcn b/library/GTPv1U_CodecPort.ttcn new file mode 100644 index 0000000..59c5ef3 --- /dev/null +++ b/library/GTPv1U_CodecPort.ttcn @@ -0,0 +1,58 @@ +/* dual-faced port sitting on top of IPL4_asp UDP to encode/decode GTPv1-U + * (C) 2017 Harald Welte <laforge(a)gnumonks.org> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + + +module GTPv1U_CodecPort { + import from IPL4asp_PortType all; + import from IPL4asp_Types all; + import from GTPU_Types all; + import from Misc_Helpers all; + + /* identifies a remote peer (sender or receiver) */ + type record Gtp1uPeer { + ConnectionId connId, + HostName remName, + PortNumber remPort + } + + /* Decoded GTP1U (User Plane), used in send and receive direction */ + type record Gtp1uUnitdata { + Gtp1uPeer peer, + PDU_GTPU gtpu + } + + /* dual-faced port on top of IPL4asp; ASP_Event passed through transparently */ + type port GTPU_PT message { + out Gtp1uUnitdata; + in Gtp1uUnitdata, + ASP_ConnId_ReadyToRelease, + ASP_Event; + } with { extension "user IPL4asp_PT + out(Gtp1uUnitdata -> ASP_SendTo: function(f_enc_Gtp1uUD)) + in(ASP_RecvFrom -> Gtp1uUnitdata: function(f_dec_Gtp1uUD); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" } + + function f_enc_Gtp1uUD(in Gtp1uUnitdata in_ud, out ASP_SendTo out_ud) { + out_ud.connId := in_ud.peer.connId; + out_ud.remName := in_ud.peer.remName; + out_ud.remPort := in_ud.peer.remPort; + out_ud.proto := { udp := {} }; + out_ud.msg := enc_PDU_GTPU(in_ud.gtpu); + } with { extension "prototype(fast)" }; + + function f_dec_Gtp1uUD(in ASP_RecvFrom in_ud, out Gtp1uUnitdata out_ud) { + out_ud.peer.connId := in_ud.connId; + out_ud.peer.remName := in_ud.remName; + out_ud.peer.remPort := in_ud.remPort; + out_ud.gtpu := dec_PDU_GTPU(in_ud.msg); + } with { extension "prototype(fast)" }; + +} diff --git a/library/GTPv1U_CodecPort_CtrlFunct.ttcn b/library/GTPv1U_CodecPort_CtrlFunct.ttcn new file mode 100644 index 0000000..3a86fc9 --- /dev/null +++ b/library/GTPv1U_CodecPort_CtrlFunct.ttcn @@ -0,0 +1,13 @@ +module GTPv1U_CodecPort_CtrlFunct { + + import from GTPv1U_CodecPort all; + import from IPL4asp_Types all; + + external function f_GTPU_listen( + inout GTPU_PT portRef, + in HostName locName, + in PortNumber locPort, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; +} diff --git a/library/GTPv1U_CodecPort_CtrlFunctDef.cc b/library/GTPv1U_CodecPort_CtrlFunctDef.cc new file mode 100644 index 0000000..2edea80 --- /dev/null +++ b/library/GTPv1U_CodecPort_CtrlFunctDef.cc @@ -0,0 +1,17 @@ +#include "IPL4asp_PortType.hh" +#include "IPL4asp_PT.hh" +#include "GTP_CodecPort.hh" + +namespace GTPv1U__CodecPort__CtrlFunct { + + IPL4asp__Types::Result f__GTPU__listen( + GTPv1U__CodecPort::GTPU__PT& portRef, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); + } + +} diff --git a/library/GTPv1U_Templates.ttcn b/library/GTPv1U_Templates.ttcn new file mode 100644 index 0000000..f287e20 --- /dev/null +++ b/library/GTPv1U_Templates.ttcn @@ -0,0 +1,181 @@ +/* GTPv1-U Templates in TTCN-3 + * (C) 2018 Harald Welte <laforge(a)gnumonks.org> + * contributions by sysmocom - s.f.m.c. GmbH + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module GTPv1U_Templates { + + import from General_Types all; + import from Osmocom_Types all; + import from GTPU_Types all; + import from GTPv1U_CodecPort all; + import from IPCP_Types all; + import from GSM_Types all; // RoutingAreaIdentification, CellIdentity + + template (present) PDU_GTPU tr_GTP1U_PDU(template (present) OCT1 msg_type, + template (present) OCT4 teid, + template (present) GTPU_IEs ies := ?) := { + pn_bit := ?, + s_bit := ?, + e_bit := ?, + spare := ?, + /* Protocol Type flag (PT) shall be set to '1' in GTP */ + pt := '1'B, + /* Version shall be set to decimal 1 ('001'). */ + version := '001'B, + messageType := msg_type, + lengthf := ?, + teid := teid, + opt_part := *, + gtpu_IEs := ies + } + + function f_GTPU_s_bit(template (omit) uint16_t seq) return BIT1 { + if (istemplatekind(seq, "omit")) { + return '0'B; + } + return '1'B; + } + + function f_GTPU_opt_part(template (omit) uint16_t seq) return template (omit) GTPU_Header_optional_part { + if (istemplatekind(seq, "omit")) { + return omit; + } + var GTPU_Header_optional_part ret := { + sequenceNumber := int2oct(valueof(seq), 2), + npduNumber := '00'O, + nextExtHeader := '00'O, + gTPU_extensionHeader_List := omit + }; + return ret; + } + + /* generalized GTP-U send template */ + template (value) PDU_GTPU ts_GTP1U_PDU(OCT1 msg_type, template (omit) uint16_t seq, OCT4 teid, GTPU_IEs ies) := { + /* N-PDU Number flag (PN): the GTP-U header contains a meaningful N-PDU Number field if the PN + * flag is set to 1. */ + pn_bit := '0'B, /* we assume the encoder overwrites this if an optional part is given */ + /* If the Sequence Number flag (S) is set to '1' the sequence number field is present and + * meaningful otherwise it is set to '0'. For GTP-U messages Echo Request, Echo Response, + * Error Indication and Supported Extension Headers Notification, the S flag shall be set to '1'. + * + * Note that the caller must ensure that these conditions hold. + * The caller can either pass a sequence number (we set s_bit to '1'B) when appropriate, + * or may omit the sequence number (we set s_bit to '0'B). */ + s_bit := f_GTPU_s_bit(seq), + /* Extension header presence */ + e_bit := '0'B, + spare := '0'B, + /* Protocol Type flag (PT) shall be set to '1' in GTP */ + pt := '1'B, + /* Version shall be set to decimal 1 ('001'). */ + version := '001'B, + messageType := msg_type, + lengthf := 0, /* we assume encoder overwrites this */ + teid := teid, + opt_part := f_GTPU_opt_part(seq), + gtpu_IEs := ies + } + + template (present) Gtp1uUnitdata tr_GTPU_MsgType(template (present) GtpPeer peer, + template (present) OCT1 msg_type, + template (present) OCT4 teid) := { + peer := peer, + gtpu := tr_GTP1U_PDU(msg_type, teid) + } + + + /* template matching reception of GTP-U echo-request/response */ + template (present) Gtp1uUnitdata tr_GTPU_PING(template (present) GtpPeer peer) := tr_GTPU_MsgType(peer, echoRequest, '00000000'O); + template (present) Gtp1uUnitdata tr_GTPU_PONG(template (present) GtpPeer peer) := tr_GTPU_MsgType(peer, echoResponse, '00000000'O); + + /* template matching reception of GTP-U GPDU */ + template GTPU_IEs t_GPDU(template (present) octetstring data) := { + g_PDU_IEs := { + data := data + } + } + template (present) Gtp1uUnitdata tr_GTPU_GPDU(template (present) GtpPeer peer, + template (present) OCT4 teid, + template (present) octetstring data := ?) := { + peer := peer, + gtpu := tr_GTP1U_PDU('FF'O, teid, t_GPDU(data)) + } + + template (present) GTPU_IEs ts_UEchoReqPDU := { + echoRequest_IEs := { + private_extension_gtpu := omit + } + } + + /* master template for sending a GTP-C echo request */ + template (value) Gtp1uUnitdata ts_GTPU_PING(GtpPeer peer, uint16_t seq) := { + peer := peer, + gtpu := ts_GTP1U_PDU(echoRequest, seq, '00000000'O, valueof(ts_UEchoReqPDU)) + } + + template GTPU_IEs ts_UEchoRespPDU(OCT1 restart_counter) := { + echoResponse_IEs := { + recovery_gtpu := { + type_gtpu := '00'O, /* we assume encoder fixes? */ + restartCounter := restart_counter + }, + private_extension_gtpu := omit + } + } + + /* master template for sending a GTP-U echo response */ + template (present) Gtp1uUnitdata ts_GTPU_PONG(GtpPeer peer, uint16_t seq, OCT1 rest_ctr) := { + peer := peer, + gtpu := ts_GTP1U_PDU(echoResponse, seq, '00000000'O, valueof(ts_UEchoRespPDU(rest_ctr))) + } + + template (value) GSNAddress_gtpu ts_UGsnAddr(octetstring ip_addr) := { + type_gtpu := '85'O, + lengthf := lengthof(ip_addr), + gSNAddressValue := ip_addr + } + + template (value) TeidDataI_gtpu ts_UteidDataI(OCT4 teid) := { + type_gtpu := '10'O, + teidDataI := teid + } + + template (value) GTPU_IEs ts_UErrorIndication(OCT4 teid, octetstring gsn_addr) := { + errorIndication_IEs := { + teidDataI_gtpu := ts_UteidDataI(teid), + gSNAddress_gtpu := ts_UGsnAddr(gsn_addr), + private_extension_gtpu := omit + } + } + + /* master template for sending a GTP-U Error indication */ + template (value) Gtp1uUnitdata ts_GTPU_ErrorIndication(GtpPeer peer, uint16_t seq, OCT4 teid, octetstring gsn_addr) := { + peer := peer, + gtpu := ts_GTP1U_PDU('1A'O, seq, '00000000'O, valueof(ts_UErrorIndication(teid, gsn_addr))) + } + + /* master template for sending a GTP-U user plane data */ + template (value) Gtp1uUnitdata ts_GTP1U_GPDU(GtpPeer peer, template (omit) uint16_t seq, OCT4 teid, octetstring data) := { + peer := peer, + gtpu := ts_GTP1U_PDU('FF'O, seq, teid, { g_PDU_IEs := { data := data }}) + } + + /* 3GPP TS 29.060, section 7.7.57 */ + template (value) RIM_RoutingAddress ts_RIM_RoutingAddress(octetstring addr_value) := { + type_gtpc := '9F'O, + lengthf := 0, /* we assume encoder overwrites this */ + rIM_RoutingAddressValue := addr_value + } + template (present) RIM_RoutingAddress tr_RIM_RoutingAddress(template (present) octetstring addr_value := ?) := { + type_gtpc := '9F'O, + lengthf := ?, + rIM_RoutingAddressValue := addr_value + } +} diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 1cacbd9..9e43e68 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -35,9 +35,9 @@ import from SGsAP_Emulation all; import from GTP_Emulation all; -import from GTP_Templates all; -import from GTP_CodecPort all; import from GTPC_Types all; +import from GTPv1C_CodecPort all; +import from GTPv1C_Templates all; import from LTE_CryptoFunctions all; @@ -960,7 +960,7 @@ } -private altstep as_gtp_sgsn_context_2g_to_4g(OCT4 new_sgsn_teid := 'ABABABAB'O, GTP_Templates.GTP_RATType rat_type := GTP_RAT_TYPE_EUTRAN) runs on ConnHdlr { +private altstep as_gtp_sgsn_context_2g_to_4g(OCT4 new_sgsn_teid := 'ABABABAB'O, GTPv1C_Templates.GTP_RATType rat_type := GTP_RAT_TYPE_EUTRAN) runs on ConnHdlr { var Gtp1cUnitdata gtpc_pdu; [] GTP.receive(tr_GTPC_SGSNContextReq(g_gn_iface_peer, tr_SGSNContextReqPDU(rat_type := int2oct(enum2int(rat_type), 1)))) -> value gtpc_pdu { diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 32c782f..be08870 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -77,7 +77,7 @@ FILES+="NAS_Templates.ttcn GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn " FILES+="GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index e153d35..6e86346 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -11,7 +11,8 @@ DIAMETER_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index 40671f9..19b776b 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -59,7 +59,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn PAP_Types.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn " FILES+="GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " FILES+="DNS_Helpers.ttcn " diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index 5edcaef..2f58493 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -9,7 +9,8 @@ DIAMETER_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunctDef.cc ICMP_EncDec.cc ICMPv6_EncDec.cc diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 0824d6e..48b8747 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -42,11 +42,13 @@ import from RANAP_PDU_Descriptions all; import from RANAP_IEs all; -import from GTP_Emulation all; -import from GTP_Templates all; -import from GTP_CodecPort all; +import from GTPv1C_CodecPort all; +import from GTPv1U_CodecPort all; import from GTPC_Types all; import from GTPU_Types all; +import from GTPv1C_Templates all; +import from GTPv1U_Templates all; +import from GTP_Emulation all; import from LLC_Types all; import from LLC_Templates all; diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 3aa2d38..8df1a87 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -93,7 +93,9 @@ # IPA_Emulation + dependencies FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn RAW_NS.ttcnpp " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " +FILES+="GTP_Emulation.ttcn IPCP_Types.ttcn RAW_NS.ttcnpp " gen_links $DIR $FILES ignore_pp_results diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index 4ac7d40..5c9c5ea 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -9,7 +9,8 @@ BSSGP_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d Gerrit-Change-Number: 36126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 month, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: *_Emulation: Allow running ePDG against 512 concurrent connections

by pespin

Attention is currently required from: laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36107?usp=email ) Change subject: *_Emulation: Allow running ePDG against 512 concurrent connections ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: This is actually not needed for now, so marking as WIP. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36107?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic0646b7db22ae970882b9266eaa8c1a6df0780e1 Gerrit-Change-Number: 36107 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 29 Feb 2024 17:16:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Assign const name when stealing TX msg from iofd ctx

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email ) Change subject: osmo_io: Assign const name when stealing TX msg from iofd ctx ...................................................................... osmo_io: Assign const name when stealing TX msg from iofd ctx All TX messages are moved from iofd instance to the user's context. iofd may be destroyed, but the message is still available to the user. To prevent a use-after-free bug, the context name must be changed from iofd->name to a constant that does not belong to iofd. Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b --- M src/core/osmo_io.c 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 7ea959b..33466e5 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -152,9 +152,7 @@ uint16_t headroom = iofd->msgb_alloc.headroom; OSMO_ASSERT(iofd->msgb_alloc.size < 0xffff - headroom); - return msgb_alloc_headroom_c(iofd, - iofd->msgb_alloc.size + headroom, headroom, - iofd->name ? : "iofd_msgb"); + return msgb_alloc_headroom_c(iofd, iofd->msgb_alloc.size + headroom, headroom, "osmo_io_msgb"); } /*! return the pending msgb in iofd or NULL if there is none*/ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b Gerrit-Change-Number: 36121 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Assign const name when stealing TX msg from iofd ctx

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email ) Change subject: osmo_io: Assign const name when stealing TX msg from iofd ctx ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b Gerrit-Change-Number: 36121 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 29 Feb 2024 16:20:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: Make osmo-io compile without libsctp support (--disable-libsctp)

by jolly

jolly has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36056?usp=email ) Change subject: Make osmo-io compile without libsctp support (--disable-libsctp) ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36056?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ief8ca40c0e85efe340eaecb866a10f76ac2bfc98 Gerrit-Change-Number: 36056 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Assign const name when stealing TX msg from iofd ctx

by pespin

Attention is currently required from: jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email ) Change subject: osmo_io: Assign const name when stealing TX msg from iofd ctx ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b Gerrit-Change-Number: 36121 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 29 Feb 2024 15:39:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Assign const name when stealing TX msg from iofd ctx

by jolly

Attention is currently required from: laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email ) Change subject: osmo_io: Assign const name when stealing TX msg from iofd ctx ...................................................................... Patch Set 1: (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/36121/comment/198ef5cd_4ead9ffd PS1, Line 339: talloc_set_name(msg, "osmo_io_rx_msgb"); > Yeah, just set it to some const string. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b Gerrit-Change-Number: 36121 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 15:34:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Assign const name when stealing TX msg from iofd ctx

by jolly

Attention is currently required from: jolly, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: osmo_io: Assign const name when stealing TX msg from iofd ctx ...................................................................... osmo_io: Assign const name when stealing TX msg from iofd ctx All TX messages are moved from iofd instance to the user's context. iofd may be destroyed, but the message is still available to the user. To prevent a use-after-free bug, the context name must be changed from iofd->name to a constant that does not belong to iofd. Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b --- M src/core/osmo_io.c 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/36121/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b Gerrit-Change-Number: 36121 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Add osmo_io_get_ioops() function

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36076?usp=email ) Change subject: osmo_io: Add osmo_io_get_ioops() function ...................................................................... osmo_io: Add osmo_io_get_ioops() function This function can be used by user code to obtain the currently-set io operations, it's the inverse of osmo_io_set_ioops(). Change-Id: I03398c811b9534f50c6644b21eea89a04be29fb0 --- M include/osmocom/core/osmo_io.h M src/core/libosmocore.map M src/core/osmo_io.c 3 files changed, 22 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index dda9e6d..8a7e53a 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -109,3 +109,4 @@ void osmo_iofd_set_name(struct osmo_io_fd *iofd, const char *name); int osmo_iofd_set_ioops(struct osmo_io_fd *iofd, const struct osmo_io_ops *ioops); +void osmo_iofd_get_ioops(struct osmo_io_fd *iofd, struct osmo_io_ops *ioops); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index a50a9ed..72a6038 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -258,6 +258,7 @@ osmo_iofd_close; osmo_iofd_free; osmo_iofd_get_data; +osmo_iofd_get_ioops; osmo_iofd_get_fd; osmo_iofd_get_name; osmo_iofd_set_name; diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index b6b5908..7ea959b 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -896,6 +896,14 @@ return 0; } +/*! Get the osmo_io_ops for an iofd. + * \param[in] iofd Target iofd file descriptor + * \param[in] ioops caller-allocated osmo_io_ops structure to be filled */ +void osmo_iofd_get_ioops(struct osmo_io_fd *iofd, struct osmo_io_ops *ioops) +{ + *ioops = iofd->io_ops; +} + /*! Notify the user if/when the socket is connected. * When the socket is connected the write_cb will be called. * \param[in] iofd the file descriptor */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36076?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I03398c811b9534f50c6644b21eea89a04be29fb0 Gerrit-Change-Number: 36076 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Add osmo_io_get_ioops() function

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36076?usp=email ) Change subject: osmo_io: Add osmo_io_get_ioops() function ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36076?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I03398c811b9534f50c6644b21eea89a04be29fb0 Gerrit-Change-Number: 36076 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 29 Feb 2024 15:18:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_{client,server} example: Cleanup on exit

by Jenkins Builder

Attention is currently required from: jolly. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36124?usp=email ) Change subject: stream_{client,server} example: Cleanup on exit ...................................................................... Patch Set 3: (2 comments) File examples/stream-client.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14780): https://gerrit.osmocom.org/c/libosmo-netif/+/36124/comment/79bec3b0_8133845d PS3, Line 172: while(!quit) { space required before the open parenthesis '(' File examples/stream-server.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14780): https://gerrit.osmocom.org/c/libosmo-netif/+/36124/comment/3146a486_4688a15e PS3, Line 189: while(!quit) { space required before the open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36124?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: I9dbb7f46b2a798e88ad4df8ff73c6ee40c07b843 Gerrit-Change-Number: 36124 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 29 Feb 2024 15:13:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Assign const name when stealing TX msg from iofd ctx

by pespin

Attention is currently required from: jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email ) Change subject: osmo_io: Assign const name when stealing TX msg from iofd ctx ...................................................................... Patch Set 1: (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/36121/comment/48c0a6f7_d477cdb8 PS1, Line 339: talloc_set_name(msg, "osmo_io_rx_msgb"); > I think it would be better to not even set the msgb name to the name of the iofd in the first place, […] Yeah, just set it to some const string. I thought the name was copied/allocated when set. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b Gerrit-Change-Number: 36121 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 29 Feb 2024 14:44:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add support for SCTP in OSMO_IO mode

by laforge

Attention is currently required from: arehbein, daniel, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35069?usp=email ) Change subject: stream_{cli,srv}: Add support for SCTP in OSMO_IO mode ...................................................................... Patch Set 10: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35069?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: I6cf5bad5f618e71c80017960c38009b089dbd6a1 Gerrit-Change-Number: 35069 Gerrit-PatchSet: 10 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 14:32:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Reject writing messages with length of 0

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35912?usp=email ) ( 7 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: osmo_io: Reject writing messages with length of 0 ...................................................................... osmo_io: Reject writing messages with length of 0 io_uring will reject to transmit messages with length of 0. Change-Id: I94be5ec7344d92157f7853c6c0ddf7007513ba8e Related: OS#5751 --- M src/core/osmo_io.c 1 file changed, 27 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 5d25f66..472edf9 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -409,6 +409,11 @@ { int rc; + if (OSMO_UNLIKELY(msgb_length(msg) == 0)) { + LOGPIO(iofd, LOGL_ERROR, "Length is 0, rejecting msgb.\n"); + return -EINVAL; + } + OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE); if (OSMO_UNLIKELY(!iofd->io_ops.write_cb)) { LOGPIO(iofd, LOGL_ERROR, "write_cb not set, Rejecting msgb\n"); @@ -451,6 +456,11 @@ { int rc; + if (OSMO_UNLIKELY(msgb_length(msg) == 0)) { + LOGPIO(iofd, LOGL_ERROR, "Length is 0, rejecting msgb.\n"); + return -EINVAL; + } + OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_RECVFROM_SENDTO); if (OSMO_UNLIKELY(!iofd->io_ops.sendto_cb)) { LOGPIO(iofd, LOGL_ERROR, "sendto_cb not set, Rejecting msgb\n"); @@ -499,6 +509,11 @@ int rc; struct iofd_msghdr *msghdr; + if (OSMO_UNLIKELY(msgb_length(msg) == 0)) { + LOGPIO(iofd, LOGL_ERROR, "Length is 0, rejecting msgb.\n"); + return -EINVAL; + } + OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_RECVMSG_SENDMSG); if (OSMO_UNLIKELY(!iofd->io_ops.sendmsg_cb)) { LOGPIO(iofd, LOGL_ERROR, "sendmsg_cb not set, Rejecting msgb\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35912?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I94be5ec7344d92157f7853c6c0ddf7007513ba8e Gerrit-Change-Number: 35912 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io_poll: Use -errno as result on read error

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35980?usp=email ) ( 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: osmo_io_poll: Use -errno as result on read error ...................................................................... osmo_io_poll: Use -errno as result on read error Related: OS#5751 Change-Id: Ida63b74feecddf96bab7b2ade4e9ad216fe56e06 --- M src/core/osmo_io.c M src/core/osmo_io_poll.c 2 files changed, 12 insertions(+), 1 deletion(-) Approvals: daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 472edf9..b6b5908 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -330,6 +330,7 @@ /*! completion handler: Called by osmo_io backend after a given I/O operation has completed * \param[in] iofd I/O file-descriptor on which I/O has completed * \param[in] msg message buffer containing data related to completed I/O + * \param[in] rc result code with read size or error (-errno) * \param[in] hdr serialized msghdr containing state of completed I/O */ void iofd_handle_recv(struct osmo_io_fd *iofd, struct msgb *msg, int rc, struct iofd_msghdr *hdr) { diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c index 52e806d..74f137b 100644 --- a/src/core/osmo_io_poll.c +++ b/src/core/osmo_io_poll.c @@ -74,7 +74,7 @@ if (rc > 0) msgb_put(msg, rc); - iofd_handle_recv(iofd, msg, rc, &hdr); + iofd_handle_recv(iofd, msg, (rc < 0 && errno > 0) ? -errno : rc, &hdr); } if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35980?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida63b74feecddf96bab7b2ade4e9ad216fe56e06 Gerrit-Change-Number: 35980 Gerrit-PatchSet: 8 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io_uring: Cancel pending request, free msghdr on completion

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35981?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: osmo_io_uring: Cancel pending request, free msghdr on completion ...................................................................... osmo_io_uring: Cancel pending request, free msghdr on completion There is always a completion after cancelling a uring request. Because uring requests use msghdr pointer as user data, we cannot just free the msghdr after cancelling. Upon completion (received after cancelling), the user data still points to the msghdr. To prevent a use-after-free bug, msghdr is not freed, but detached from iofd instance. Then upon completion, the msghdr (if it was detached from iofd) is freed. Additionally it is not required to keep IOFD_FLAG_IN_CALLBACK set anymore, if there is a msghdr attached to iofd. As described above, all msghdr get detached, if iofd is freed (uring request get cancelled) during callback. Related: OS#5751 Change-Id: Ic253f085dd6362db85f029f46350951472210a02 --- M src/core/osmo_io_uring.c 1 file changed, 43 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index af1c790..3812b50 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -230,8 +230,7 @@ OSMO_ASSERT(0) } - if (!iofd->u.uring.read_msghdr && !iofd->u.uring.write_msghdr) - IOFD_FLAG_UNSET(iofd, IOFD_FLAG_IN_CALLBACK); + IOFD_FLAG_UNSET(iofd, IOFD_FLAG_IN_CALLBACK); if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_TO_FREE) && !iofd->u.uring.read_msghdr && !iofd->u.uring.write_msghdr) talloc_free(iofd); @@ -252,6 +251,11 @@ io_uring_cqe_seen(ring, cqe); continue; } + if (!msghdr->iofd) { + io_uring_cqe_seen(ring, cqe); + iofd_msghdr_free(msghdr); + continue; + } rc = cqe->res; /* Hand the entry back to the kernel before */ @@ -307,20 +311,31 @@ static int iofd_uring_unregister(struct osmo_io_fd *iofd) { struct io_uring_sqe *sqe; + struct iofd_msghdr *msghdr; + if (iofd->u.uring.read_msghdr) { + msghdr = iofd->u.uring.read_msghdr; sqe = io_uring_get_sqe(&g_ring.ring); OSMO_ASSERT(sqe != NULL); io_uring_sqe_set_data(sqe, NULL); LOGPIO(iofd, LOGL_DEBUG, "Cancelling read\n"); - io_uring_prep_cancel(sqe, iofd->u.uring.read_msghdr, 0); + iofd->u.uring.read_msghdr = NULL; + talloc_steal(OTC_GLOBAL, msghdr); + msghdr->iofd = NULL; + io_uring_prep_cancel(sqe, msghdr, 0); } if (iofd->u.uring.write_msghdr) { + msghdr = iofd->u.uring.write_msghdr; sqe = io_uring_get_sqe(&g_ring.ring); OSMO_ASSERT(sqe != NULL); io_uring_sqe_set_data(sqe, NULL); LOGPIO(iofd, LOGL_DEBUG, "Cancelling write\n"); - io_uring_prep_cancel(sqe, iofd->u.uring.write_msghdr, 0); + iofd->u.uring.write_msghdr = NULL; + talloc_steal(OTC_GLOBAL, msghdr); + msgb_free(msghdr->msg); + msghdr->iofd = NULL; + io_uring_prep_cancel(sqe, msghdr, 0); } io_uring_submit(&g_ring.ring); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35981?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic253f085dd6362db85f029f46350951472210a02 Gerrit-Change-Number: 35981 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io_uring: Detach msghdr from iofd before calling iofd_handle_sen...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35982?usp=email ) Change subject: osmo_io_uring: Detach msghdr from iofd before calling iofd_handle_send_completion() ...................................................................... osmo_io_uring: Detach msghdr from iofd before calling iofd_handle_send_completion() msghdr must be detached, because subsequent callback at iofd_handle_send_completion() may destroy the iofd (which in turn frees this msghdr, if still attached) and frees the msghdr, causing a double free. Related: OS#5751 Change-Id: Ia349f73de2145fa360b20dd40deb73a8ffc71f07 --- M src/core/osmo_io_uring.c 1 file changed, 24 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index 3812b50..cb636da 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -195,6 +195,15 @@ { struct osmo_io_fd *iofd = msghdr->iofd; + /* Detach msghdr from iofd. It might get freed here or it is freed during iofd_handle_send_completion(). + * If there is pending data to send, iofd_uring_submit_tx() will attach it again. + * iofd_handle_send_completion() will invoke a callback function to signal the possibility of write/send. + * This callback function might close iofd, leading to the potential freeing of iofd->u.uring.write_msghdr if + * still attached. Since iofd_handle_send_completion() frees msghdr at the end of the function, detaching + * msghdr here prevents a double-free bug. */ + if (iofd->u.uring.write_msghdr == msghdr) + iofd->u.uring.write_msghdr = NULL; + if (OSMO_UNLIKELY(IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))) { msgb_free(msghdr->msg); iofd_msghdr_free(msghdr); @@ -202,7 +211,6 @@ iofd_handle_send_completion(iofd, rc, msghdr); } - iofd->u.uring.write_msghdr = NULL; /* submit the next to-be-transmitted message for this file descriptor */ if (iofd->u.uring.write_enabled && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) iofd_uring_submit_tx(iofd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35982?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia349f73de2145fa360b20dd40deb73a8ffc71f07 Gerrit-Change-Number: 35982 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io_poll: Declare local functions "static"

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35983?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: osmo_io_poll: Declare local functions "static" ...................................................................... osmo_io_poll: Declare local functions "static" Change-Id: I6ba88cd7bbd5b5ef42eb460679696f105c9158cb --- M src/core/osmo_io_poll.c 1 file changed, 17 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c index 74f137b..2e726d9 100644 --- a/src/core/osmo_io_poll.c +++ b/src/core/osmo_io_poll.c @@ -123,7 +123,7 @@ return 0; } -int iofd_poll_register(struct osmo_io_fd *iofd) +static int iofd_poll_register(struct osmo_io_fd *iofd) { struct osmo_fd *ofd = &iofd->u.poll.ofd; int rc; @@ -137,7 +137,7 @@ return rc; } -int iofd_poll_unregister(struct osmo_io_fd *iofd) +static int iofd_poll_unregister(struct osmo_io_fd *iofd) { struct osmo_fd *ofd = &iofd->u.poll.ofd; @@ -149,7 +149,7 @@ return 0; } -int iofd_poll_close(struct osmo_io_fd *iofd) +static int iofd_poll_close(struct osmo_io_fd *iofd) { iofd_poll_unregister(iofd); osmo_fd_close(&iofd->u.poll.ofd); @@ -157,27 +157,27 @@ return 0; } -void iofd_poll_read_enable(struct osmo_io_fd *iofd) +static void iofd_poll_read_enable(struct osmo_io_fd *iofd) { osmo_fd_read_enable(&iofd->u.poll.ofd); } -void iofd_poll_read_disable(struct osmo_io_fd *iofd) +static void iofd_poll_read_disable(struct osmo_io_fd *iofd) { osmo_fd_read_disable(&iofd->u.poll.ofd); } -void iofd_poll_write_enable(struct osmo_io_fd *iofd) +static void iofd_poll_write_enable(struct osmo_io_fd *iofd) { osmo_fd_write_enable(&iofd->u.poll.ofd); } -void iofd_poll_write_disable(struct osmo_io_fd *iofd) +static void iofd_poll_write_disable(struct osmo_io_fd *iofd) { osmo_fd_write_disable(&iofd->u.poll.ofd); } -void iofd_poll_notify_connected(struct osmo_io_fd *iofd) +static void iofd_poll_notify_connected(struct osmo_io_fd *iofd) { int rc; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35983?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ba88cd7bbd5b5ef42eb460679696f105c9158cb Gerrit-Change-Number: 35983 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[M] Change in libosmocore[master]: osmo_io: Use poll/select to notify socket connection at osmo_io_uring.c

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35910?usp=email ) ( 8 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: osmo_io: Use poll/select to notify socket connection at osmo_io_uring.c ...................................................................... osmo_io: Use poll/select to notify socket connection at osmo_io_uring.c In order to receive a connect notification from SCTP socket, poll/select event must be used instead of a write notification via io_uring completion event. Once the connect notification has been received, subsequent write notifications via io_uring are used. Change-Id: I4eca9ea72beb0d6ea4d44cce81ed620033f07270 Related: OS#5751 --- M src/core/osmo_io_internal.h M src/core/osmo_io_uring.c 2 files changed, 93 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index af47a3d..a4b0749 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -104,6 +104,8 @@ void *read_msghdr; void *write_msghdr; /* TODO: index into array of registered fd's? */ + /* osmo_fd for non-blocking connect handling */ + struct osmo_fd connect_ofd; } uring; } u; }; diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index aa9df85..af1c790 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -324,6 +324,11 @@ } io_uring_submit(&g_ring.ring); + if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) { + osmo_fd_unregister(&iofd->u.uring.connect_ofd); + IOFD_FLAG_UNSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED); + } + return 0; } @@ -334,6 +339,10 @@ if (iofd->u.uring.write_msghdr) return; + /* This function is called again, once the socket is connected. */ + if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) + return; + if (osmo_iofd_txqueue_len(iofd) > 0) iofd_uring_submit_tx(iofd); else if (iofd->mode == OSMO_IO_FD_MODE_READ_WRITE) { @@ -379,6 +388,10 @@ if (iofd->u.uring.read_msghdr) return; + /* This function is called again, once the socket is connected. */ + if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) + return; + switch (iofd->mode) { case OSMO_IO_FD_MODE_READ_WRITE: iofd_uring_submit_recv(iofd, IOFD_ACT_READ); @@ -407,6 +420,66 @@ return close(iofd->fd); } +/* called via osmocom poll/select main handling once outbound non-blocking connect() completes */ +static int iofd_uring_connected_cb(struct osmo_fd *ofd, unsigned int what) +{ + struct osmo_io_fd *iofd = ofd->data; + + LOGPIO(iofd, LOGL_DEBUG, "Socket connected or failed."); + + if (!(what & OSMO_FD_WRITE)) + return 0; + + /* Unregister from poll/select handling. */ + osmo_fd_unregister(ofd); + IOFD_FLAG_UNSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED); + + /* Notify the application about this via a zero-length write completion call-back. */ + IOFD_FLAG_SET(iofd, IOFD_FLAG_IN_CALLBACK); + switch (iofd->mode) { + case OSMO_IO_FD_MODE_READ_WRITE: + iofd->io_ops.write_cb(iofd, 0, NULL); + break; + case OSMO_IO_FD_MODE_RECVFROM_SENDTO: + iofd->io_ops.sendto_cb(iofd, 0, NULL, NULL); + break; + case OSMO_IO_FD_MODE_RECVMSG_SENDMSG: + iofd->io_ops.sendmsg_cb(iofd, 0, NULL); + break; + } + IOFD_FLAG_UNSET(iofd, IOFD_FLAG_IN_CALLBACK); + + /* If write/read notifications are pending, enable it now. */ + if (iofd->u.uring.write_enabled && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) + iofd_uring_write_enable(iofd); + if (iofd->u.uring.read_enabled && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) + iofd_uring_read_enable(iofd); + + if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_TO_FREE) && !iofd->u.uring.read_msghdr && !iofd->u.uring.write_msghdr) + talloc_free(iofd); + return 0; +} + +static void iofd_uring_notify_connected(struct osmo_io_fd *iofd) +{ + if (iofd->mode == OSMO_IO_FD_MODE_RECVMSG_SENDMSG) { + /* Don't call this function after enabling read or write. */ + OSMO_ASSERT(!iofd->u.uring.write_enabled && !iofd->u.uring.read_enabled); + + /* Use a temporary osmo_fd which we can use to notify us once the connection is established + * or failed (indicated by FD becoming writable). + * This is needed as (at least for SCTP sockets) one cannot submit a zero-length writev/sendmsg + * in order to get notification when the socekt is writable.*/ + if (!IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) { + osmo_fd_setup(&iofd->u.uring.connect_ofd, iofd->fd, OSMO_FD_WRITE, + iofd_uring_connected_cb, iofd, 0); + osmo_fd_register(&iofd->u.uring.connect_ofd); + IOFD_FLAG_SET(iofd, IOFD_FLAG_NOTIFY_CONNECTED); + } + } else + iofd_uring_write_enable(iofd); +} + const struct iofd_backend_ops iofd_uring_ops = { .register_fd = iofd_uring_register, .unregister_fd = iofd_uring_unregister, @@ -415,7 +488,7 @@ .write_disable = iofd_uring_write_disable, .read_enable = iofd_uring_read_enable, .read_disable = iofd_uring_read_disable, - .notify_connected = iofd_uring_write_enable, + .notify_connected = iofd_uring_notify_connected, }; #endif /* defined(__linux__) */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35910?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4eca9ea72beb0d6ea4d44cce81ed620033f07270 Gerrit-Change-Number: 35910 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[M] Change in libosmocore[master]: osmo_io: Move notify_connected function to backend

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35909?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: osmo_io: Move notify_connected function to backend ...................................................................... osmo_io: Move notify_connected function to backend This relocation is necessary as the backend (osmo_io_fd or osmo_io_uring) requires a different approach in handling connect notifications. As a result, a function call has been introduced to struct iofd_backend_ops. In a subsequent patch, the process for the osmo_io_uring backend will be modified to handle SCTP connect notifications using poll/select. If connect notification is requested using poll/select, the file descriptior must be registered to osmo_fd, using osmo_fd_register. If read / write notification is requested by application, the file descriptior must be registered also. A flag is used prevent calling osmo_fd_register / osmo_fd_unregister multiple times, which would cause a crash. Change-Id: I905ec85210570aff8addadfc9603335d04eb057a Related: OS#5751 --- M src/core/osmo_io.c M src/core/osmo_io_internal.h M src/core/osmo_io_poll.c M src/core/osmo_io_uring.c 4 files changed, 54 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 9de9e2e..71249cf 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -781,7 +781,8 @@ void osmo_iofd_notify_connected(struct osmo_io_fd *iofd) { OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE); - osmo_iofd_ops.write_enable(iofd); + OSMO_ASSERT(osmo_iofd_ops.notify_connected); + osmo_iofd_ops.notify_connected(iofd); } diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index e8f4ea2..9c86e05 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -31,12 +31,14 @@ void (*write_disable)(struct osmo_io_fd *iofd); void (*read_enable)(struct osmo_io_fd *iofd); void (*read_disable)(struct osmo_io_fd *iofd); + void (*notify_connected)(struct osmo_io_fd *iofd); }; #define IOFD_FLAG_CLOSED (1<<0) #define IOFD_FLAG_IN_CALLBACK (1<<1) #define IOFD_FLAG_TO_FREE (1<<2) #define IOFD_FLAG_NOTIFY_CONNECTED (1<<3) +#define IOFD_FLAG_FD_REGISTERED (1<<4) #define IOFD_FLAG_SET(iofd, flag) \ (iofd)->flags |= (flag) diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c index d7f80c0..8398a30 100644 --- a/src/core/osmo_io_poll.c +++ b/src/core/osmo_io_poll.c @@ -119,20 +119,32 @@ int iofd_poll_register(struct osmo_io_fd *iofd) { struct osmo_fd *ofd = &iofd->u.poll.ofd; + int rc; + + if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_FD_REGISTERED)) + return 0; osmo_fd_setup(ofd, iofd->fd, 0, &iofd_poll_ofd_cb_dispatch, iofd, 0); - return osmo_fd_register(ofd); + rc = osmo_fd_register(ofd); + if (!rc) + IOFD_FLAG_SET(iofd, IOFD_FLAG_FD_REGISTERED); + return rc; } int iofd_poll_unregister(struct osmo_io_fd *iofd) { struct osmo_fd *ofd = &iofd->u.poll.ofd; + + if (!IOFD_FLAG_ISSET(iofd, IOFD_FLAG_FD_REGISTERED)) + return 0; osmo_fd_unregister(ofd); + IOFD_FLAG_UNSET(iofd, IOFD_FLAG_FD_REGISTERED); return 0; } int iofd_poll_close(struct osmo_io_fd *iofd) { + iofd_poll_unregister(iofd); osmo_fd_close(&iofd->u.poll.ofd); return 0; @@ -158,6 +170,16 @@ osmo_fd_write_disable(&iofd->u.poll.ofd); } +void iofd_poll_notify_connected(struct osmo_io_fd *iofd) +{ + int rc; + + rc = iofd_poll_register(iofd); + if (rc < 0) + return; + osmo_fd_write_enable(&iofd->u.poll.ofd); +} + const struct iofd_backend_ops iofd_poll_ops = { .register_fd = iofd_poll_register, .unregister_fd = iofd_poll_unregister, @@ -166,6 +188,7 @@ .write_disable = iofd_poll_write_disable, .read_enable = iofd_poll_read_enable, .read_disable = iofd_poll_read_disable, + .notify_connected = iofd_poll_notify_connected, }; #endif /* defined(__linux__) */ diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index 1aa17d4..24d1e08 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -402,6 +402,7 @@ .write_disable = iofd_uring_write_disable, .read_enable = iofd_uring_read_enable, .read_disable = iofd_uring_read_disable, + .notify_connected = iofd_uring_write_enable, }; #endif /* defined(__linux__) */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35909?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I905ec85210570aff8addadfc9603335d04eb057a Gerrit-Change-Number: 35909 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[M] Change in libosmocore[master]: osmo_io: sendmsg/recvmsg support

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35068?usp=email ) Change subject: osmo_io: sendmsg/recvmsg support ...................................................................... osmo_io: sendmsg/recvmsg support Add support osmo_io operations resembling sendmsg() and recvmsg() socket operations. This is what will enable the implementation of higher-layer functions like equivalents of sctp_recvmsg() and sctp_send() in libosmo-netif and/or other users. Change-Id: I89eb519b22d21011d61a7855b2364bc3c295df82 Related: OS#5751 --- M include/osmocom/core/osmo_io.h M src/core/libosmocore.map M src/core/osmo_io.c M src/core/osmo_io_internal.h M src/core/osmo_io_poll.c M src/core/osmo_io_uring.c 6 files changed, 184 insertions(+), 20 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index 3c704be..dda9e6d 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -4,6 +4,8 @@ #pragma once +#include <sys/socket.h> + #include <osmocom/core/linuxlist.h> #include <osmocom/core/logging.h> #include <osmocom/core/msgb.h> @@ -21,8 +23,8 @@ OSMO_IO_FD_MODE_READ_WRITE, /*! use recvfrom() / sendto() calls */ OSMO_IO_FD_MODE_RECVFROM_SENDTO, - /*! emulate sctp_recvmsg() and sctp_send() */ - OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND, + /*! emulate recvmsg() / sendmsg() */ + OSMO_IO_FD_MODE_RECVMSG_SENDMSG, }; enum osmo_io_backend { @@ -65,12 +67,20 @@ struct msgb *msg, const struct osmo_sockaddr *daddr); }; + + /* mode OSMO_IO_FD_MODE_RECVMSG_SENDMSG: */ + struct { + void (*recvmsg_cb)(struct osmo_io_fd *iofd, int res, + struct msgb *msg, const struct msghdr *msgh); + void (*sendmsg_cb)(struct osmo_io_fd *iofd, int res, struct msgb *msg); + }; }; void osmo_iofd_init(void); struct osmo_io_fd *osmo_iofd_setup(const void *ctx, int fd, const char *name, enum osmo_io_fd_mode mode, const struct osmo_io_ops *ioops, void *data); +int osmo_iofd_set_cmsg_size(struct osmo_io_fd *iofd, size_t cmsg_size); int osmo_iofd_register(struct osmo_io_fd *iofd, int fd); int osmo_iofd_unregister(struct osmo_io_fd *iofd); unsigned int osmo_iofd_txqueue_len(struct osmo_io_fd *iofd); @@ -83,6 +93,8 @@ int osmo_iofd_write_msgb(struct osmo_io_fd *iofd, struct msgb *msg); int osmo_iofd_sendto_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendto_flags, const struct osmo_sockaddr *dest); +int osmo_iofd_sendmsg_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendmsg_flags, + const struct msghdr *msgh); void osmo_iofd_set_alloc_info(struct osmo_io_fd *iofd, unsigned int size, unsigned int headroom); void osmo_iofd_set_txqueue_max_length(struct osmo_io_fd *iofd, unsigned int size); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index b66e37d..a50a9ed 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -266,7 +266,10 @@ osmo_iofd_ops; osmo_iofd_register; osmo_iofd_sendto_msgb; +osmo_iofd_sctp_send_msgb; +osmo_iofd_sendmsg_msgb; osmo_iofd_set_alloc_info; +osmo_iofd_set_cmsg_size; osmo_iofd_set_data; osmo_iofd_set_ioops; osmo_iofd_set_priv_nr; diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 71249cf..5d25f66 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -1,8 +1,8 @@ /*! \file osmo_io.c * New osmocom async I/O API. * - * (C) 2022 by Harald Welte <laforge(a)osmocom.org> - * (C) 2022-2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * (C) 2022-2024 by Harald Welte <laforge(a)osmocom.org> + * (C) 2022-2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * Author: Daniel Willmann <dwillmann(a)sysmocom.de> * * All Rights Reserved. @@ -105,8 +105,10 @@ * \param[in] iofd the osmo_io file structure * \param[in] action the action this msg(hdr) is for (read, write, ..) * \param[in] msg the msg buffer to use. Will allocate a new one if NULL + * \param[in] cmsg_size size (in bytes) of iofd_msghdr.cmsg buffer. Can be 0 if cmsg is not used. * \returns the newly allocated msghdr or NULL in case of error */ -struct iofd_msghdr *iofd_msghdr_alloc(struct osmo_io_fd *iofd, enum iofd_msg_action action, struct msgb *msg) +struct iofd_msghdr *iofd_msghdr_alloc(struct osmo_io_fd *iofd, enum iofd_msg_action action, struct msgb *msg, + size_t cmsg_size) { bool free_msg = false; struct iofd_msghdr *hdr; @@ -120,7 +122,7 @@ talloc_steal(iofd, msg); } - hdr = talloc_zero(iofd, struct iofd_msghdr); + hdr = talloc_zero_size(iofd, sizeof(struct iofd_msghdr) + cmsg_size); if (!hdr) { if (free_msg) talloc_free(msg); @@ -339,8 +341,10 @@ case OSMO_IO_FD_MODE_RECVFROM_SENDTO: iofd->io_ops.recvfrom_cb(iofd, rc, msg, &hdr->osa); break; - case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND: - /* TODO Implement */ + case OSMO_IO_FD_MODE_RECVMSG_SENDMSG: + iofd->io_ops.recvmsg_cb(iofd, rc, msg, &hdr->hdr); + break; + default: OSMO_ASSERT(false); break; } @@ -378,6 +382,9 @@ case IOFD_ACT_SENDTO: iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa); break; + case IOFD_ACT_SENDMSG: + iofd->io_ops.sendmsg_cb(iofd, rc, msg); + break; default: OSMO_ASSERT(0); } @@ -408,7 +415,7 @@ return -EINVAL; } - struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_WRITE, msg); + struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_WRITE, msg, 0); if (!msghdr) return -ENOMEM; @@ -450,7 +457,7 @@ return -EINVAL; } - struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_SENDTO, msg); + struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_SENDTO, msg, 0); if (!msghdr) return -ENOMEM; @@ -475,16 +482,97 @@ return 0; } +/*! ismo_io equivalent of the sendmsg(2) socket API call + * + * Appends the message to the internal transmit queue. + * If the function returns success (0), it will take ownership of the msgb and + * internally call msgb_free() after the write request completes. + * In case of an error the msgb needs to be freed by the caller. + * \param[in] iofd file descriptor to write to + * \param[in] msg message buffer to send; is used to fill msgh->iov[] + * \param[in] sendmsg_flags Flags to pass to the send call + * \param[in] msgh 'struct msghdr' for name/control/flags. iov must be empty! + * \returns 0 in case of success; a negative value in case of error + */ +int osmo_iofd_sendmsg_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendmsg_flags, const struct msghdr *msgh) +{ + int rc; + struct iofd_msghdr *msghdr; + + OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_RECVMSG_SENDMSG); + if (OSMO_UNLIKELY(!iofd->io_ops.sendmsg_cb)) { + LOGPIO(iofd, LOGL_ERROR, "sendmsg_cb not set, Rejecting msgb\n"); + return -EINVAL; + } + + if (OSMO_UNLIKELY(msgh->msg_namelen > sizeof(msghdr->osa))) { + LOGPIO(iofd, LOGL_ERROR, "osmo_iofd_sendmsg msg_namelen (%u) > supported %zu bytes\n", + msgh->msg_namelen, sizeof(msghdr->osa)); + return -EINVAL; + } + + if (OSMO_UNLIKELY(msgh->msg_iovlen)) { + LOGPIO(iofd, LOGL_ERROR, "osmo_iofd_sendmsg must have all in 'struct msgb', not in 'msg_iov'\n"); + return -EINVAL; + } + + msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_SENDMSG, msg, msgh->msg_controllen); + if (!msghdr) + return -ENOMEM; + + /* copy over optional address */ + if (msgh->msg_name) { + memcpy(&msghdr->osa, msgh->msg_name, msgh->msg_namelen); + msghdr->hdr.msg_name = &msghdr->osa.u.sa; + msghdr->hdr.msg_namelen = msgh->msg_namelen; + } + + /* build iov from msgb */ + msghdr->iov[0].iov_base = msgb_data(msghdr->msg); + msghdr->iov[0].iov_len = msgb_length(msghdr->msg); + msghdr->hdr.msg_iov = &msghdr->iov[0]; + msghdr->hdr.msg_iovlen = 1; + + /* copy over the cmsg from the msghdr */ + if (msgh->msg_control && msgh->msg_controllen) { + msghdr->hdr.msg_control = msghdr->cmsg; + msghdr->hdr.msg_controllen = msgh->msg_controllen; + memcpy(msghdr->cmsg, msgh->msg_control, msgh->msg_controllen); + } + + /* copy over msg_flags */ + msghdr->hdr.msg_flags = sendmsg_flags; + + rc = iofd_txqueue_enqueue(iofd, msghdr); + if (rc < 0) { + iofd_msghdr_free(msghdr); + LOGPIO(iofd, LOGL_ERROR, "enqueueing message failed (%d). Rejecting msgb\n", rc); + return rc; + } + + return 0; +} + static int check_mode_callback_compat(enum osmo_io_fd_mode mode, const struct osmo_io_ops *ops) { switch (mode) { case OSMO_IO_FD_MODE_READ_WRITE: if (ops->recvfrom_cb || ops->sendto_cb) return false; + if (ops->recvmsg_cb || ops->sendmsg_cb) + return false; break; case OSMO_IO_FD_MODE_RECVFROM_SENDTO: if (ops->read_cb || ops->write_cb) return false; + if (ops->recvmsg_cb || ops->sendmsg_cb) + return false; + break; + case OSMO_IO_FD_MODE_RECVMSG_SENDMSG: + if (ops->recvfrom_cb || ops->sendto_cb) + return false; + if (ops->read_cb || ops->write_cb) + return false; break; default: break; @@ -511,6 +599,7 @@ switch (mode) { case OSMO_IO_FD_MODE_READ_WRITE: case OSMO_IO_FD_MODE_RECVFROM_SENDTO: + case OSMO_IO_FD_MODE_RECVMSG_SENDMSG: break; default: return NULL; @@ -547,6 +636,16 @@ return iofd; } +/*! Set the size of the control message buffer allocated when submitting recvmsg */ +int osmo_iofd_set_cmsg_size(struct osmo_io_fd *iofd, size_t cmsg_size) +{ + if (iofd->mode != OSMO_IO_FD_MODE_RECVMSG_SENDMSG) + return -EINVAL; + + iofd->cmsg_size = cmsg_size; + return 0; +} + /*! Register the fd with the underlying backend. * * \param[in] iofd the iofd file descriptor @@ -567,7 +666,8 @@ IOFD_FLAG_UNSET(iofd, IOFD_FLAG_CLOSED); if ((iofd->mode == OSMO_IO_FD_MODE_READ_WRITE && iofd->io_ops.read_cb) || - (iofd->mode == OSMO_IO_FD_MODE_RECVFROM_SENDTO && iofd->io_ops.recvfrom_cb)) { + (iofd->mode == OSMO_IO_FD_MODE_RECVFROM_SENDTO && iofd->io_ops.recvfrom_cb) || + (iofd->mode == OSMO_IO_FD_MODE_RECVMSG_SENDMSG && iofd->io_ops.recvmsg_cb)) { osmo_iofd_ops.read_enable(iofd); } @@ -767,7 +867,12 @@ else osmo_iofd_ops.read_disable(iofd); break; - case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND: + case OSMO_IO_FD_MODE_RECVMSG_SENDMSG: + if (iofd->io_ops.recvmsg_cb) + osmo_iofd_ops.read_enable(iofd); + else + osmo_iofd_ops.read_disable(iofd); + break; default: OSMO_ASSERT(0); } @@ -780,7 +885,8 @@ * \param[in] iofd the file descriptor */ void osmo_iofd_notify_connected(struct osmo_io_fd *iofd) { - OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE); + OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE || + iofd->mode == OSMO_IO_FD_MODE_RECVMSG_SENDMSG); OSMO_ASSERT(osmo_iofd_ops.notify_connected); osmo_iofd_ops.notify_connected(iofd); } diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index 9c86e05..af47a3d 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -4,6 +4,7 @@ #include <unistd.h> #include <stdbool.h> +#include <netinet/sctp.h> #include <osmocom/core/osmo_io.h> #include <osmocom/core/linuxlist.h> @@ -72,6 +73,9 @@ /*! private number, extending \a data */ unsigned int priv_nr; + /*! size of iofd_msghdr.cmsg[] when allocated in recvmsg path */ + size_t cmsg_size; + struct { /*! talloc context from which to allocate msgb when reading */ const void *ctx; @@ -109,7 +113,8 @@ IOFD_ACT_WRITE, IOFD_ACT_RECVFROM, IOFD_ACT_SENDTO, - // TODO: SCTP_* + IOFD_ACT_RECVMSG, + IOFD_ACT_SENDMSG, }; @@ -132,6 +137,9 @@ struct msgb *msg; /*! I/O file descriptor on which we perform this I/O operation */ struct osmo_io_fd *iofd; + + /*! control message buffer for passing sctp_sndrcvinfo along */ + char cmsg[0]; /* size is determined by iofd->cmsg_size on recvmsg, and by mcghdr->msg_controllen on sendmsg */ }; enum iofd_seg_act { @@ -140,7 +148,7 @@ IOFD_SEG_ACT_DEFER, }; -struct iofd_msghdr *iofd_msghdr_alloc(struct osmo_io_fd *iofd, enum iofd_msg_action action, struct msgb *msg); +struct iofd_msghdr *iofd_msghdr_alloc(struct osmo_io_fd *iofd, enum iofd_msg_action action, struct msgb *msg, size_t cmsg_size); void iofd_msghdr_free(struct iofd_msghdr *msghdr); struct msgb *iofd_msgb_alloc(struct osmo_io_fd *iofd); diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c index 8398a30..52e806d 100644 --- a/src/core/osmo_io_poll.c +++ b/src/core/osmo_io_poll.c @@ -49,6 +49,7 @@ if (what & OSMO_FD_READ) { struct iofd_msghdr hdr; + msg = iofd_msgb_pending_or_alloc(iofd); if (!msg) { LOGPIO(iofd, LOGL_ERROR, "Could not allocate msgb for reading\n"); @@ -64,6 +65,10 @@ .msg_name = &hdr.osa.u.sa, .msg_namelen = sizeof(struct osmo_sockaddr), }; + if (iofd->mode == OSMO_IO_FD_MODE_RECVMSG_SENDMSG) { + hdr.hdr.msg_control = alloca(iofd->cmsg_size); + hdr.hdr.msg_controllen = iofd->cmsg_size; + } rc = recvmsg(ofd->fd, &hdr.hdr, flags); if (rc > 0) @@ -90,13 +95,15 @@ case OSMO_IO_FD_MODE_RECVFROM_SENDTO: iofd->io_ops.sendto_cb(iofd, 0, NULL, NULL); break; + case OSMO_IO_FD_MODE_RECVMSG_SENDMSG: + iofd->io_ops.sendmsg_cb(iofd, 0, NULL); + break; default: break; } if (osmo_iofd_txqueue_len(iofd) == 0) iofd_poll_ops.write_disable(iofd); } - } } diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index 24d1e08..aa9df85 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -3,6 +3,7 @@ * * (C) 2022-2023 by sysmocom s.f.m.c. * Author: Daniel Willmann <daniel(a)sysmocom.de> + * (C) 2023-2024 by Harald Welte <laforge(a)osmocom.org> * * All Rights Reserved. * @@ -35,6 +36,8 @@ #include <stdbool.h> #include <errno.h> +#include <netinet/in.h> +#include <netinet/sctp.h> #include <sys/eventfd.h> #include <liburing.h> @@ -114,7 +117,7 @@ OSMO_ASSERT(0); } - msghdr = iofd_msghdr_alloc(iofd, action, msg); + msghdr = iofd_msghdr_alloc(iofd, action, msg, iofd->cmsg_size); if (!msghdr) { LOGPIO(iofd, LOGL_ERROR, "Could not allocate msghdr for reading\n"); OSMO_ASSERT(0); @@ -126,6 +129,10 @@ switch (action) { case IOFD_ACT_READ: break; + case IOFD_ACT_RECVMSG: + msghdr->hdr.msg_control = msghdr->cmsg; + msghdr->hdr.msg_controllen = iofd->cmsg_size; + /* fall-through */ case IOFD_ACT_RECVFROM: msghdr->hdr.msg_iov = &msghdr->iov[0]; msghdr->hdr.msg_iovlen = 1; @@ -146,6 +153,7 @@ case IOFD_ACT_READ: io_uring_prep_readv(sqe, iofd->fd, msghdr->iov, 1, 0); break; + case IOFD_ACT_RECVMSG: case IOFD_ACT_RECVFROM: io_uring_prep_recvmsg(sqe, iofd->fd, &msghdr->hdr, msghdr->flags); break; @@ -210,10 +218,12 @@ switch (msghdr->action) { case IOFD_ACT_READ: case IOFD_ACT_RECVFROM: + case IOFD_ACT_RECVMSG: iofd_uring_handle_recv(msghdr, res); break; case IOFD_ACT_WRITE: case IOFD_ACT_SENDTO: + case IOFD_ACT_SENDMSG: iofd_uring_handle_tx(msghdr, res); break; default: @@ -273,6 +283,7 @@ switch (msghdr->action) { case IOFD_ACT_WRITE: case IOFD_ACT_SENDTO: + case IOFD_ACT_SENDMSG: io_uring_prep_sendmsg(sqe, msghdr->iofd->fd, &msghdr->hdr, msghdr->flags); break; default: @@ -334,21 +345,20 @@ LOGPIO(iofd, LOGL_ERROR, "Could not allocate msgb for writing\n"); OSMO_ASSERT(0); } - msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_WRITE, msg); + msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_WRITE, msg, 0); if (!msghdr) { LOGPIO(iofd, LOGL_ERROR, "Could not allocate msghdr for writing\n"); OSMO_ASSERT(0); } msghdr->iov[0].iov_base = msgb_data(msg); - msghdr->iov[0].iov_len = msgb_tailroom(msg); + msghdr->iov[0].iov_len = msgb_length(msg); sqe = io_uring_get_sqe(&g_ring.ring); if (!sqe) { LOGPIO(iofd, LOGL_ERROR, "Could not get io_uring_sqe\n"); OSMO_ASSERT(0); } - // Prep msgb/iov io_uring_prep_writev(sqe, iofd->fd, msghdr->iov, 1, 0); io_uring_sqe_set_data(sqe, msghdr); @@ -376,6 +386,9 @@ case OSMO_IO_FD_MODE_RECVFROM_SENDTO: iofd_uring_submit_recv(iofd, IOFD_ACT_RECVFROM); break; + case OSMO_IO_FD_MODE_RECVMSG_SENDMSG: + iofd_uring_submit_recv(iofd, IOFD_ACT_RECVMSG); + break; default: OSMO_ASSERT(0); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35068?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I89eb519b22d21011d61a7855b2364bc3c295df82 Gerrit-Change-Number: 35068 Gerrit-PatchSet: 12 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Assign const name when stealing TX msg from iofd ctx

by laforge

Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email ) Change subject: osmo_io: Assign const name when stealing TX msg from iofd ctx ...................................................................... Patch Set 1: (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/36121/comment/c22c89d0_daada4dd PS1, Line 339: talloc_set_name(msg, "osmo_io_rx_msgb"); > It happens at time the msgb is allocated, where as name we use a pointer to the (dynamically allocat […] I think it would be better to not even set the msgb name to the name of the iofd in the first place, avoiding having to change it later on here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b Gerrit-Change-Number: 36121 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 14:27:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Assign const name when stealing TX msg from iofd ctx

by laforge

Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email ) Change subject: osmo_io: Assign const name when stealing TX msg from iofd ctx ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/36121/comment/cf4b934b_354b7230 PS1, Line 339: talloc_set_name(msg, "osmo_io_rx_msgb"); > Can you point to the place which is setting this name so I can understand what's going on? It happens at time the msgb is allocated, where as name we use a pointer to the (dynamically allocated) name of the iofd. However, the iofd might be closed befoere the msgb's is released (think of queues, ...) and in that case a talloc report would try to print a string at an already-free'd address. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b Gerrit-Change-Number: 36121 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 14:27:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[M] Change in libosmocore[master]: osmo_io: sendmsg/recvmsg support

by laforge

Attention is currently required from: daniel, jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35068?usp=email ) Change subject: osmo_io: sendmsg/recvmsg support ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35068?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I89eb519b22d21011d61a7855b2364bc3c295df82 Gerrit-Change-Number: 35068 Gerrit-PatchSet: 12 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 14:24:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmo-sccp[master]: fix regression in sctp-role / transport-role

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email ) Change subject: fix regression in sctp-role / transport-role ...................................................................... fix regression in sctp-role / transport-role We saw some fall-out in automatic testing where configs with sctp-role would suddenly save as transport-role. Let's avoid this by keeping sctp-role for users of SCTP. Change-Id: Ic666b62948880445e030c637298d4e369b4c7e8e Fixes: 4d7e201 "VTY: rename 'sctp-role' to 'transport-role', add an alias" Related: SYS#5424, OS#6380 --- M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 890dded..9d58fb6 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1726,7 +1726,10 @@ vty_out(vty, " qos-class %u%s", asp->cfg.qos_class, VTY_NEWLINE); vty_out(vty, " role %s%s", osmo_str_tolower(get_value_string(osmo_ss7_asp_role_names, asp->cfg.role)), VTY_NEWLINE); - vty_out(vty, " transport-role %s%s", asp->cfg.is_server ? "server" : "client", VTY_NEWLINE); + if (asp->cfg.trans_proto == IPPROTO_SCTP) + vty_out(vty, " sctp-role %s%s", asp->cfg.is_server ? "server" : "client", VTY_NEWLINE); + else + vty_out(vty, " transport-role %s%s", asp->cfg.is_server ? "server" : "client", VTY_NEWLINE); if (asp->cfg.sctp_init.num_ostreams_present) vty_out(vty, " sctp-param init num-ostreams %u%s", asp->cfg.sctp_init.num_ostreams_value, VTY_NEWLINE); if (asp->cfg.sctp_init.max_instreams_present) diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index b8df809..7168d20 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -423,7 +423,7 @@ remote-ip 127.0.0.200 remote-ip 127.0.0.201 role sg - transport-role server + sctp-role server as my-ass m3ua asp my-asp routing-key 0 3.2.1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?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: Ic666b62948880445e030c637298d4e369b4c7e8e Gerrit-Change-Number: 36114 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: aaa_diameter_swx: Make tx timeout configurable and increase default t...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36118?usp=email ) Change subject: aaa_diameter_swx: Make tx timeout configurable and increase default to 10 seconds ...................................................................... aaa_diameter_swx: Make tx timeout configurable and increase default to 10 seconds Change-Id: I52c993b92da9979761b0c1526b5f253dff9d2e2f --- M config/sys.config M src/aaa_diameter_swx.erl 2 files changed, 23 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/config/sys.config b/config/sys.config index 8ed5ca6..a40fd23 100755 --- a/config/sys.config +++ b/config/sys.config @@ -14,6 +14,7 @@ {dia_swx_watchdog_config, [{okay, 3}, {suspect, 1}]}, + {dia_swx_transmit_timer, 10000}, {dia_swx_vendor_id, 0}, {dia_swx_origin_host, "epdg.localdomain"}, {dia_swx_origin_realm, "localdomain"}, diff --git a/src/aaa_diameter_swx.erl b/src/aaa_diameter_swx.erl index c623b3e..be301f2 100644 --- a/src/aaa_diameter_swx.erl +++ b/src/aaa_diameter_swx.erl @@ -71,6 +71,7 @@ -define(ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS, 30000). -define(ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS, 30000). -define(ENV_DEFAULT_DIAMETER_WATCHDOG_CFG, [{okay, 3}, {suspect, 1}]). +-define(ENV_DEFAULT_DIAMETER_TRANSMIT_TIMER_MS, 10000). -define(VENDOR_ID_3GPP, 10415). -define(VENDOR_ID_3GPP2, 5535). @@ -96,7 +97,8 @@ {module, ?CALLBACK_MOD}, {answer_errors, callback}]}]). --record(state, { +-record(swx_state, { + tx_timeout :: non_neg_integer(), handlers, peers = #{} }). @@ -121,17 +123,18 @@ gen_server:cast(?SERVER, {peer_down, SvcName, Peer}), ok. -init(State) -> +init([]) -> Proto = application:get_env(?ENV_APP_NAME, dia_swx_proto, ?ENV_DEFAULT_DIAMETER_PROTO), Ip = application:get_env(?ENV_APP_NAME, dia_swx_remote_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP), Port = application:get_env(?ENV_APP_NAME, dia_swx_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), ConnectTimer = application:get_env(?ENV_APP_NAME, dia_swx_connect_timer, ?ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS), WatchdogTimer = application:get_env(?ENV_APP_NAME, dia_swx_watchdog_timer, ?ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS), WatchdogConfig = application:get_env(?ENV_APP_NAME, dia_swx_watchdog_config, ?ENV_DEFAULT_DIAMETER_WATCHDOG_CFG), + TxTimer = application:get_env(?ENV_APP_NAME, dia_swx_transmit_timer, ?ENV_DEFAULT_DIAMETER_TRANSMIT_TIMER_MS), ok = diameter:start_service(?MODULE, ?SERVICE), % lager:info("DiaServices is ~p~n", [DiaServ]), {ok, _} = connect({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}), - {ok, State}. + {ok, #swx_state{tx_timeout = TxTimer}}. test() -> test("001011234567890"). @@ -223,7 +226,7 @@ 'RAT-Type' = RAT }, lager:debug("Swx Tx MAR: ~p~n", [MAR]), - Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, MAR, [{extra, [Pid]}, detach]), + Ret = diameter_call(MAR, Pid, State), case Ret of ok -> {reply, ok, State}; @@ -244,7 +247,7 @@ 'Server-Assignment-Type' = Type, 'Service-Selection' = [APN] }, - Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, SAR, [{extra, [Pid]}, detach]), + Ret = diameter_call(SAR, Pid, State), case Ret of ok -> {reply, ok, State}; @@ -306,4 +309,9 @@ tmod(sctp) -> diameter_sctp. +diameter_call(Msg, Pid, State) -> + diameter:call(?SVC_NAME, ?APP_ALIAS, Msg, [{extra, [Pid]}, + {timeout, State#swx_state.tx_timeout}, + detach]). + -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36118?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: I52c993b92da9979761b0c1526b5f253dff9d2e2f Gerrit-Change-Number: 36118 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm.erl: Log unexpected event

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36120?usp=email ) Change subject: epdg_ue_fsm.erl: Log unexpected event ...................................................................... epdg_ue_fsm.erl: Log unexpected event Change-Id: If5a9298296df07555e79fd61e1f7b948b9a1dd15 --- M src/epdg_ue_fsm.erl 1 file changed, 17 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 94f2a39..291df26 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -267,12 +267,12 @@ Data1 = Data#ue_fsm_data{tear_down_gsup_needed = false}, {next_state, state_wait_swm_session_termination_answer, Data1, [{reply,From,ok}]}; -state_authenticated({call, From}, _Whatever, Data) -> - lager:error("ue_fsm state_authenticated: Unexpected call event, ~p~n", [Data]), +state_authenticated({call, From}, Event, Data) -> + lager:error("ue_fsm state_authenticated: Unexpected call event ~p, ~p~n", [Event, Data]), {keep_state, Data, [{reply,From,ok}]}; -state_authenticated(cast, _Whatever, Data) -> - lager:error("ue_fsm state_authenticated: Unexpected cast event, ~p~n", [Data]), +state_authenticated(cast, Event, Data) -> + lager:error("ue_fsm state_authenticated: Unexpected cast event ~p, ~p~n", [Event, Data]), {keep_state, Data}. state_wait_create_session_resp(enter, _OldState, Data) -> @@ -334,12 +334,12 @@ Data1 = Data#ue_fsm_data{tun_pdp_ctx = undefined, tear_down_gsup_needed = false}, {next_state, state_wait_swm_session_termination_answer, Data1, [{reply,From,ok}]}; -state_active({call, From}, _Whatever, Data) -> - lager:error("ue_fsm state_active: Unexpected call event, ~p~n", [Data]), +state_active({call, From}, Event, Data) -> + lager:error("ue_fsm state_active: Unexpected call event ~p, ~p~n", [Event, Data]), {keep_state, Data, [{reply,From,ok}]}; -state_active(cast, _Whatever, Data) -> - lager:error("ue_fsm state_active: Unexpected cast event, ~p~n", [Data]), +state_active(cast, Event, Data) -> + lager:error("ue_fsm state_active: Unexpected cast event ~p, ~p~n", [Event, Data]), {keep_state, Data}. state_wait_delete_session_resp(enter, _OldState, Data) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36120?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: If5a9298296df07555e79fd61e1f7b948b9a1dd15 Gerrit-Change-Number: 36120 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: aaa_diameter_swx_cb.erl: Fix undef handle_error/5

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36117?usp=email ) Change subject: aaa_diameter_swx_cb.erl: Fix undef handle_error/5 ...................................................................... aaa_diameter_swx_cb.erl: Fix undef handle_error/5 We are passing extra parameters, so this function also needs to be adapted to the extra parameter, like handle_answer. Change-Id: Id66b849f62a98c4ae69ccd4106bc04b51712c589 --- M src/aaa_diameter_swx_cb.erl 1 file changed, 19 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/aaa_diameter_swx_cb.erl b/src/aaa_diameter_swx_cb.erl index 472f1d4..bf4a79e 100644 --- a/src/aaa_diameter_swx_cb.erl +++ b/src/aaa_diameter_swx_cb.erl @@ -9,7 +9,7 @@ %% diameter callbacks -export([peer_up/3, peer_down/3, pick_peer/4, pick_peer/5, prepare_request/3, prepare_request/4, prepare_retransmit/3, prepare_retransmit/4, - handle_answer/4, handle_answer/5, handle_error/4, handle_request/3]). + handle_answer/4, handle_answer/5, handle_error/4, handle_error/5, handle_request/3]). %% peer_up/3 peer_up(_SvcName, Peer, State) -> @@ -88,10 +88,14 @@ %% handle_error/4 handle_error(Reason, Request, _SvcName, _Peer) when is_list(Request) -> - lager:error("error: ~p~n", [Reason]), + lager:error("SWx error: ~p~n", [Reason]), {error, Reason}; handle_error(Reason, _Request, _SvcName, _Peer) -> - lager:error("error: ~p~n", [Reason]), + lager:error("SWx error: ~p~n", [Reason]), + {error, Reason}. +%% handle_error/5 +handle_error(Reason, _Request, _SvcName, _Peer, ExtraPars) -> + lager:error("SWx error: ~p, ExtraPars: ~p~n", [Reason, ExtraPars]), {error, Reason}. %% handle_request/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36117?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: Id66b849f62a98c4ae69ccd4106bc04b51712c589 Gerrit-Change-Number: 36117 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Increase timeout waiting for gtp response

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36116?usp=email ) Change subject: epdg_ue_fsm: Increase timeout waiting for gtp response ...................................................................... epdg_ue_fsm: Increase timeout waiting for gtp response Answers can take a while specially during CreateSession, where several nodes are involved, like PGW, AAA, HSS, PCRF, etc. Change-Id: I3c8e7c7551bb3d48c46c0195c02cb44ce222a17f --- M src/epdg_ue_fsm.erl 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 439cb3f..94f2a39 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -49,6 +49,8 @@ state_wait_create_session_resp/3, state_wait_delete_session_resp/3, state_wait_swm_session_termination_answer/3, state_active/3]). +-define(TIMEOUT_VAL_WAIT_GTP_ANSWER, 10000). + -record(ue_fsm_data, { imsi, apn = "internet" :: string(), @@ -274,7 +276,7 @@ {keep_state, Data}. state_wait_create_session_resp(enter, _OldState, Data) -> - {keep_state, Data, [{state_timeout,5000,create_session_timeout}]}; + {keep_state, Data, [{state_timeout,?TIMEOUT_VAL_WAIT_GTP_ANSWER,create_session_timeout}]}; state_wait_create_session_resp({call, From}, {received_gtpc_create_session_response, Result}, Data) -> lager:info("ue_fsm state_authenticated event=received_gtpc_create_session_response, ~p~n", [Data]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36116?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: I3c8e7c7551bb3d48c46c0195c02cb44ce222a17f Gerrit-Change-Number: 36116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[M] Change in ...osmo-epdg[master]: s2b: Handle CreateSession with failed Cause

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36112?usp=email ) Change subject: s2b: Handle CreateSession with failed Cause ...................................................................... s2b: Handle CreateSession with failed Cause Related: OS#6371 Change-Id: I7bc840e863c0a1eff3b1df2c42f6b1868dec8dae --- M src/epdg_gtpc_s2b.erl M src/epdg_ue_fsm.erl M src/gsup_server.erl M src/gtp_utils.erl 4 files changed, 89 insertions(+), 49 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index cef9bab..b0a34bd 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -389,46 +389,13 @@ {noreply, State0}; Sess0 -> % Do GTP specific msg parsing here, pass only relevant fields: - #{{v2_fully_qualified_tunnel_endpoint_identifier,1} := - #v2_fully_qualified_tunnel_endpoint_identifier{ - interface_type = 32, %% "S2b PGW GTP-C" - key = RemoteTEIC, ipv4 = _IPc4, ipv6 = _IPc6}, - {v2_pdn_address_allocation,0} := Paa, - {v2_bearer_context,0} := #v2_bearer_context{instance = 0, group = BearerIE}} = Resp#gtp.ie, - % Parse BearerContext: - #{{v2_eps_bearer_id,0} := #v2_eps_bearer_id{instance = 0, eps_bearer_id = Ebi}, - {v2_fully_qualified_tunnel_endpoint_identifier,4} := - #v2_fully_qualified_tunnel_endpoint_identifier{ - interface_type = 33, %% "S2b-U PGW GTP-U" - key = RemoteTEID, ipv4 = IPu4, ipv6 = IPu6} - } = BearerIE, - Bearer = gtp_session_find_bearer_by_ebi(Sess0, Ebi), - Sess1 = gtp_session_update_bearer(Sess0, Bearer, Bearer#gtp_bearer{remote_data_tei = RemoteTEID}), - Sess2 = Sess1#gtp_session{remote_control_tei = RemoteTEIC}, - lager:info("s2b: Updated Session after create_session_response: ~p~n", [Sess2]), - State1 = update_gtp_session(Sess0, Sess2, State0), - case maps:find({v2_additional_protocol_configuration_options,0}, Resp#gtp.ie) of - {ok, APCO_dec} -> - lager:debug("s2b: APCO_dec: ~p~n", [APCO_dec]), - APCO = gtp_packet:encode_protocol_config_opts(APCO_dec#v2_additional_protocol_configuration_options.config); - error -> - lager:notice("s2b: APCO not found in CreateSessionResp!~n", []), - APCO = undefined - end, - ResInfo0 = #{ - apn => binary_to_list(Sess0#gtp_session.apn), - eua => conv:gtp2_paa_to_epdg_eua(Paa), - local_teid => Bearer#gtp_bearer.local_data_tei, - remote_teid => RemoteTEID, - remote_ipv4 => IPu4, - remote_ipv6 => IPu6 - }, - case APCO of - undefined -> ResInfo = ResInfo0; - _ -> ResInfo = maps:put(apco, APCO, ResInfo0) - end, - epdg_ue_fsm:received_gtpc_create_session_response(Sess0#gtp_session.pid, {ok, ResInfo}), - {noreply, State1} + % First lookup Cause: + #{{v2_cause,0} := #v2_cause{instance = 0, v2_cause = GtpCauseAtom}} = Resp#gtp.ie, + GtpCause = gtp_utils:enum_v2_cause(GtpCauseAtom), + case gtp_utils:v2_cause_successful(GtpCause) of + true -> rx_gtp_create_session_response_successful(Resp, Sess0, State0); + false -> rx_gtp_create_session_response_failure(GtpCause, Sess0, State0) + end end; rx_gtp(Resp = #gtp{version = v2, type = delete_session_response}, State0) -> @@ -487,6 +454,54 @@ lager:error("S2b: UNIMPLEMENTED Rx: ~p~n", [Req]), {noreply, State}. + +rx_gtp_create_session_response_successful(Resp, Sess0, State0) -> + #{{v2_fully_qualified_tunnel_endpoint_identifier,1} := + #v2_fully_qualified_tunnel_endpoint_identifier{ + interface_type = 32, %% "S2b PGW GTP-C" + key = RemoteTEIC, ipv4 = _IPc4, ipv6 = _IPc6}, + {v2_pdn_address_allocation,0} := Paa, + {v2_bearer_context,0} := #v2_bearer_context{instance = 0, group = BearerIE}} = Resp#gtp.ie, + % Parse BearerContext: + #{{v2_eps_bearer_id,0} := #v2_eps_bearer_id{instance = 0, eps_bearer_id = Ebi}, + {v2_fully_qualified_tunnel_endpoint_identifier,4} := + #v2_fully_qualified_tunnel_endpoint_identifier{ + interface_type = 33, %% "S2b-U PGW GTP-U" + key = RemoteTEID, ipv4 = IPu4, ipv6 = IPu6} + } = BearerIE, + Bearer = gtp_session_find_bearer_by_ebi(Sess0, Ebi), + Sess1 = gtp_session_update_bearer(Sess0, Bearer, Bearer#gtp_bearer{remote_data_tei = RemoteTEID}), + Sess2 = Sess1#gtp_session{remote_control_tei = RemoteTEIC}, + lager:info("s2b: Updated Session after create_session_response: ~p~n", [Sess2]), + State1 = update_gtp_session(Sess0, Sess2, State0), + case maps:find({v2_additional_protocol_configuration_options,0}, Resp#gtp.ie) of + {ok, APCO_dec} -> + lager:debug("s2b: APCO_dec: ~p~n", [APCO_dec]), + APCO = gtp_packet:encode_protocol_config_opts(APCO_dec#v2_additional_protocol_configuration_options.config); + error -> + lager:notice("s2b: APCO not found in CreateSessionResp!~n", []), + APCO = undefined + end, + ResInfo0 = #{ + apn => binary_to_list(Sess0#gtp_session.apn), + eua => conv:gtp2_paa_to_epdg_eua(Paa), + local_teid => Bearer#gtp_bearer.local_data_tei, + remote_teid => RemoteTEID, + remote_ipv4 => IPu4, + remote_ipv6 => IPu6 + }, + case APCO of + undefined -> ResInfo = ResInfo0; + _ -> ResInfo = maps:put(apco, APCO, ResInfo0) + end, + epdg_ue_fsm:received_gtpc_create_session_response(Sess0#gtp_session.pid, {ok, ResInfo}), + {noreply, State1}. + +rx_gtp_create_session_response_failure(GtpCause, Sess, State0) -> + epdg_ue_fsm:received_gtpc_create_session_response(Sess#gtp_session.pid, {error, GtpCause}), + State1 = delete_gtp_session(Sess, State0), + {noreply, State1}. + tx_gtp(Req, State) -> lager:info("s2b: Tx ~p~n", [Req]), Msg = gtp_packet:encode(Req), diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index cf4d280..439cb3f 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -36,6 +36,7 @@ -include_lib("osmo_gsup/include/gsup_protocol.hrl"). -include_lib("gtplib/include/gtp_packet.hrl"). +-include_lib("gtp_utils.hrl"). -include("conv.hrl"). -export([start_link/1, stop/1]). @@ -288,11 +289,14 @@ eua = EUA, peer_addr = RemoteIPv4}, Ret = gtp_u_tun:create_pdp_context(TunPdpCtx), lager:debug("gtp_u_tun:create_pdp_context(~p) returned ~p~n", [ResInfo, Ret]), - Data1 = Data#ue_fsm_data{tun_pdp_ctx = TunPdpCtx}; - _ -> Data1 = Data - end, - gsup_server:tunnel_response(Data1#ue_fsm_data.imsi, Result), - {next_state, state_active, Data1, [{reply,From,ok}]}; + Data1 = Data#ue_fsm_data{tun_pdp_ctx = TunPdpCtx}, + gsup_server:tunnel_response(Data1#ue_fsm_data.imsi, Result), + {next_state, state_active, Data1, [{reply,From,ok}]}; + {error, GtpCause} -> + GsupCause = conv:cause_gtp2gsup(GtpCause), + gsup_server:tunnel_response(Data#ue_fsm_data.imsi, {error, GsupCause}), + {next_state, state_authenticated, Data, [{reply,From,ok}]} + end; state_wait_create_session_resp({call, From}, Event, Data) -> lager:error("ue_fsm state_wait_delete_session_resp: Unexpected call event ~p, ~p~n", [Event, Data]), @@ -300,7 +304,7 @@ state_wait_create_session_resp(state_timeout, create_session_timeout, Data) -> lager:error("ue_fsm state_wait_create_session_resp: Timeout ~p, ~p~n", [create_session_timeout, Data]), - gsup_server:tunnel_response(Data#ue_fsm_data.imsi, {error, create_session_timeout}), + gsup_server:tunnel_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_CONGESTION}), {next_state, state_authenticated, Data}. state_active(enter, _OldState, Data) -> diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 1e5173e..3b69849 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -171,11 +171,11 @@ {ok, APCO} -> Resp = maps:put(pco, APCO, Resp0); error -> Resp = Resp0 end; - {error, _} -> + {error, GsupCause} -> Resp = #{message_type => epdg_tunnel_error, imsi => Imsi, message_class => 5, - cause => ?GSUP_CAUSE_NET_FAIL + cause => GsupCause } end, tx_gsup(Socket, Resp), diff --git a/src/gtp_utils.erl b/src/gtp_utils.erl index 6098da2..0cca8d2 100644 --- a/src/gtp_utils.erl +++ b/src/gtp_utils.erl @@ -35,7 +35,9 @@ -module(gtp_utils). -author('Alexander Couzens <lynxis(a)fe80.eu>'). --export([plmn_to_bin/3, enum_v2_cause/1]). +-include_lib("gtp_utils.hrl"). + +-export([plmn_to_bin/3, enum_v2_cause/1, v2_cause_successful/1]). % ergw/apps/ergw/test/*.erl @@ -125,3 +127,12 @@ enum_v2_cause(request_rejected_due_to_ue_capability) -> 127; enum_v2_cause(s1_u_path_failure) -> 128; enum_v2_cause('5gc_not_allowed') -> 129. + + +-spec v2_cause_successful(integer()) -> boolean(). + +v2_cause_successful(GtpCauseInt) -> + GtpCauseInt == ?GTP2_CAUSE_REQUEST_ACCEPTED orelse + GtpCauseInt == ?GTP2_CAUSE_REQUEST_ACCEPTED_PARTIALLY orelse + GtpCauseInt == ?GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_NETWORK_PREFERENCE orelse + GtpCauseInt == ?GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_SINGLE_ADDRESS_BEARER_ONLY. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36112?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: I7bc840e863c0a1eff3b1df2c42f6b1868dec8dae Gerrit-Change-Number: 36112 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 4 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm.erl: Log unexpected event

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36120?usp=email ) Change subject: epdg_ue_fsm.erl: Log unexpected event ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36120?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: If5a9298296df07555e79fd61e1f7b948b9a1dd15 Gerrit-Change-Number: 36120 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 13:14:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: aaa_diameter_swx: Make tx timeout configurable and increase default t...

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36118?usp=email ) Change subject: aaa_diameter_swx: Make tx timeout configurable and increase default to 10 seconds ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36118?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: I52c993b92da9979761b0c1526b5f253dff9d2e2f Gerrit-Change-Number: 36118 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 13:13:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: aaa_diameter_swx_cb.erl: Fix undef handle_error/5

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36117?usp=email ) Change subject: aaa_diameter_swx_cb.erl: Fix undef handle_error/5 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36117?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: Id66b849f62a98c4ae69ccd4106bc04b51712c589 Gerrit-Change-Number: 36117 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 13:13:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Increase timeout waiting for gtp response

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36116?usp=email ) Change subject: epdg_ue_fsm: Increase timeout waiting for gtp response ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36116?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: I3c8e7c7551bb3d48c46c0195c02cb44ce222a17f Gerrit-Change-Number: 36116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 13:13:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[M] Change in ...osmo-epdg[master]: s2b: Handle CreateSession with failed Cause

by pespin

Attention is currently required from: fixeria, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36112?usp=email ) Change subject: s2b: Handle CreateSession with failed Cause ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36112?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: I7bc840e863c0a1eff3b1df2c42f6b1868dec8dae Gerrit-Change-Number: 36112 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 29 Feb 2024 13:13:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: osmo_io: make use of osmo_iofd_get_ioops()

by jolly

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36077?usp=email ) Change subject: osmo_io: make use of osmo_iofd_get_ioops() ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: reverting back to patch set #1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36077?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: Id3cb11bc0000299faa79d980de8abc1980916d70 Gerrit-Change-Number: 36077 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 29 Feb 2024 12:58:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_{client,server} example: Cleanup on exit

by Jenkins Builder

Attention is currently required from: jolly. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36124?usp=email ) Change subject: stream_{client,server} example: Cleanup on exit ...................................................................... Patch Set 3: (2 comments) File examples/stream-client.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14770): https://gerrit.osmocom.org/c/libosmo-netif/+/36124/comment/8583882a_f24a09ae PS3, Line 172: while(!quit) { space required before the open parenthesis '(' File examples/stream-server.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14770): https://gerrit.osmocom.org/c/libosmo-netif/+/36124/comment/1fedd62a_0abb63f2 PS3, Line 189: while(!quit) { space required before the open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36124?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: I9dbb7f46b2a798e88ad4df8ff73c6ee40c07b843 Gerrit-Change-Number: 36124 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 29 Feb 2024 12:57:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: osmo_io: make use of osmo_iofd_get_ioops()

by jolly

Attention is currently required from: jolly, laforge. jolly has uploaded a new patch set (#4) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36077?usp=email ) The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: osmo_io: make use of osmo_iofd_get_ioops() ...................................................................... osmo_io: make use of osmo_iofd_get_ioops() This avoids resetting the callbacks with the wrong ones in the SCTP case. Change-Id: Id3cb11bc0000299faa79d980de8abc1980916d70 --- M TODO-RELEASE M src/stream_cli.c M src/stream_srv.c 3 files changed, 15 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/77/36077/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36077?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: Id3cb11bc0000299faa79d980de8abc1980916d70 Gerrit-Change-Number: 36077 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io_uring: Detach msghdr from iofd before calling iofd_handle_sen...

by pespin

Attention is currently required from: daniel, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35982?usp=email ) Change subject: osmo_io_uring: Detach msghdr from iofd before calling iofd_handle_send_completion() ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35982?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia349f73de2145fa360b20dd40deb73a8ffc71f07 Gerrit-Change-Number: 35982 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 12:56:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmo-sccp[master]: fix regression in sctp-role / transport-role

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email ) Change subject: fix regression in sctp-role / transport-role ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?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: Ic666b62948880445e030c637298d4e369b4c7e8e Gerrit-Change-Number: 36114 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 12:53:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream: Initialize outmsg in stream_iofd_sctp_send_msgb()

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36122?usp=email ) Change subject: stream: Initialize outmsg in stream_iofd_sctp_send_msgb() ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-netif/+/36122/comment/9c918655_715a59a2 PS1, Line 9: Uninitialized fields ont outmsg may cause undefined behaviour inside on outmsg -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36122?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: If4c8239c17deceeb56f64ebaff435df1e9d782cd Gerrit-Change-Number: 36122 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 29 Feb 2024 12:52:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io_uring: Run check of tests/osmo_io with io_uring also

by pespin

Attention is currently required from: daniel, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35984?usp=email ) Change subject: osmo_io_uring: Run check of tests/osmo_io with io_uring also ...................................................................... Patch Set 6: (1 comment) File tests/testsuite.at: https://gerrit.osmocom.org/c/libosmocore/+/35984/comment/f5540e7e_ccdb5a9b PS6, Line 535: AT_SKIP_IF([ test "$ENABLE_URING" != "yes" ]) > AT_SKIP_IF will run the test, if the condition is false. […] Ah I see, in all other AT_SKIP_IF we use the negation at the start so it becomes easier to read: AT_SKIP_IF([! test -e $abs_top_builddir/tests/socket/socket_sctp_test]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35984?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I82db9a15bc483a5447d86352512afaafa2bcfbb6 Gerrit-Change-Number: 35984 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 12:51:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_{client,server} example: Cleanup on exit

by Jenkins Builder

Attention is currently required from: jolly. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36124?usp=email ) Change subject: stream_{client,server} example: Cleanup on exit ...................................................................... Patch Set 2: (2 comments) File examples/stream-client.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14763): https://gerrit.osmocom.org/c/libosmo-netif/+/36124/comment/746197db_cdde96dc PS2, Line 172: while(!quit) { space required before the open parenthesis '(' File examples/stream-server.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14763): https://gerrit.osmocom.org/c/libosmo-netif/+/36124/comment/3474d14c_20325324 PS2, Line 189: while(!quit) { space required before the open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36124?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: I9dbb7f46b2a798e88ad4df8ff73c6ee40c07b843 Gerrit-Change-Number: 36124 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 29 Feb 2024 12:50:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Assign const name when stealing TX msg from iofd ctx

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email ) Change subject: osmo_io: Assign const name when stealing TX msg from iofd ctx ...................................................................... Patch Set 1: (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/36121/comment/8c58c7f4_5082591c PS1, Line 339: talloc_set_name(msg, "osmo_io_rx_msgb"); Can you point to the place which is setting this name so I can understand what's going on? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8dae924fa2d94a7f636136ba7279b965a18cf5b Gerrit-Change-Number: 36121 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 29 Feb 2024 12:50:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 4 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli: Correctly setup and free osmo_io client instance

by jolly

Attention is currently required from: jolly, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/35979?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: stream_cli: Correctly setup and free osmo_io client instance ...................................................................... stream_cli: Correctly setup and free osmo_io client instance Completely free and setup osmo_io again when reconnecting. osmo_iofd_notify_connected() must be called before any registration of read or write, because osmo_io_iouring does not allow this. Change-Id: I91a6a76b9ff96034a7b333edf87af27490202932 --- M src/stream_cli.c 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/79/35979/6 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35979?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: I91a6a76b9ff96034a7b333edf87af27490202932 Gerrit-Change-Number: 35979 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 month, 4 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: osmo_io: make use of osmo_iofd_get_ioops()

by jolly

Attention is currently required from: jolly, laforge. jolly has uploaded a new patch set (#3) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36077?usp=email ) The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: osmo_io: make use of osmo_iofd_get_ioops() ...................................................................... osmo_io: make use of osmo_iofd_get_ioops() This avoids resetting the callbacks with the wrong ones in the SCTP case. Change-Id: Id3cb11bc0000299faa79d980de8abc1980916d70 --- M src/stream_cli.c M src/stream_srv.c 2 files changed, 14 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/77/36077/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36077?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: Id3cb11bc0000299faa79d980de8abc1980916d70 Gerrit-Change-Number: 36077 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 month, 4 weeks

1
0
0 0