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

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?usp=email ) Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare ...................................................................... stp: ipa: Introduce test TC_combinedlset_loadshare Test combined linkset loadsharing on IPA AS. Change-Id: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Related: SYS#7112 --- M stp/STP_Tests_IPA.cfg M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml M stp/osmo-stp-ipa.confmerge 4 files changed, 152 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/40530/1 diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg index 9e9538e..8f6c24a 100644 --- a/stp/STP_Tests_IPA.cfg +++ b/stp/STP_Tests_IPA.cfg @@ -62,6 +62,20 @@ local_port := 20007 }, { + asp_name := "ipa-asp-LS0-0-0", + as_name := "ipa-as-LS0-0", + is_server := false, + remote_port := 5000, + local_port := 20010 + }, + { + asp_name := "ipa-asp-LS0-1-0", + as_name := "ipa-as-LS0-1", + is_server := false, + remote_port := 5000, + local_port := 20011 + }, + { asp_name := "ipa-asp-client0", as_name := "ipa-as-client0", is_server := true, diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 3fb0ace..e619144 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -425,8 +425,8 @@ "ipa-asp-loadshare-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); if (unknwon_dynamic_asp) { - ipa_configs[0].local_port := 3010; - ipa_configs[1].local_port := 3011; + ipa_configs[0].local_port := 9998; + ipa_configs[1].local_port := 9999; } f_init_ipa(ipa_configs := ipa_configs); @@ -528,6 +528,114 @@ f_tc_tmt_loadshare_sls(true); } +/* Test AS Loadsharing, (distributing traffic within linksets/ASs of a combined linkset). + * STP routing table is configured with 1 combined linkset towards PC 32 mask /14 with 2 + * AS routes ("ipa-as-LS0-0", "ipa-as-LS0-1") with same priority, each using 1 + * ASP ("ipa-asp-LS0-0-0", "ipa-asp-LS0-1-0"). + * We take advantage of the fact that AS "ipa-as-loadshare-receiver" is never used + * to transmit in other tests and use it here for the routing of its configured + * "point-code override dpc 32" towards the "ipa-as-LS0-{0,1}" in the STP config. + */ +private function f_tc_combinedlset_loadshare(boolean unknwon_dynamic_asp) +runs on IPA_CT { + var integer i; + + var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-receiver0", + "ipa-asp-loadshare-receiver1", + "ipa-asp-LS0-0-0", + "ipa-asp-LS0-1-0" }; + var IpaConfigs ipa_configs := ipa_build_configs(asps); + if (unknwon_dynamic_asp) { + ipa_configs[0].local_port := 9998; + ipa_configs[1].local_port := 9999; + } + + f_init_ipa(ipa_configs := ipa_configs); + + /* bring up the 'sender' side (single ASP in AS) */ + f_connect_ipa(0); + /* activate the first 'receiver' side ASP */ + f_connect_ipa(2); + + /* verify traffic is routed from sender to [sole] receiver */ + for (i := 0; i < 10; i := i+1) { + f_test_traffic(0, 2); + } + + /* activate the second 'receiver' side ASP */ + f_connect_ipa(3); + + /* 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 < iter_per_asp; i := i+1) { + var octetstring data := f_SCCP_UDT(); + f_IPA_send(0, data); + alt { + [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2); + } + } + + /* All traffic should still be sent to the same receiver, since + * OPC+DPC+SLS cannot change in IPA ASPs. + * However, depending on how the SLS seed tables were allocated, it can + * be that STP was routing through Alternative Route and now that the + * 2nd receiver is up it is now routing to it (Normal Route). Account + * for both scenarios. */ + if (not ((num_rx_1 == iter_per_asp and num_rx_2 == 0) or (num_rx_2 == iter_per_asp and num_rx_1 == 0))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected all traffic through same receiver!"); + } + + + /* activate the second 'sender' side ASP */ + f_connect_ipa(1); + + num_rx_1 := 0; + num_rx_2 := 0; + sls_num_rx_1 := {}; + 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_SCCP_UDT(); + f_IPA_send(i mod 2, data); + alt { + [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(3, data, 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)); + } + setverdict(pass); +} +testcase TC_combinedlset_loadshare() runs on IPA_CT { + f_tc_combinedlset_loadshare(false); +} +/* same as above, with "accept-asp-connections dynamic-permitted" and clients from unknown ASPs */ +testcase TC_unknown_client_dynamic_combinedlset_loadshare() runs on IPA_CT { + f_tc_combinedlset_loadshare(true); +} + private function f_IPA_ping(integer idx) runs on IPA_CT { var IpaCcmMsgtype ipa_ping_msg := IPAC_MSGT_PING; @@ -641,6 +749,8 @@ execute( TC_tmt_loadshare_roundrobin() ); execute( TC_tmt_loadshare_sls() ); execute( TC_unknown_client_dynamic_tmt_loadshare() ); + execute( TC_combinedlset_loadshare() ); + execute( TC_unknown_client_dynamic_combinedlset_loadshare() ); execute( TC_beat() ); execute( TC_beat_timeout() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 646ca7b..91115d9 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='60' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='62' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='STP_Tests_M3UA' name='TC_connect_asp_up' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat_payload' time='MASKED'/> @@ -59,6 +59,8 @@ <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_roundrobin' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_sls' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_combinedlset_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_combinedlset_loadshare' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_clnt_beat_timeout' time='MASKED'/> diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge index 954f175..ef95384 100644 --- a/stp/osmo-stp-ipa.confmerge +++ b/stp/osmo-stp-ipa.confmerge @@ -53,6 +53,26 @@ point-code override dpc 34 asp ipa-asp-override-receiver0 asp ipa-asp-override-receiver1 + ! CombinedLinkset-loadsharing AS(P)s: + asp ipa-asp-LS0-0-0 20010 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + asp ipa-asp-LS0-1-0 20011 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as ipa-as-LS0-0 ipa + point-code override dpc 38 + routing-key 0 44 + asp ipa-asp-LS0-0-0 + as ipa-as-LS0-1 ipa + point-code override dpc 39 + routing-key 0 45 + asp ipa-asp-LS0-1-0 + ! CLIENT asp ipa-asp-client0 6001 7001 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 @@ -68,6 +88,9 @@ ! route-table system update route 31 16777215 linkset ipa-as-loadshare-receiver + ! These 2 below are used in TC_combinedlset_loadshare to route traffic from ipa-as-loadshare-receiver towards: + update route 32 16777215 linkset ipa-as-LS0-0 priority 6 + update route 32 16777215 linkset ipa-as-LS0-1 priority 6 update route 33 16777215 linkset ipa-as-override-receiver ! !SERVERS: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?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: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Gerrit-Change-Number: 40530 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Add helper function to build SCCP UDT encoded octetstring

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40529?usp=email ) Change subject: stp: Add helper function to build SCCP UDT encoded octetstring ...................................................................... stp: Add helper function to build SCCP UDT encoded octetstring Change-Id: I67961807bba4853b58e4b6f87eb3f2b56e9bb027 --- M stp/STP_Tests_Common.ttcn M stp/STP_Tests_IPA.ttcn M stp/STP_Tests_IPA_M3UA.ttcn 3 files changed, 31 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/40529/1 diff --git a/stp/STP_Tests_Common.ttcn b/stp/STP_Tests_Common.ttcn index 463e935..01e9ab6 100644 --- a/stp/STP_Tests_Common.ttcn +++ b/stp/STP_Tests_Common.ttcn @@ -14,11 +14,31 @@ friend module STP_Tests_IPA; friend module STP_Tests_IPA_M3UA; +import from General_Types all; +import from Osmocom_Types all; + import from TELNETasp_PortType all; import from Osmocom_VTY_Functions all; import from IPL4asp_Types all; +import from SCCP_Types all; +import from SCCP_Templates all; +import from SCCPasp_Types all; +import from SCCP_Emulation all; + +function f_SCCP_UDT(template (value) SCCP_PAR_Address called := ts_SccpAddr_GT('1234'H), + template (value) SCCP_PAR_Address calling := ts_SccpAddr_GT('5678'H), + template (omit) octetstring data := omit) return octetstring +{ + if (istemplatekind(data, "omit")) { + data := f_rnd_octstring_rnd_len(100); + } + var PDU_SCCP sccp := valueof(ts_SCCP_UDT(valueof(called), valueof(calling), valueof(data))); + var octetstring sccp_enc := enc_PDU_SCCP(sccp); + return sccp_enc; +} + type component Test_CT { port TELNETasp_PT VTY; timer g_Tguard := 30.0; diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index a34fd6d..3fb0ace 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -150,19 +150,10 @@ } } -private function f_rnd_ipa_len() runs on IPA_CT return integer { - var integer rnd_len := f_rnd_int(100); - /* We need at least 1 byte of data, othewise osmocom IPA stack will discard and close the socket */ - if (rnd_len == 0) { - rnd_len := 1; - } - return rnd_len; -} - /* Test if traffic is routed from idx_tx to idx_rx */ private function f_test_traffic(integer idx_tx, integer idx_rx) runs on IPA_CT { - var octetstring data := f_rnd_octstring(f_rnd_ipa_len()); + var octetstring data := f_SCCP_UDT(); f_IPA_send(idx_tx, data); f_IPA_exp(idx_rx, data); } @@ -390,7 +381,7 @@ const integer iter_per_asp := 5; var integer num_rx[2] := { 0, 0 }; for (i := 0; i < 2*iter_per_asp; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_ipa_len()); + var octetstring data := f_SCCP_UDT(); f_IPA_send(0, data); alt { [] as_count_rx(1, data, num_rx[0]); @@ -472,7 +463,7 @@ sls_num_rx_2 := sls_num_rx_2 & {0}; } for (i := 0; i < iter_per_asp; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_ipa_len()); + var octetstring data := f_SCCP_UDT(); f_IPA_send(0, data); alt { [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); @@ -504,7 +495,7 @@ 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(f_rnd_ipa_len()); + var octetstring data := f_SCCP_UDT(); f_IPA_send(i mod 2, data); alt { [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn index 5600f6e..1e45372 100644 --- a/stp/STP_Tests_IPA_M3UA.ttcn +++ b/stp/STP_Tests_IPA_M3UA.ttcn @@ -43,24 +43,6 @@ const OCT1 c_M3UA_SI_SCCP := '03'O; -template (value) PDU_SCCP ts_SCCP_UDT(SCCP_PAR_Address called, SCCP_PAR_Address calling, - template (value) octetstring data, - template (value) BIT4 msg_hdl := '0000'B) := { - unitdata := { - messageType := udt, - protClass := {'0000'B, msg_hdl}, - pointer1 := 0, - pointer2 := 0, - pointer3 := 0, - calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), - callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), - data := { - paramLength := 0, - data := data - } - } -} - /* Test routing of SCCP between an M3UA and an IPA ASP */ testcase TC_m3ua_to_ipa() runs on IPA_M3UA_CT { var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" }; @@ -76,11 +58,7 @@ f_M3UA_asp_up_act(0, omit, rctx_sender); /* send a well-formed, encoded SCCP message via M3UA */ - var octetstring data := f_rnd_octstring_rnd_len(100); - var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); - var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); - var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); - var octetstring sccp_enc := enc_PDU_SCCP(sccp); + var octetstring sccp_enc := f_SCCP_UDT(); var template (value) M3UA_Protocol_Data tx_pd; tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, sccp_enc); f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1); @@ -111,11 +89,7 @@ f_M3UA_asp_up_act(0, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring_rnd_len(100); - var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); - var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); - var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); - var octetstring sccp_enc := enc_PDU_SCCP(sccp); + var octetstring sccp_enc := f_SCCP_UDT(); f_IPA_send(0, sccp_enc); /* expect to receive it via M3UA */ @@ -146,11 +120,7 @@ f_M3UA_asp_up_act(0, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring_rnd_len(100); - var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); - var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); - var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); - var octetstring sccp_enc := enc_PDU_SCCP(sccp); + var octetstring sccp_enc := f_SCCP_UDT(); f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator national"); f_IPA_send(0, sccp_enc); @@ -187,18 +157,18 @@ var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); - var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); - f_IPA_send(0, enc_PDU_SCCP(sccp)); + var octetstring sccp_enc := f_SCCP_UDT(called, calling, data); + f_IPA_send(0, sccp_enc); /* patch point codes into addresses */ called := valueof(ts_SccpAddr_PC_GT(oct2int(pc_receiver), '83'O, "mtp3_itu", '1234'H)); calling := valueof(ts_SccpAddr_PC_GT(oct2int(pc_sender), '83'O, "mtp3_itu", '5678'H)); - var PDU_SCCP sccp_exp := valueof(ts_SCCP_UDT(called, calling, data)); + sccp_enc := f_SCCP_UDT(called, calling, data); /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, - enc_PDU_SCCP(sccp_exp)); + sccp_enc); f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_clear_m3ua(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40529?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: I67961807bba4853b58e4b6f87eb3f2b56e9bb027 Gerrit-Change-Number: 40529 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: xua_snm.c: Handle DAUD with aff_pc containing wildcards

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40498?usp=email ) Change subject: xua_snm.c: Handle DAUD with aff_pc containing wildcards ...................................................................... xua_snm.c: Handle DAUD with aff_pc containing wildcards Handle it with a really basic implementation for completeness. In theory we shouldn't in general be receiving such big masks, since RFC466 3.4.3 states: """ It is recommended that during normal operation (traffic handling) the mask field of the Affected Point Code parameter in the DAUD message be kept to a zero value in order to avoid SG overloading. """ Change-Id: Icdb726ae66d3bee19b2113b1e77d68b517e8fb4d --- M src/xua_snm.c 1 file changed, 47 insertions(+), 12 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/xua_snm.c b/src/xua_snm.c index 079cd96..f3c8bb8 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -316,26 +316,61 @@ uint32_t _aff_pc = ntohl(aff_pc[i]); uint32_t pc = _aff_pc & 0xffffff; uint8_t mask = _aff_pc >> 24; - bool is_available = false; + bool is_available; + + struct osmo_ss7_route_label rtlabel = { + .opc = xua->mtp.opc, /* Use OPC of received DAUD. */ + .dpc = pc, + .sls = 0, + }; if (mask == 0) { /* one single point code */ - - struct osmo_ss7_route_label rtlabel = { - .opc = xua->mtp.opc, /* Use OPC of received DAUD. FIXME: is this correct? */ - .dpc = pc, - .sls = 0, - }; - /* Check if there's an "active" route available: */ - if (ss7_instance_lookup_route(s7i, &rtlabel)) - is_available = true; + is_available = !!ss7_instance_lookup_route(s7i, &rtlabel); xua_tx_snm_available(asp, rctx, num_rctx, &aff_pc[i], 1, "Response to DAUD", is_available); } else { - /* TODO: wildcard match */ - LOGPASP(asp, log_ss, LOGL_NOTICE, "DAUD with wildcard match not supported yet\n"); + /* Multiple single point codes with mask indicating number of wildcarded bits. */ + uint32_t maskbits = (1 << mask) - 1; + uint32_t fullpc; + unsigned int num_aff_pc_avail = 0; + unsigned int num_aff_pc_unavail = 0; + uint32_t *aff_pc_avail = talloc_size(asp, sizeof(uint32_t)*(1 << mask)); + uint32_t *aff_pc_unavail = talloc_size(asp, sizeof(uint32_t)*(1 << mask)); + for (fullpc = (pc & ~maskbits); fullpc <= (pc | maskbits); fullpc++) { + rtlabel.dpc = fullpc; + is_available = !!ss7_instance_lookup_route(s7i, &rtlabel); + if (is_available) + aff_pc_avail[num_aff_pc_avail++] = htonl(fullpc); /* mask = 0 */ + else + aff_pc_unavail[num_aff_pc_unavail++] = htonl(fullpc); /* mask = 0 */ + } + /* TODO: Ideally an extra step would be needed here to pack again all + * concurrent PCs on each array sharing a suffix mask, in order to + * shrink the transmitted list of Affected PCs. */ + const unsigned int MAX_PC_PER_MSG = 32; + for (unsigned int i = 0; i < num_aff_pc_avail; i += MAX_PC_PER_MSG) { + unsigned int num_transmit; + if (i + MAX_PC_PER_MSG < num_aff_pc_avail) + num_transmit = MAX_PC_PER_MSG; + else + num_transmit = (num_aff_pc_avail - i); + xua_tx_snm_available(asp, rctx, num_rctx, &aff_pc_avail[i], + num_transmit, "Response to DAUD", true); + } + for (unsigned int i = 0; i < num_aff_pc_unavail; i += MAX_PC_PER_MSG) { + unsigned int num_transmit; + if (i + MAX_PC_PER_MSG < num_aff_pc_unavail) + num_transmit = MAX_PC_PER_MSG; + else + num_transmit = (num_aff_pc_unavail - i); + xua_tx_snm_available(asp, rctx, num_rctx, &aff_pc_unavail[i], + num_transmit, "Response to DAUD", false); + } + talloc_free(aff_pc_avail); + talloc_free(aff_pc_unavail); } } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40498?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Icdb726ae66d3bee19b2113b1e77d68b517e8fb4d Gerrit-Change-Number: 40498 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: Move sccp_address_book logic out of vty.c

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40500?usp=email ) Change subject: Move sccp_address_book logic out of vty.c ...................................................................... Move sccp_address_book logic out of vty.c Move it tto a file containing data domain code. Move the struct definition to a header so it can be used in other files like ss7_vty.c. It will be used in more places in follow-up patches. Change-Id: Ib37a2503b8cf0fadce9072020e0e14a2a05561bf --- M src/sccp_internal.h M src/ss7_instance.c M src/ss7_vty.c 3 files changed, 113 insertions(+), 104 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 37ada11..298ef3e 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -15,6 +15,19 @@ #include "ss7_user.h" +/* SCCP addressbook */ +extern struct llist_head sccp_address_book_global; +struct osmo_sccp_addr_entry { + struct llist_head list; + struct llist_head list_global; + struct osmo_ss7_instance *inst; + char name[32]; + struct osmo_sccp_addr addr; +}; +struct osmo_sccp_addr_entry *addr_entry_by_name_local(const char *name, + const struct osmo_ss7_instance *inst); +struct osmo_sccp_addr_entry *addr_entry_by_name_global(const char *name); + /* Appendix C.4 of Q.714 */ enum osmo_sccp_timer { /* 0 kept unused on purpose since it's handled specially by osmo_fsm */ diff --git a/src/ss7_instance.c b/src/ss7_instance.c index 527cf2a..ef0fbd8 100644 --- a/src/ss7_instance.c +++ b/src/ss7_instance.c @@ -39,6 +39,7 @@ #include "ss7_instance.h" #include "ss7_linkset.h" #include "ss7_route_table.h" +#include "sccp_internal.h" static int32_t next_rctx = 1; static int32_t next_l_rk_id = 1; @@ -609,3 +610,102 @@ /* parse mask as point code */ return osmo_ss7_pointcode_parse(inst, in); } + +/*********************************************************************** + * SCCP addressbook handling + ***********************************************************************/ + +/* A global list that holds all addressbook entries at once + * (see also .cfg in struct osmo_ss7_instance) */ +LLIST_HEAD(sccp_address_book_global); + +/* Pick an SCCP address entry from the addressbook list by its name */ +struct osmo_sccp_addr_entry +*addr_entry_by_name_local(const char *name, + const struct osmo_ss7_instance *inst) +{ + struct osmo_sccp_addr_entry *entry; + + llist_for_each_entry(entry, &inst->cfg.sccp_address_book, list) { + if (strcmp(entry->name, name) == 0) { + OSMO_ASSERT(entry->inst == inst); + return entry; + } + } + + return NULL; +} + +/* Pick an SCCP address entry from the global addressbook + * list by its name */ +struct osmo_sccp_addr_entry +*addr_entry_by_name_global(const char *name) +{ + struct osmo_sccp_addr_entry *entry; + + llist_for_each_entry(entry, &sccp_address_book_global, + list_global) { + if (strcmp(entry->name, name) == 0) + return entry; + } + + return NULL; +} + +/*! \brief Lookup an SCCP address from the addressbook by its name. + * \param[out] dest_addr pointer to output the resulting sccp-address; + * (set to NULL if not interested) + * \param[in] name of the address to lookup + * \returns SS7 instance; NULL on error */ +struct osmo_ss7_instance * +osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, + const char *name) +{ + struct osmo_sccp_addr_entry *entry; + + entry = addr_entry_by_name_global(name); + if (!entry) + return NULL; + + if (dest_addr) + *dest_addr = entry->addr; + + return entry->inst; +} + +/*! \brief Lookup an SCCP address from the addressbook of a specific instance + * by its name. + * \param[out] dest_addr pointer to output the resulting sccp-address; + * (set to NULL if not interested) + * \param[in] name of the address to lookup + * \param[in] inst ss7 instance of which the address book will be searched + * \returns 0 on success; <0 on error */ +int osmo_sccp_addr_by_name_local(struct osmo_sccp_addr *dest_addr, const char *name, + const struct osmo_ss7_instance *inst) +{ + struct osmo_sccp_addr_entry *entry; + + entry = addr_entry_by_name_local(name, inst); + if (!entry) + return -ENOENT; + + if (dest_addr) + *dest_addr = entry->addr; + + return 0; +} + +/*! \brief Reverse lookup the lookup-name of a specified SCCP address. + * \param[in] name of the address to lookup + * \returns char pointer to the lookup-name; NULL on error */ +const char *osmo_sccp_name_by_addr(const struct osmo_sccp_addr *addr) +{ + struct osmo_sccp_addr_entry *entry; + + llist_for_each_entry(entry, &sccp_address_book_global, list_global) { + if (memcmp(&entry->addr, addr, sizeof(*addr)) == 0) + return entry->name; + } + + return NULL; +} diff --git a/src/ss7_vty.c b/src/ss7_vty.c index 862e9ff..66efc03 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -727,15 +727,6 @@ * SCCP addressbook handling ***********************************************************************/ -/* SCCP addressbook */ -struct osmo_sccp_addr_entry { - struct llist_head list; - struct llist_head list_global; - struct osmo_ss7_instance *inst; - char name[32]; - struct osmo_sccp_addr addr; -}; - static struct cmd_node sccpaddr_node = { L_CS7_SCCPADDR_NODE, "%s(config-cs7-sccpaddr)# ", @@ -748,101 +739,6 @@ 1, }; -/* A global list that holds all addressbook entries at once - * (see also .cfg in struct osmo_ss7_instance) */ -LLIST_HEAD(sccp_address_book_global); - -/* Pick an SCCP address entry from the addressbook list by its name */ -static struct osmo_sccp_addr_entry -*addr_entry_by_name_local(const char *name, - const struct osmo_ss7_instance *inst) -{ - struct osmo_sccp_addr_entry *entry; - - llist_for_each_entry(entry, &inst->cfg.sccp_address_book, list) { - if (strcmp(entry->name, name) == 0) { - OSMO_ASSERT(entry->inst == inst); - return entry; - } - } - - return NULL; -} - -/* Pick an SCCP address entry from the global addressbook - * list by its name */ -static struct osmo_sccp_addr_entry -*addr_entry_by_name_global(const char *name) -{ - struct osmo_sccp_addr_entry *entry; - - llist_for_each_entry(entry, &sccp_address_book_global, - list_global) { - if (strcmp(entry->name, name) == 0) - return entry; - } - - return NULL; -} - -/*! \brief Lookup an SCCP address from the addressbook by its name. - * \param[out] dest_addr pointer to output the resulting sccp-address; - * (set to NULL if not interested) - * \param[in] name of the address to lookup - * \returns SS7 instance; NULL on error */ -struct osmo_ss7_instance * -osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, - const char *name) -{ - struct osmo_sccp_addr_entry *entry; - - entry = addr_entry_by_name_global(name); - if (!entry) - return NULL; - - if (dest_addr) - *dest_addr = entry->addr; - - return entry->inst; -} - -/*! \brief Lookup an SCCP address from the addressbook of a specific instance - * by its name. - * \param[out] dest_addr pointer to output the resulting sccp-address; - * (set to NULL if not interested) - * \param[in] name of the address to lookup - * \param[in] inst ss7 instance of which the address book will be searched - * \returns 0 on success; <0 on error */ -int osmo_sccp_addr_by_name_local(struct osmo_sccp_addr *dest_addr, const char *name, - const struct osmo_ss7_instance *inst) -{ - struct osmo_sccp_addr_entry *entry; - - entry = addr_entry_by_name_local(name, inst); - if (!entry) - return -ENOENT; - - if (dest_addr) - *dest_addr = entry->addr; - - return 0; -} - -/*! \brief Reverse lookup the lookup-name of a specified SCCP address. - * \param[in] name of the address to lookup - * \returns char pointer to the lookup-name; NULL on error */ -const char *osmo_sccp_name_by_addr(const struct osmo_sccp_addr *addr) -{ - struct osmo_sccp_addr_entry *entry; - - llist_for_each_entry(entry, &sccp_address_book_global, list_global) { - if (memcmp(&entry->addr, addr, sizeof(*addr)) == 0) - return entry->name; - } - - return NULL; -} - /* Generate VTY configuration file snippet */ static void write_sccp_addressbook(struct vty *vty, const struct osmo_ss7_instance *inst) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40500?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ib37a2503b8cf0fadce9072020e0e14a2a05561bf Gerrit-Change-Number: 40500 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[XS] Change in libosmo-sigtran[master]: cosmetic: sua: Fix API documentation typo

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40499?usp=email ) Change subject: cosmetic: sua: Fix API documentation typo ...................................................................... cosmetic: sua: Fix API documentation typo Change-Id: I5aa42a3dfd5782425e23278f1b6a8ee8b9af2cac --- M src/sua.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/sua.c b/src/sua.c index 41bea1b..7d14f3b 100644 --- a/src/sua.c +++ b/src/sua.c @@ -863,7 +863,7 @@ } /*! Transmit SSNM DUNA/DAVA message indicating [un]availability of certain point code[s] - * \param[in] asp ASP through whihc to transmit message. Must be ACTIVE. + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. * \param[in] rctx array of Routing Contexts in network byte order. * \param[in] num_rctx number of rctx * \param[in] aff_pc array of 'Affected Point Code' in network byte order. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40499?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5aa42a3dfd5782425e23278f1b6a8ee8b9af2cac Gerrit-Change-Number: 40499 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: xua_snm.c: Handle DAUD with aff_pc containing wildcards

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40498?usp=email ) Change subject: xua_snm.c: Handle DAUD with aff_pc containing wildcards ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40498?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Icdb726ae66d3bee19b2113b1e77d68b517e8fb4d Gerrit-Change-Number: 40498 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 Jun 2025 14:19:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: octsim: initial commit

by osmith

Attention is currently required from: Hoernchen, laforge, pespin. osmith has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341?usp=email ) Change subject: octsim: initial commit ...................................................................... Patch Set 5: (2 comments) File octsim/OCTSIM_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341/comment/0b427f35_173c… : PS4, Line 22: //USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '60e3'H} }; > can this be dropped? Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341/comment/60ee2d75_b280… : PS4, Line 74: //activate(as_Tguard); > would be great to have Tguard working from the first commit... I took over the patches from Eric, but can't test them currently as I don't have access to an octsim-tester setup. In SYS#5489#note-20 I posted an idea of how to test it in jenkins. I'll wait with making more (especially non-cosmetic) changes until I can actually run the tests and verify they still work as intended. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iada6422d694eb5fc862477c8b43b8642c8d96692 Gerrit-Change-Number: 27341 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 Jun 2025 13:23:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: octsim: tester support

by osmith

Attention is currently required from: Hoernchen, pespin. osmith has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345?usp=email ) Change subject: octsim: tester support ...................................................................... Patch Set 6: (1 comment) File octsim/OCTSIM_Tests.cfg: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345/comment/1e9c90c5_3583… : PS5, Line 10: LogFile := "%e-%c-%h-%r.%s" > I don't recall we have all of this in any testsuite. […] @ewild@sysmocom.de: do you recall what the purpose of using custom logging here was / can this be removed? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id7c7e529a5444cffc8e79b385959a522dc9a6beb Gerrit-Change-Number: 27345 Gerrit-PatchSet: 6 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 Jun 2025 13:18:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: octsim: tester support

by osmith

Attention is currently required from: Hoernchen, pespin. osmith has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345?usp=email ) Change subject: octsim: tester support ...................................................................... Patch Set 5: (2 comments) File octsim/OCTSIM_Tests.cfg: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345/comment/6196c74d_5cb1… : PS5, Line 28: #OCTSIM_Tests.TC_test_grouped > this can be removed. Done File octsim/OCTSIM_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345/comment/95459b15_5458… : PS5, Line 583: python to generate tests > This can most probably go into a separate file? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id7c7e529a5444cffc8e79b385959a522dc9a6beb Gerrit-Change-Number: 27345 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 Jun 2025 13:18:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: octsim: initial commit

by osmith

Attention is currently required from: Hoernchen, laforge, osmith. osmith has uploaded a new patch set (#5) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: octsim: initial commit ...................................................................... octsim: initial commit This testsuite is for the sysmoOCTSIM. Related: https://www.sysmocom.de/products/sim/sysmooctsim/ Related: SYS#5489 Tweaked-by: Eric Wild <ewild(a)sysmocom.de> Tweaked-by: Oliver Smith <osmith(a)sysmocom.de> Change-Id: Iada6422d694eb5fc862477c8b43b8642c8d96692 --- M Makefile A octsim/OCTSIM_Tests.cfg A octsim/OCTSIM_Tests.default A octsim/OCTSIM_Tests.ttcn A octsim/README.md A octsim/gen_links.sh A octsim/regen_makefile.sh 7 files changed, 312 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/27341/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341?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: Iada6422d694eb5fc862477c8b43b8642c8d96692 Gerrit-Change-Number: 27341 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

2 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025