- gerrit-log - lists.osmocom.org

Change in osmo-bts[master]: osmux: Log sendto() error
by pespin 20 Sep '22

20 Sep '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/29424 ) Change subject: osmux: Log sendto() error ...................................................................... osmux: Log sendto() error Change-Id: I195ebe0fdb05195a7f3b1390630e83084b5dea3a --- M src/common/osmux.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/29424/1 diff --git a/src/common/osmux.c b/src/common/osmux.c index d1d8355..e443d1d 100644 --- a/src/common/osmux.c +++ b/src/common/osmux.c @@ -78,6 +78,7 @@ struct osmux_handle *handle = data; struct gsm_bts *bts = handle->bts; socklen_t dest_len; + ssize_t rc; switch (handle->rem_addr.u.sa.sa_family) { case AF_INET6: @@ -88,8 +89,14 @@ dest_len = sizeof(handle->rem_addr.u.sin); break; } - sendto(bts->osmux.fd.fd, batch_msg->data, batch_msg->len, 0, + rc = sendto(bts->osmux.fd.fd, batch_msg->data, batch_msg->len, 0, (struct sockaddr *)&handle->rem_addr.u.sa, dest_len); + if (rc < 0) { + char errbuf[129]; + strerror_r(errno, errbuf, sizeof(errbuf)); + LOGP(DOSMUX, LOGL_ERROR, "osmux sendto(%s) failed: %s\n", + osmo_sockaddr_to_str(&handle->rem_addr), errbuf); + } msgb_free(batch_msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I195ebe0fdb05195a7f3b1390630e83084b5dea3a Gerrit-Change-Number: 29424 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: add X27 timeout: release lchan that lacks L1 Info
by fixeria 20 Sep '22

20 Sep '22

Attention is currently required from: neels, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29422 ) Change subject: add X27 timeout: release lchan that lacks L1 Info ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Is this behavior defined somewhere in 3GPP specs? Normally the BTS (not BSC) is responsible for declaring a radio link failure event by sending CONN FAIL IND over the A-bis/RSL. Doesn't Ericsson RBS 6xxx send us such a message? The radio lonk failure is declared "based upon either the error rate on the uplink SACCH(s) or on RXLEV/RXQUAL measurements of the MS" (see 3GPP TS 45.008 sections 5.3). The Connection Failure Criterion is configured via the A-bis/OML. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6fb29315568554c8490ee999fcfd1b77d8245389 Gerrit-Change-Number: 29422 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 20 Sep 2022 15:18:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-tetra[master]: added support for fill bits and basic link defragmentation (also than...
by wbokslag 20 Sep '22

20 Sep '22

Attention is currently required from: laforge. wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/29387 ) Change subject: added support for fill bits and basic link defragmentation (also thanks to SQ5BPF) ...................................................................... Patch Set 3: (3 comments) File src/tetra_upper_mac.h: https://gerrit.osmocom.org/c/osmo-tetra/+/29387/comment/fa659b74_5992edd1 PS3, Line 13: in > sounds like 'active' could be of type bool? […] You're right, it's kind of underdocumented. I'll make sure to annotate the fields. Booleans are used nowhere in the osmo-tetra project, so I sticked with what seems to be convention. tetra_mac_state for instance uses a signed int for the is_traffic field. If you want, I can start using the bool type or make the active field and similar fields a uint8_t. File src/tetra_upper_mac.c: https://gerrit.osmocom.org/c/osmo-tetra/+/29387/comment/6894bd91_c3ed915d PS3, Line 44: s > this introduces a global, static variable. […] The lower mac allocates a global context structure tetra_cell_data with global pointer tcd. I'd figure that it doesn't belong in that context. We could, however, add an upper mac context (upper_mac_context umc?), which, for now, would only hold the fragslots. Would that be preferable? Note that passing the context by parameter will not work without changing a lot of unrelated prototypes, as that would imply the lower mac (and burst detector, etcetera) also need to have it. It would not be a bad idea to create a context in tetra-rx that contains the respective states for the burst detector, lower mac, upper mac and possibly layers above, but that would be a significant rework. https://gerrit.osmocom.org/c/osmo-tetra/+/29387/comment/32214bbc_8fb3be83 PS3, Line 50: fragslots[i].msgb = msgb_alloc(FRAGSLOT_MSGB_SIZE, "fragslot"); > is there a specific reason to pre-allocate lots of message buffers here? You're right, I could allocate them on demand, whenever a fragmented resource is encountered on a slot. I'll do that in the next patch set -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/29387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I41c9438b0b12c2fac9dff1b226eec5b33f30fbb4 Gerrit-Change-Number: 29387 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 20 Sep 2022 14:01:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

Change in osmo-tetra[master]: Support parsing of multiple mac resources in the same timeslot
by wbokslag 20 Sep '22

20 Sep '22

Attention is currently required from: laforge. wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/29388 ) Change subject: Support parsing of multiple mac resources in the same timeslot ...................................................................... Patch Set 5: (1 comment) File src/lower_mac/tetra_lower_mac.c: https://gerrit.osmocom.org/c/osmo-tetra/+/29388/comment/e4fd1517_f440d0de PS4, Line 311: int parsed = 0; > again the question why those are signed, i.e. […] In some cases (for instance, when a frame cannot be parsed propery), we cannot determine the size of the MAC PDU. In that case, a -1 will be returned. There are also some cases I haven't explored yet, such as whether an additional PDU can exist after a broadcast. A return value of -1 will lead to the lower mac to not pass any further PDUs to the upper mac for that timeslot. Offset should be unsigned. Also, it would be more elegant to break inside the loop when a -1 is returned, instead of altering the msg pointers with the negative value. I've pushed a revision with these improvements. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/29388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ic2956a5f10cffe296b76a290a0d16f45461eb2e7 Gerrit-Change-Number: 29388 Gerrit-PatchSet: 5 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 20 Sep 2022 13:43:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

Change in osmo-tetra[master]: Support parsing of multiple mac resources in the same timeslot
by wbokslag 20 Sep '22

20 Sep '22

Attention is currently required from: wbokslag. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/29388 to look at the new patch set (#5). Change subject: Support parsing of multiple mac resources in the same timeslot ...................................................................... Support parsing of multiple mac resources in the same timeslot Change-Id: Ic2956a5f10cffe296b76a290a0d16f45461eb2e7 --- M src/lower_mac/tetra_lower_mac.c M src/tetra_gsmtap.c M src/tetra_upper_mac.c 3 files changed, 29 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/88/29388/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/29388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ic2956a5f10cffe296b76a290a0d16f45461eb2e7 Gerrit-Change-Number: 29388 Gerrit-PatchSet: 5 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: add upf/ to test osmo-upf
by neels 20 Sep '22

20 Sep '22

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29420 ) Change subject: add upf/ to test osmo-upf ...................................................................... Patch Set 3: (3 comments) File upf/UPF_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29420/comment/e63a1e07_e6f3… PS1, Line 177: private function f_parse_gtp_action(out GTP_Action ret, charstring str) return boolean { > CTRL interface? stats? stats is not a good fit. ctrl is possible but that would need implementing File upf/expected-results.xml: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29420/comment/dab46f3e_ca16… PS1, Line 2: <testsuite name='HNB_Tests' tests='0' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> > This is still unresolved. what, i'm certain i edited it... File upf/expected-results.xml: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29420/comment/a999f114_ec4d… PS3, Line 2: UPF here it is -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29420 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: If67819dea785597841f21d8c444cb4866cfde571 Gerrit-Change-Number: 29420 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Sep 2022 13:02:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: add X27 timeout: release lchan that lacks L1 Info
by neels 20 Sep '22

20 Sep '22

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/29422 to look at the new patch set (#2). Change subject: add X27 timeout: release lchan that lacks L1 Info ...................................................................... add X27 timeout: release lchan that lacks L1 Info To lchan_fsm ESTABLISHED, add a timeout: if MEAS REP lack L1 Info for a time defined by timer net X27, release the lchan. Related: OS#5530 Related: If7c76445373d5d0e915a3e8910d3eb991216f768 (osmo-ttcn3-hacks) Change-Id: I6fb29315568554c8490ee999fcfd1b77d8245389 --- M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/net_init.c M tests/timer.vty 5 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/29422/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6fb29315568554c8490ee999fcfd1b77d8245389 Gerrit-Change-Number: 29422 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_chan_timeout_* tests
by neels 20 Sep '22

20 Sep '22

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29423 ) Change subject: bsc: add TC_chan_timeout_* tests ...................................................................... bsc: add TC_chan_timeout_* tests Test new X27 timer: release lchan when MEAS RES omit L1 Info. Depends: I6fb29315568554c8490ee999fcfd1b77d8245389 (osmo-bsc) Change-Id: If7c76445373d5d0e915a3e8910d3eb991216f768 --- M bsc/BSC_Tests.ttcn 1 file changed, 170 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/29423/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a150310..065640a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -11814,6 +11814,172 @@ f_shutdown_helper(); } +private function f_vty_set_meas_res_l1_timeout(TELNETasp_PT pt, charstring val) { + f_vty_enter_cfg_network(pt); + f_vty_transceive(pt, "timer X27 " & val); + f_vty_transceive(pt, "end"); +} + +private function f_TC_chan_timeout_no_meas_res(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + g_pars.ra := '02'O; /* RA containing reason=LU */ + + var MobileIdentityLV mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); + var PDU_ML3_MS_NW l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); + var octetstring l3_enc := enc_PDU_ML3_MS_NW(l3_info); + var template uint3_t tsc := ?; + + f_MscConnHdlr_init(g_pars.media_nr, host_bts, host_mgw_mgcp, FR_AMR); + f_create_bssmap_exp(l3_enc); + /* call helper function for CHAN_RQD -> IMM ASS ->EST_IND */ + RSL_Emulation.f_chan_est(g_pars.ra, l3_enc, g_pars.link_id, g_pars.fn, tsc); + + /* we should now have a COMPL_L3 at the MSC */ + timer T := 10.0; + T.start; + alt { + [] BSSAP.receive(tr_BSSMAP_ComplL3); + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); + } + } + + /* The channel is open, but we are not sending any MEAS RES messages. The channel should release after due + * timeout. */ + f_expect_lchan_rel(RSL, RSL_PROC); + + BSSAP.receive(tr_BSSMAP_ClearRequest); + f_perform_clear_no_lchan(); + + f_sleep(5.0); +} +testcase TC_chan_timeout_no_meas_res() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true, guard_timeout := 30.0); + f_sleep(1.0); + f_vty_set_meas_res_l1_timeout(BSCVTY, "3"); + vc_conn := f_start_handler(refers(f_TC_chan_timeout_no_meas_res)); + vc_conn.done; + f_vty_set_meas_res_l1_timeout(BSCVTY, "default"); + f_shutdown_helper(); +} + +private function f_TC_chan_timeout_meas_res_no_l1_info(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + g_pars.ra := '02'O; /* RA containing reason=LU */ + + var MobileIdentityLV mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); + var PDU_ML3_MS_NW l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); + var octetstring l3_enc := enc_PDU_ML3_MS_NW(l3_info); + var template uint3_t tsc := ?; + + f_MscConnHdlr_init(g_pars.media_nr, host_bts, host_mgw_mgcp, FR_AMR); + f_create_bssmap_exp(l3_enc); + /* call helper function for CHAN_RQD -> IMM ASS ->EST_IND */ + RSL_Emulation.f_chan_est(g_pars.ra, l3_enc, g_pars.link_id, g_pars.fn, tsc); + + /* we should now have a COMPL_L3 at the MSC */ + timer T := 10.0; + T.start; + alt { + [] BSSAP.receive(tr_BSSMAP_ComplL3); + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); + } + } + + /* The channel is open, we are sending MEAS RES messages, but they do not contain L1 Info. The channel should + * release after due timeout. */ + timer T_meas := 1.0; + T_meas.start; + alt { + [] T_meas.timeout { + RSL.send(ts_RSL_MEAS_RES_EMPTY(g_chan_nr, 0, + ts_RSL_IE_UplinkMeas(30, 0), + ts_RSL_IE_BS_Power(0))); + T_meas.start; + repeat; + } + [] BSSAP.receive(tr_BSSMAP_ClearRequest); + } + + f_expect_lchan_rel(RSL, RSL_PROC); + f_perform_clear_no_lchan(); +} +testcase TC_chan_timeout_meas_res_no_l1_info() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true, guard_timeout := 30.0); + f_sleep(1.0); + f_vty_set_meas_res_l1_timeout(BSCVTY, "3"); + vc_conn := f_start_handler(refers(f_TC_chan_timeout_meas_res_no_l1_info)); + vc_conn.done; + f_vty_set_meas_res_l1_timeout(BSCVTY, "default"); + f_shutdown_helper(); +} + +private function f_TC_chan_timeout_meas_res_with_l1_info(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + g_pars.ra := '02'O; /* RA containing reason=LU */ + + var MobileIdentityLV mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); + var PDU_ML3_MS_NW l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); + var octetstring l3_enc := enc_PDU_ML3_MS_NW(l3_info); + var template uint3_t tsc := ?; + + f_MscConnHdlr_init(g_pars.media_nr, host_bts, host_mgw_mgcp, FR_AMR); + f_create_bssmap_exp(l3_enc); + /* call helper function for CHAN_RQD -> IMM ASS ->EST_IND */ + RSL_Emulation.f_chan_est(g_pars.ra, l3_enc, g_pars.link_id, g_pars.fn, tsc); + + /* we should now have a COMPL_L3 at the MSC */ + timer T := 10.0; + T.start; + alt { + [] BSSAP.receive(tr_BSSMAP_ComplL3); + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); + } + } + + /* The channel is open, we are sending MEAS RES messages WITH L1 Info. The channel should remain active. */ + timer T_meas := 1.0; + T_meas.start; + var integer meas_count := 10; + alt { + [] T_meas.timeout { + /* Send a couple MEAS RES until we're sure the channel was kept open beyond the X27 timeout */ + meas_count := meas_count - 1; + if (meas_count < 1) { + /* Done. */ + break; + } + + f_logp(BSCVTY, "Sending MEAS RES nr " & int2str(meas_count)); + var octetstring l3_mr := enc_GsmRrL3Message(valueof(ts_MEAS_REP(true, 8, 8))); + RSL.send(ts_RSL_MEAS_RES(g_chan_nr, 0, ts_RSL_IE_UplinkMeas, ts_RSL_IE_BS_Power(0), ts_RSL_IE_L1Info, + l3_mr, 0)); + T_meas.start; + repeat; + } + [] BSSAP.receive(tr_BSSMAP_ClearRequest) { + setverdict(fail, "expected channel to remain open, but received Clear Request"); + } + } + + setverdict(pass); + f_perform_clear(); +} +testcase TC_chan_timeout_meas_res_with_l1_info() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true, guard_timeout := 30.0); + f_sleep(1.0); + f_vty_set_meas_res_l1_timeout(BSCVTY, "3"); + vc_conn := f_start_handler(refers(f_TC_chan_timeout_meas_res_with_l1_info)); + vc_conn.done; + f_vty_set_meas_res_l1_timeout(BSCVTY, "default"); + f_shutdown_helper(); +} + control { /* CTRL interface testing */ execute( TC_ctrl_msc_connection_status() ); @@ -12148,6 +12314,10 @@ execute( TC_chan_alloc_algo_descending() ); execute( TC_chan_alloc_algo_ass_dynamic() ); + execute( TC_chan_timeout_no_meas_res() ); + execute( TC_chan_timeout_meas_res_no_l1_info() ); + execute( TC_chan_timeout_meas_res_with_l1_info() ); + /* Run TC_ho_out_of_this_bsc last, because it may trigger a segfault before osmo-bsc's patch * with change-id I5a3345ab0005a73597f5c27207480912a2f5aae6 */ execute( TC_ho_out_of_this_bsc() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29423 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: If7c76445373d5d0e915a3e8910d3eb991216f768 Gerrit-Change-Number: 29423 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: add X27 timeout: release lchan that lacks L1 Info
by neels 20 Sep '22

20 Sep '22

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29422 ) Change subject: add X27 timeout: release lchan that lacks L1 Info ...................................................................... add X27 timeout: release lchan that lacks L1 Info To lchan_fsm ESTABLISHED, add a timeout: if MEAS REP lack L1 Info for a time defined by timer net X27, release the lchan. Related: OS#5530 Related: If7c76445373d5d0e915a3e8910d3eb991216f768 (osmo-ttcn3-hacks) Change-Id: I6fb29315568554c8490ee999fcfd1b77d8245389 --- M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/net_init.c 4 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/29422/1 diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index b9ffb22..276631b 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -54,6 +54,7 @@ LCHAN_EV_RSL_CHAN_MODE_MODIFY_ACK, LCHAN_EV_RSL_CHAN_MODE_MODIFY_NACK, LCHAN_EV_REQUEST_MODE_MODIFY, + LCHAN_EV_RX_MEAS_RES_L1_INFO, }; void lchan_fsm_init(); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 1c60405..8f94c05 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1450,6 +1450,11 @@ lchan_ms_pwr_ctrl(msg->lchan, mr); + if ((mr->flags & MEAS_REP_F_MS_L1)) { + /* Notify lchan_fsm that L1 is still alive */ + osmo_fsm_inst_dispatch(mr->lchan->fi, LCHAN_EV_RX_MEAS_RES_L1_INFO, mr); + } + send_lchan_signal(S_LCHAN_MEAS_REP, msg->lchan, mr); return 0; diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 21e145b..1c7e9c9 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -285,6 +285,7 @@ [LCHAN_ST_WAIT_TS_READY] = { .T=-5 }, [LCHAN_ST_WAIT_ACTIV_ACK] = { .T=-6 }, [LCHAN_ST_WAIT_RLL_RTP_ESTABLISH] = { .T=3101 }, + [LCHAN_ST_ESTABLISHED] = { .T = -27 }, [LCHAN_ST_WAIT_RLL_RTP_RELEASED] = { .T=3109 }, [LCHAN_ST_WAIT_BEFORE_RF_RELEASE] = { .T=3111 }, [LCHAN_ST_WAIT_RF_RELEASE_ACK] = { .T=3111 }, @@ -1666,6 +1667,7 @@ | S(LCHAN_EV_REQUEST_MODE_MODIFY) , .out_state_mask = 0 + | S(LCHAN_ST_ESTABLISHED) | S(LCHAN_ST_UNUSED) | S(LCHAN_ST_WAIT_RLL_RTP_RELEASED) | S(LCHAN_ST_WAIT_BEFORE_RF_RELEASE) @@ -1764,6 +1766,7 @@ OSMO_VALUE_STRING(LCHAN_EV_RSL_CHAN_MODE_MODIFY_ACK), OSMO_VALUE_STRING(LCHAN_EV_RSL_CHAN_MODE_MODIFY_NACK), OSMO_VALUE_STRING(LCHAN_EV_REQUEST_MODE_MODIFY), + OSMO_VALUE_STRING(LCHAN_EV_RX_MEAS_RES_L1_INFO), {} }; @@ -1789,6 +1792,13 @@ * radio link layer failed */ return; + case LCHAN_EV_RX_MEAS_RES_L1_INFO: + if (fi->state != LCHAN_ST_ESTABLISHED) + return; + /* Re-enter ESTABLISHED state to refresh "L1 alive" timeout */ + lchan_fsm_state_chg(LCHAN_ST_ESTABLISHED); + return; + default: return; } @@ -1937,6 +1947,7 @@ .allstate_event_mask = 0 | S(LCHAN_EV_TS_ERROR) | S(LCHAN_EV_RLL_ERR_IND) + | S(LCHAN_EV_RX_MEAS_RES_L1_INFO) , .timer_cb = lchan_fsm_timer_cb, .cleanup = lchan_fsm_cleanup, diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c index 8a8c0a6..23a93cc 100644 --- a/src/osmo-bsc/net_init.c +++ b/src/osmo-bsc/net_init.c @@ -72,6 +72,7 @@ " after this amount of idle time, forget internally cumulated time remainders. Zero to always" " keep remainders. See also X16, X17." }, { .T=-25, .default_val=5, .desc="Timeout for initial user data after an MSC initiated an SCCP connection to the BSS" }, + { .T=-27, .default_val = 30, .desc = "Time after which to release an lchan when not receiving L1 Info in MEAS RES" }, { .T=-3111, .default_val=4, .desc="Wait time after lchan was released in error (should be T3111 + 2s)" }, { .T=-3210, .default_val=20, .desc="After L3 Complete, wait for MSC to confirm" }, {} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6fb29315568554c8490ee999fcfd1b77d8245389 Gerrit-Change-Number: 29422 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: Use gerrit as osmo-ttcn3-hacks.git git remote
by pespin 20 Sep '22

20 Sep '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29421 ) Change subject: Use gerrit as osmo-ttcn3-hacks.git git remote ...................................................................... Use gerrit as osmo-ttcn3-hacks.git git remote Other remotes are mirrors of gerrit one, which means there's some delay between pushing some ref to the gerrit remote and having them available in the mirrors. Hence, it becomes annoying while developing and new stuff to test is pushed. Let's simply use gerrit since it's the master remote. Change-Id: Ic87c196f8b91a3a3e6ddde2cca36482ce7070df7 --- M debian-bullseye-titan/Dockerfile M ttcn3-bsc-test-vamos/Dockerfile M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-cbc-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-hnbgw-test/Dockerfile M ttcn3-hnodeb-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-ns-test/Dockerfile M ttcn3-pcap-client-test/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-pgw-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 25 files changed, 26 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index f636003..49650a0 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -57,9 +57,9 @@ git config --global user.name "Dock Er" # clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) -RUN git clone https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks && \ +RUN git clone https://gerrit.osmocom.org/osmo-ttcn3-hacks && \ make -j8 -C /osmo-ttcn3-hacks deps -ADD https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/raw/branch/master/deps/Mak… /tmp/deps-Makefile +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/refs/heads/ma… /tmp/deps-Makefile RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ cd /osmo-ttcn3-hacks && \ git pull && \ diff --git a/ttcn3-bsc-test-vamos/Dockerfile b/ttcn3-bsc-test-vamos/Dockerfile index a29e000..eac8f46 100644 --- a/ttcn3-bsc-test-vamos/Dockerfile +++ b/ttcn3-bsc-test-vamos/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc VOLUME /data diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index a29e000..eac8f46 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc VOLUME /data diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 15e7727..07377c8 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc-nat VOLUME /data diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index b115000..386ac3b 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bts VOLUME /data diff --git a/ttcn3-cbc-test/Dockerfile b/ttcn3-cbc-test/Dockerfile index 7c1e6c5..4048f20 100644 --- a/ttcn3-cbc-test/Dockerfile +++ b/ttcn3-cbc-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" cbc VOLUME /data diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 11589f6..f237e8b 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" fr fr-net VOLUME /data diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index a2216b2..c215d62 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" gbproxy VOLUME /data diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 252e893..36778c9 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ggsn_tests VOLUME /data diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index ac5ca4f..e8b80a8 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hlr VOLUME /data diff --git a/ttcn3-hnbgw-test/Dockerfile b/ttcn3-hnbgw-test/Dockerfile index 4dd0d1b..c37e1bf 100644 --- a/ttcn3-hnbgw-test/Dockerfile +++ b/ttcn3-hnbgw-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hnbgw VOLUME /data diff --git a/ttcn3-hnodeb-test/Dockerfile b/ttcn3-hnodeb-test/Dockerfile index 2071cab..6783abd 100644 --- a/ttcn3-hnodeb-test/Dockerfile +++ b/ttcn3-hnodeb-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hnodeb VOLUME /data diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index c8eeb2b..bfc0b9e 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" mgw VOLUME /data diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 8c67bbf..9bcd891 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc VOLUME /data diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 3155271..12ebee4 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sysinfo VOLUME /data diff --git a/ttcn3-ns-test/Dockerfile b/ttcn3-ns-test/Dockerfile index b94de1b..d39f493 100644 --- a/ttcn3-ns-test/Dockerfile +++ b/ttcn3-ns-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ns VOLUME /data diff --git a/ttcn3-pcap-client-test/Dockerfile b/ttcn3-pcap-client-test/Dockerfile index 9e66326..10c829b 100644 --- a/ttcn3-pcap-client-test/Dockerfile +++ b/ttcn3-pcap-client-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcap-client VOLUME /data diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index b7cb21a..e97ac40 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcu VOLUME /data diff --git a/ttcn3-pgw-test/Dockerfile b/ttcn3-pgw-test/Dockerfile index 23ef387..5233c5e 100644 --- a/ttcn3-pgw-test/Dockerfile +++ b/ttcn3-pgw-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pgw VOLUME /data diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index e94c55c..b902e2d 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" remsim VOLUME /data diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index f43a5dd..68fd2c0 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sccp VOLUME /data diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index b581b43..da67044 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sgsn VOLUME /data diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 7dd4756..53d70db 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sip VOLUME /data diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 0d5b0da..f5dd890 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" smlc VOLUME /data diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 7808704..256132d 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" stp VOLUME /data -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic87c196f8b91a3a3e6ddde2cca36482ce7070df7 Gerrit-Change-Number: 29421 Gerrit-PatchSet: 1 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> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log