June 2025 - gerrit-log - lists.osmocom.org

[S] Change in libgtpnl[master]: Generate a version.h file

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/40511?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: I7761491ae767f1f21b2a3bba62d9ecb8a7d1226b --- M .gitignore M include/libgtpnl/Makefile.am A include/libgtpnl/version.h.tpl 3 files changed, 32 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 56eefa6..c5757f4 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ tools/gtp-tunnel tests/qemu/_* + +include/libgtpnl/version.h diff --git a/include/libgtpnl/Makefile.am b/include/libgtpnl/Makefile.am index 90b0a2e..c5bc9c9 100644 --- a/include/libgtpnl/Makefile.am +++ b/include/libgtpnl/Makefile.am @@ -1,4 +1,18 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + pkginclude_HEADERS = \ gtp.h \ gtpnl.h \ + version.h \ $(NULL) diff --git a/include/libgtpnl/version.h.tpl b/include/libgtpnl/version.h.tpl new file mode 100644 index 0000000..0a5a209 --- /dev/null +++ b/include/libgtpnl/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBGTPNL_VERSION {{VERSION}} +#define LIBGTPNL_VERSION_STR "{{VERSION}}" + +#define LIBGTPNL_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBGTPNL_VERSION_MINOR {{VERSION_MINOR}} +#define LIBGTPNL_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBGTPNL_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBGTPNL_VERSION_MAJOR > (major) || \ + (LIBGTPNL_VERSION_MAJOR == (major) && \ + LIBGTPNL_VERSION_MINOR > (minor)) || \ + (LIBGTPNL_VERSION_MAJOR == (major) && \ + LIBGTPNL_VERSION_MINOR == (minor) && \ + LIBGTPNL_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/40511?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I7761491ae767f1f21b2a3bba62d9ecb8a7d1226b Gerrit-Change-Number: 40511 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in libgtpnl[master]: include/libgtpnl/Makefile: format pkginclude_HEADERS

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/40510?usp=email ) Change subject: include/libgtpnl/Makefile: format pkginclude_HEADERS ...................................................................... include/libgtpnl/Makefile: format pkginclude_HEADERS Make it diff-friendly by having one file per line. Change-Id: Ib4add6a8d079002ad03a7446c4466c3dd652eaea --- M include/libgtpnl/Makefile.am 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/libgtpnl/Makefile.am b/include/libgtpnl/Makefile.am index b12e9a3..90b0a2e 100644 --- a/include/libgtpnl/Makefile.am +++ b/include/libgtpnl/Makefile.am @@ -1 +1,4 @@ -pkginclude_HEADERS = gtp.h gtpnl.h +pkginclude_HEADERS = \ + gtp.h \ + gtpnl.h \ + $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/40510?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ib4add6a8d079002ad03a7446c4466c3dd652eaea Gerrit-Change-Number: 40510 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: Generate a version.h file

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40506?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: I764d2dce1305441b353d4f9315b57cbaeb8b873e --- M .gitignore M include/osmocom/netif/Makefile.am A include/osmocom/netif/version.h.tpl 3 files changed, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index fd14f41..74848f5 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ amr_test contrib/libosmo-netif.spec +include/osmocom/netif/version.h diff --git a/include/osmocom/netif/Makefile.am b/include/osmocom/netif/Makefile.am index 5c10d71..3771859 100644 --- a/include/osmocom/netif/Makefile.am +++ b/include/osmocom/netif/Makefile.am @@ -2,6 +2,19 @@ stream_private.h \ $(NULL) +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + osmonetif_HEADERS = \ amr.h \ datagram.h \ @@ -13,6 +26,7 @@ rs232.h \ rtp.h \ stream.h \ + version.h \ $(NULL) if ENABLE_LIBSCTP diff --git a/include/osmocom/netif/version.h.tpl b/include/osmocom/netif/version.h.tpl new file mode 100644 index 0000000..289ecbd --- /dev/null +++ b/include/osmocom/netif/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_NETIF_VERSION {{VERSION}} +#define LIBOSMO_NETIF_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_NETIF_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_NETIF_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_NETIF_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_NETIF_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_NETIF_VERSION_MAJOR > (major) || \ + (LIBOSMO_NETIF_VERSION_MAJOR == (major) && \ + LIBOSMO_NETIF_VERSION_MINOR > (minor)) || \ + (LIBOSMO_NETIF_VERSION_MAJOR == (major) && \ + LIBOSMO_NETIF_VERSION_MINOR == (minor) && \ + LIBOSMO_NETIF_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40506?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I764d2dce1305441b353d4f9315b57cbaeb8b873e Gerrit-Change-Number: 40506 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: include/osmocom/netif/Makefile: format osmonetif_HEADERS

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40505?usp=email ) Change subject: include/osmocom/netif/Makefile: format osmonetif_HEADERS ...................................................................... include/osmocom/netif/Makefile: format osmonetif_HEADERS Format osmonetif_HEADERS like similar variables in other Osmocom projects. Change-Id: I6823188601606f1bff9a5787e6a8f2b6971e0ed2 --- M include/osmocom/netif/Makefile.am 1 file changed, 12 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/netif/Makefile.am b/include/osmocom/netif/Makefile.am index d518edb..5c10d71 100644 --- a/include/osmocom/netif/Makefile.am +++ b/include/osmocom/netif/Makefile.am @@ -2,17 +2,18 @@ stream_private.h \ $(NULL) -osmonetif_HEADERS = amr.h \ - datagram.h \ - ipa.h \ - ipa_unit.h \ - jibuf.h \ - osmux.h \ - prim.h \ - rs232.h \ - rtp.h \ - stream.h \ - $(NULL) +osmonetif_HEADERS = \ + amr.h \ + datagram.h \ + ipa.h \ + ipa_unit.h \ + jibuf.h \ + osmux.h \ + prim.h \ + rs232.h \ + rtp.h \ + stream.h \ + $(NULL) if ENABLE_LIBSCTP osmonetif_HEADERS += sctp.h -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40505?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6823188601606f1bff9a5787e6a8f2b6971e0ed2 Gerrit-Change-Number: 40505 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: include/Makefile: format nobase_include_HEADERS

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40502?usp=email ) Change subject: include/Makefile: format nobase_include_HEADERS ...................................................................... include/Makefile: format nobase_include_HEADERS Make nobase_include_HEADERS diff friendly by having one file in one line. Change-Id: Ib2af631dd0f27c79098be94082fa7bfb52350b09 --- M include/Makefile.am 1 file changed, 17 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/Makefile.am b/include/Makefile.am index d555e62..0e53031 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,15 +1,22 @@ noinst_HEADERS=mISDNif.h internal.h -nobase_include_HEADERS = osmocom/abis/ipa.h osmocom/abis/trau_frame.h \ - osmocom/abis/ipaccess.h osmocom/abis/abis.h \ - osmocom/abis/subchan_demux.h osmocom/abis/e1_input.h \ - osmocom/abis/lapd.h osmocom/abis/lapd_pcap.h osmocom/abis/unixsocket_proto.h \ - osmocom/trau/csd_ra2.h \ - osmocom/trau/csd_raa_prime.h \ - osmocom/trau/trau_frame.h \ - osmocom/trau/trau_sync.h \ - osmocom/trau/trau_pcu_ericsson.h \ - osmocom/trau/trau_rtp.h +nobase_include_HEADERS = \ + osmocom/abis/abis.h \ + osmocom/abis/e1_input.h \ + osmocom/abis/ipa.h \ + osmocom/abis/ipaccess.h \ + osmocom/abis/lapd.h \ + osmocom/abis/lapd_pcap.h \ + osmocom/abis/subchan_demux.h \ + osmocom/abis/trau_frame.h \ + osmocom/abis/unixsocket_proto.h \ + osmocom/trau/csd_ra2.h \ + osmocom/trau/csd_raa_prime.h \ + osmocom/trau/trau_frame.h \ + osmocom/trau/trau_pcu_ericsson.h \ + osmocom/trau/trau_rtp.h \ + osmocom/trau/trau_sync.h \ + $(NULL) if ENABLE_ORTP nobase_include_HEADERS += osmocom/trau/osmo_ortp.h -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40502?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib2af631dd0f27c79098be94082fa7bfb52350b09 Gerrit-Change-Number: 40502 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: Generate a version.h file

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40503?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: I7fc28a976c922caa29f4e5b3832cdd743c939fa3 --- M .gitignore M include/Makefile.am A include/osmocom/abis/version.h.tpl 3 files changed, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 80e6834..ee4b9f8 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ *.sw? contrib/libosmo-abis.spec +include/osmocom/abis/version.h diff --git a/include/Makefile.am b/include/Makefile.am index 0e53031..16c61a5 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,5 +1,18 @@ noinst_HEADERS=mISDNif.h internal.h +osmocom/abis/version.h: osmocom/abis/version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + +EXTRA_DIST = \ + osmocom/abis/version.h.tpl \ + $(NULL) + nobase_include_HEADERS = \ osmocom/abis/abis.h \ osmocom/abis/e1_input.h \ @@ -10,6 +23,7 @@ osmocom/abis/subchan_demux.h \ osmocom/abis/trau_frame.h \ osmocom/abis/unixsocket_proto.h \ + osmocom/abis/version.h \ osmocom/trau/csd_ra2.h \ osmocom/trau/csd_raa_prime.h \ osmocom/trau/trau_frame.h \ diff --git a/include/osmocom/abis/version.h.tpl b/include/osmocom/abis/version.h.tpl new file mode 100644 index 0000000..87f0ccf --- /dev/null +++ b/include/osmocom/abis/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_ABIS_VERSION {{VERSION}} +#define LIBOSMO_ABIS_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_ABIS_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_ABIS_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_ABIS_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_ABIS_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_ABIS_VERSION_MAJOR > (major) || \ + (LIBOSMO_ABIS_VERSION_MAJOR == (major) && \ + LIBOSMO_ABIS_VERSION_MINOR > (minor)) || \ + (LIBOSMO_ABIS_VERSION_MAJOR == (major) && \ + LIBOSMO_ABIS_VERSION_MINOR == (minor) && \ + LIBOSMO_ABIS_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40503?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7fc28a976c922caa29f4e5b3832cdd743c939fa3 Gerrit-Change-Number: 40503 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: m3ua: Introduce test TC_combinedlset_loadshare

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40521?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: stp: m3ua: Introduce test TC_combinedlset_loadshare ...................................................................... stp: m3ua: Introduce test TC_combinedlset_loadshare Test combined linkset loadsharing on M3UA AS. Related: SYS#7112 Change-Id: I20a67648072f4d9839b1d1fceded1680362bf979 --- M stp/STP_Tests_M3UA.cfg M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml M stp/osmo-stp-m3ua.confmerge 4 files changed, 128 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/40521/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40521?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I20a67648072f4d9839b1d1fceded1680362bf979 Gerrit-Change-Number: 40521 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Test combined linkset loadsharing

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40521?usp=email ) Change subject: stp: Test combined linkset loadsharing ...................................................................... stp: Test combined linkset loadsharing Related: SYS#7112 Change-Id: I20a67648072f4d9839b1d1fceded1680362bf979 --- M stp/STP_Tests_M3UA.cfg M stp/STP_Tests_M3UA.ttcn M stp/osmo-stp-m3ua.confmerge 3 files changed, 127 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/40521/1 diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg index dd0c97b..860bdd7 100644 --- a/stp/STP_Tests_M3UA.cfg +++ b/stp/STP_Tests_M3UA.cfg @@ -40,6 +40,24 @@ routing_ctx := 1042 }, { + asp_name := "asp-LS0-0-0", + is_server := false, + use_tcp := false, + remote_port := 2905, + local_port := 10002, + point_code := 44, + routing_ctx := 1044 + }, + { + asp_name := "asp-LS0-1-0", + is_server := false, + use_tcp := false, + remote_port := 2905, + local_port := 10003, + point_code := 45, + routing_ctx := 1045 + }, + { asp_name := "asp-client0", is_server := true, use_tcp := false, diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 497bd82..8559aa1 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -1655,6 +1655,90 @@ f_clear_m3ua(); } +/* Test "traffic-mode loadshare" behavior. Validates ASP Loadsharing scenario + * (distributing traffic within ASPs of one AS). + * NOTE: This test does not validate AS Loadsharing, (distributing traffic + * within linksets/ASs of a combined linkset). */ +testcase TC_combinedlset_loadshare() runs on RAW_M3UA_CT { + var integer i; + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-LS0-0-0", "asp-LS0-1-0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 rctx_receiver2 := int2oct(m3ua_configs[2].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(99, 4); + + f_init_m3ua(m3ua_configs := m3ua_configs); + + /* bring up the 'sender' side (single ASP in AS) */ + f_M3UA_asp_up_act(0, omit, rctx_sender); + + /* activate the first 'receiver' side ASP */ + f_M3UA_asp_up_act(1, c_M3UA_TMT_override, rctx_receiver); + + /* verify traffic is routed from sender to [sole] receiver */ + for (i := 0; i < 10; i := i+1) { + f_test_traffic(0, rctx_sender, pc_sender, 1, rctx_receiver, pc_receiver); + } + + /* activate the second 'receiver' side ASP+AS */ + f_M3UA_asp_up_act(2, c_M3UA_TMT_override, rctx_receiver); + //f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctx_receiver2)); + //f_M3UA_exp(1, tr_M3UA_DAVA({*}, rctx_receiver2)); + + /* verify traffic is routed from sender to new receiver */ + const integer iter_per_asp := 20; + const integer NUM_SLS := 16; /* SLS in ITU is 4 bits. */ + var integer num_rx_1 := 0; + var integer num_rx_2 := 0; + var Integers sls_num_rx_1 := {}; + var Integers sls_num_rx_2 := {}; + for (i := 0; i < NUM_SLS; i := i + 1) { + sls_num_rx_1 := sls_num_rx_1 & {0}; + sls_num_rx_2 := sls_num_rx_2 & {0}; + } + for (i := 0; i < 2*iter_per_asp; i := i+1) { + var octetstring data := f_rnd_octstring_rnd_len(100); + var template (value) M3UA_Protocol_Data tx_pd; + var template (present) M3UA_Protocol_Data rx_pd; + /* Distribute traffic over ASPs based on SLS, since OPC is always the same. + * SLS in ITU is 4 bits. */ + var OCT1 sls := int2oct(i mod 16, 1); + tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, sls, data); + rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, sls, data); + f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1); + alt { + [] as_count_rx_sls(1, tr_M3UA_DATA(rctx_receiver, rx_pd), sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(2, tr_M3UA_DATA(rctx_receiver2, rx_pd), sls_num_rx_2, num_rx_2); + } + } + + /* Make sure traffic was sent over both ASPs and that it was distributed: */ + if (num_rx_1 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 1st ASP!"); + } + if (num_rx_2 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 2nd ASP!"); + } + if (num_rx_1 + num_rx_2 != 2*iter_per_asp) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx ", num_rx_1 + num_rx_2 ," packets in total vs exp ", 2*iter_per_asp)); + } + + /* Check that a given SLS is not forwarded to both ASPs: */ + for (i := 0; i < NUM_SLS; i := i+1) { + if (sls_num_rx_1[i] > 0 and sls_num_rx_2[i] > 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx packets for SLS ", i, " in both ASPs!")); + } + + } + setverdict(pass); + + f_clear_m3ua(); +} + control { /* M3UA Tests */ execute( TC_connect_asp_up() ); @@ -1671,6 +1755,7 @@ execute( TC_tmt_broadcast() ); execute( TC_act_rctx_data_no_rctx() ); execute( TC_m3ua_sctp_srv_adm_shutdown() ); + execute( TC_combinedlset_loadshare() ); /* M3UA RKM tests */ execute( TC_rkm_reg_static_notpermitted() ); diff --git a/stp/osmo-stp-m3ua.confmerge b/stp/osmo-stp-m3ua.confmerge index 65e2fa2..5bc337f 100644 --- a/stp/osmo-stp-m3ua.confmerge +++ b/stp/osmo-stp-m3ua.confmerge @@ -23,6 +23,21 @@ remote-ip ::1 role sg sctp-role server + ! CombinedLinkset-loadsharing ASPs: + asp asp-LS0-0-0 10002 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-LS0-1-0 10003 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server asp asp-client0 10002 2906 m3ua local-ip 127.0.0.1 local-ip ::1 @@ -51,6 +66,13 @@ asp asp-receiver0 asp asp-receiver1 routing-key 1042 42 + ! CombinedLinkset-loadsharing ASs: + as as-LS0-0 m3ua + routing-key 1044 44 + asp asp-LS0-0-0 + as as-LS0-1 m3ua + routing-key 1045 45 + asp asp-LS0-1-0 as as-client m3ua routing-key 1055 55 asp asp-client0 @@ -66,6 +88,8 @@ route-table system update route 23 16777215 linkset as-sender update route 42 16777215 linkset as-receiver + update route 99 16777215 linkset as-LS0-0 priority 3 + update route 99 16777215 linkset as-LS0-1 priority 3 update route 55 16777215 linkset as-client update route 60 16777215 linkset as-client60-norctx update route 61 16777215 linkset as-client61-norctx -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40521?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I20a67648072f4d9839b1d1fceded1680362bf979 Gerrit-Change-Number: 40521 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: include/Makefile: format nobase_include_HEADERS

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40502?usp=email ) Change subject: include/Makefile: format nobase_include_HEADERS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40502?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib2af631dd0f27c79098be94082fa7bfb52350b09 Gerrit-Change-Number: 40502 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 23 Jun 2025 15:04:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: include/osmocom/netif/Makefile: format osmonetif_HEADERS

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40505?usp=email ) Change subject: include/osmocom/netif/Makefile: format osmonetif_HEADERS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40505?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6823188601606f1bff9a5787e6a8f2b6971e0ed2 Gerrit-Change-Number: 40505 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 23 Jun 2025 15:04:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025