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

Change in osmo-ttcn3-hacks[master]: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 ) Change subject: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h ...................................................................... BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h Properly clean up conns in the end. Use COORD and new COORD2 ports to daisy-chain coordination between the four components. Related: OS#5444 Change-Id: I3b1dfc3b11e990893cbf182fb9f8840e198eb8aa --- M bsc/BSC_Tests_VAMOS.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 48 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/27086/1 diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index 9a53200..6266634 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -677,19 +677,55 @@ f_shutdown_helper(); } +const charstring DONE1 := "DONE1"; +const charstring DONE2 := "DONE2"; +const charstring DONE3 := "DONE3"; +const charstring DONE4 := "DONE4"; + +/* + * f1 f2 f3 f4 + * COORD <--> COORD | COORD2 <--> COORD | COORD2 <--> COORD + * ---DONE1----> ---DONE2----> ---DONE3----> + * <----DONE4--- <----DONE4--- <----DONE4--- + */ + /* First, primary lchan of TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h() */ private function f_TC_vamos_multiplex_tch_h_tch_h1(charstring id) runs on MSC_ConnHdlr { f_est_lchan_and_mode_modify_to_vamos(); f_logp(BSCVTY, "f_est_lchan_and_mode_modify_to_vamos done"); + COORD.send(DONE1); + COORD.receive(DONE4); + f_perform_clear(RSL); } /* Second, VAMOS shadow lchan of TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h() */ private function f_TC_vamos_multiplex_tch_h_tch_h2(charstring id) runs on MSC_ConnHdlr { + f_sleep(1.0); + COORD.receive(DONE1); f_est_and_reassign_to_secondary_lchan(valueof(t_RslChanNr_Osmo_VAMOS_Lm(5, 0))); + COORD2.send(DONE2); + COORD2.receive(DONE4) + COORD.send(DONE4); + f_perform_clear(RSL); +} + +private function f_TC_vamos_multiplex_tch_h_tch_h3(charstring id) runs on MSC_ConnHdlr { + f_sleep(1.0); + COORD.receive(DONE2); + f_est_lchan_and_mode_modify_to_vamos(); + f_logp(BSCVTY, "f_est_lchan_and_mode_modify_to_vamos done"); + COORD2.send(DONE3); + COORD2.receive(DONE4); + COORD.send(DONE4); + f_perform_clear(RSL); } private function f_TC_vamos_multiplex_tch_h_tch_h4(charstring id) runs on MSC_ConnHdlr { + f_sleep(1.0); + COORD.receive(DONE3); f_est_and_reassign_to_secondary_lchan(valueof(t_RslChanNr_Osmo_VAMOS_Lm(5, 1))); + COORD.send(DONE4); + f_perform_clear(RSL); } /* Establish a primary lchan and modify it to VAMOS speech mode. Then establish @@ -725,17 +761,22 @@ pars4.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); vc_conn1 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h1), pars1); - vc_conn1.done; - vc_conn2 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h2), pars2); - vc_conn2.done; /* Also fill up the second subslot of the TCH/H timeslot */ - vc_conn3 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h1), pars3); - vc_conn3.done; - + vc_conn3 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h3), pars3); vc_conn4 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h4), pars4); + + /* see diagram above (search for "---DONE") */ + connect(vc_conn1:COORD, vc_conn2:COORD); + connect(vc_conn2:COORD2, vc_conn3:COORD); + connect(vc_conn3:COORD2, vc_conn4:COORD); + + vc_conn1.done; + vc_conn2.done; + vc_conn3.done; vc_conn4.done; + f_shutdown_helper(); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 4aeb539..109194b 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -447,6 +447,7 @@ port RAN_PROC_PT RAN; port TELNETasp_PT BSCVTY; port Coord_PT COORD; + port Coord_PT COORD2; /* Proxy MGCP-over-IPA and MGCP-over-UDP */ port IPA_MGCP_PT MGCP_MSC_CLIENT; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 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: I3b1dfc3b11e990893cbf182fb9f8840e198eb8aa Gerrit-Change-Number: 27086 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc vamos: ensure lchan state in some places

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 ) Change subject: bsc vamos: ensure lchan state in some places ...................................................................... bsc vamos: ensure lchan state in some places Change-Id: I5979516cf2b2e1adf5269acd0b8e7adb5e6a1ac5 --- M bsc/BSC_Tests_VAMOS.ttcn 1 file changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/27087/1 diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index 6266634..ec74be2 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -83,7 +83,7 @@ const integer NUM_BTS := 3; const integer NUM_MSC := 3; -private function f_rsl_chan_nr_to_subslot(RslChannelNr chan_nr) +private function f_rsl_chan_nr_to_subslot(RslChannelNr chan_nr, boolean use_vamos_subslot_nr := false) return integer { var integer subslot; @@ -97,12 +97,19 @@ subslot := chan_nr.u.lm.sub_chan; } case (t_RslChanNr_Osmo_VAMOS_Bm(?)) { - /* TCH/F, always subslot 0 */ - subslot := 0; + /* TCH/F shadow */ + if (use_vamos_subslot_nr) { + subslot := 1; + } else { + subslot := 0; + } } case (t_RslChanNr_Osmo_VAMOS_Lm(?, ?)) { - /* TCH/H */ + /* TCH/H shadow */ subslot := chan_nr.u.lm.sub_chan; + if (use_vamos_subslot_nr) { + subslot := subslot + 2; + } } case else { setverdict(fail, "unsupported RslChannelNr type in f_rsl_chan_nr_to_subslot()"); @@ -201,10 +208,10 @@ } } -private function f_lchan_str(integer bts_nr, integer trx_nr, RslChannelNr chan_nr) +private function f_lchan_str(integer bts_nr, integer trx_nr, RslChannelNr chan_nr, boolean use_vamos_subslot_nr := false) return charstring { - var integer subslot := f_rsl_chan_nr_to_subslot(chan_nr); + var integer subslot := f_rsl_chan_nr_to_subslot(chan_nr, use_vamos_subslot_nr := use_vamos_subslot_nr); return "lchan " & int2str(bts_nr) & " " & int2str(trx_nr) & " " & int2str(chan_nr.tn) & " " & int2str(subslot); } @@ -217,7 +224,7 @@ private function f_lchan_ensure_established(TELNETasp_PT vty, integer bts_nr, integer trx_nr, RslChannelNr chan_nr) { - var charstring lchan_str := f_lchan_str(bts_nr, trx_nr, chan_nr); + var charstring lchan_str := f_lchan_str(bts_nr, trx_nr, chan_nr, use_vamos_subslot_nr := true); var charstring lchan_info := f_vty_transceive_ret(vty, "show " & lchan_str); if (f_strstr(lchan_info, "State: ESTABLISHED") < 0) { log("'show lchan' replied: ", lchan_info); @@ -465,7 +472,7 @@ setverdict(pass); f_sleep(1.0); - f_vty_transceive(BSCVTY, "show lchan summary"); + f_lchan_ensure_established(BSCVTY, 0, 0, g_chan_nr); f_verify_dtap(); } @@ -575,8 +582,7 @@ setverdict(pass); f_sleep(1.0); - f_vty_transceive(BSCVTY, "show lchan summary"); - + f_lchan_ensure_established(BSCVTY, 0, 0, g_chan_nr); f_verify_dtap(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 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: I5979516cf2b2e1adf5269acd0b8e7adb5e6a1ac5 Gerrit-Change-Number: 27087 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in libosmo-sccp[master]: fixup for 'Introduce SS7 IPv6 support'

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19855 ) Change subject: fixup for 'Introduce SS7 IPv6 support' ...................................................................... Abandoned now there is osmo_ss7_asp_set_default_peer_hosts() -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia41c66665614436ded879c935755993bfeb259a0 Gerrit-Change-Number: 19855 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

3 years, 4 months

1
0
0 0

Change in osmo-gsm-tester[master]: wait_no_raise(): set default args

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21508 ) Change subject: wait_no_raise(): set default args ...................................................................... Abandoned timeout -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I225a175b25c5c148ef5e23d2184f5d1aa2f4188a Gerrit-Change-Number: 21508 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: msc: introduce f_logp()

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 ) Change subject: msc: introduce f_logp() ...................................................................... Abandoned timeout -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 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: Iddcda7f0f9940cc21f89d52962707667fe844010 Gerrit-Change-Number: 16562 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: abandon

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: fix entries in TODO-RELEASE, s/>1.5.1/>=1.6

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26260 ) Change subject: fix entries in TODO-RELEASE, s/>1.5.1/>=1.6 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id3c51c144cf31a002eb0ef9ba9326d1ab45fbd60 Gerrit-Change-Number: 26260 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

3 years, 4 months

1
0
0 0

Change in libosmocore[master]: follow-up to osmo_sockaddr_from/to_octets()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27085 ) Change subject: follow-up to osmo_sockaddr_from/to_octets() ...................................................................... follow-up to osmo_sockaddr_from/to_octets() Forgot to apply one code review change before merge. Related: OS#5599 Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 --- M src/socket.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/src/socket.c b/src/socket.c index 6e5bb46..80cba17 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1744,7 +1744,7 @@ { const void *addr; size_t len; - switch (os->u.sin.sin_family) { + switch (os->u.sa.sa_family) { case AF_INET: addr = &os->u.sin.sin_addr; len = sizeof(os->u.sin.sin_addr); @@ -1776,7 +1776,7 @@ *os = (struct osmo_sockaddr){0}; switch (src_len) { case sizeof(os->u.sin.sin_addr): - os->u.sin.sin_family = AF_INET; + os->u.sa.sa_family = AF_INET; addr = &os->u.sin.sin_addr; len = sizeof(os->u.sin.sin_addr); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 Gerrit-Change-Number: 27085 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in libosmocore[master]: follow-up to osmo_sockaddr_from/to_octets()

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27085 ) Change subject: follow-up to osmo_sockaddr_from/to_octets() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 Gerrit-Change-Number: 27085 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 21:23:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in libgtpnl[master]: fix some cases of rc == 0 on error

by neels

Attention is currently required from: Pablo Neira Ayuso, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/26990 ) Change subject: fix some cases of rc == 0 on error ...................................................................... Patch Set 1: (3 comments) Patchset: PS1: > it might be worth looking at how other code using libmnl is doing this. […] it is clear that checking errno works well. just seems weird to me to return zero on some errors while others return nonzero. PS1: I'm not sure that it is the right thing to submit this patch. I think it makes better code, but maybe not worthwhile to change a running system. I submitted this patch mainly to let review decide whether it is any good. File src/gtp-genl.c: https://gerrit.osmocom.org/c/libgtpnl/+/26990/comment/e3535927_d8978396 PS1, Line 82: return -2; > or perhaps: […] just above this bit of code, the code returns -1. I thought, return -1 as well vs return a different constant. So, arbitrarily, I picked the different constant, next after -1 is -2. I'd also just return rc, but that seems not to be intended? -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/26990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I22fd69709e023572c6c616a4184340a554456faf Gerrit-Change-Number: 26990 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso <pablo(a)gnumonks.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Pablo Neira Ayuso <pablo(a)gnumonks.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 21:23:25 +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

3 years, 4 months

1
0
0 0

Change in libosmocore[master]: follow-up to osmo_sockaddr_from/to_octets()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27085 ) Change subject: follow-up to osmo_sockaddr_from/to_octets() ...................................................................... follow-up to osmo_sockaddr_from/to_octets() Forgot to apply one code review change before merge. Related: OS#5599 Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 --- M src/socket.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/27085/1 diff --git a/src/socket.c b/src/socket.c index 6e5bb46..80cba17 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1744,7 +1744,7 @@ { const void *addr; size_t len; - switch (os->u.sin.sin_family) { + switch (os->u.sa.sa_family) { case AF_INET: addr = &os->u.sin.sin_addr; len = sizeof(os->u.sin.sin_addr); @@ -1776,7 +1776,7 @@ *os = (struct osmo_sockaddr){0}; switch (src_len) { case sizeof(os->u.sin.sin_addr): - os->u.sin.sin_family = AF_INET; + os->u.sa.sa_family = AF_INET; addr = &os->u.sin.sin_addr; len = sizeof(os->u.sin.sin_addr); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 Gerrit-Change-Number: 27085 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022