- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: bsc: BSC_Tests.cfg: remove commented out testcases

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36877?usp=email ) Change subject: bsc: BSC_Tests.cfg: remove commented out testcases ...................................................................... bsc: BSC_Tests.cfg: remove commented out testcases Change-Id: Ibccc0d2072dc496f7f7017772eca8bed274ff1a5 --- M bsc/BSC_Tests.cfg 1 file changed, 9 insertions(+), 59 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/36877/1 diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg index 5ac91b6..34b6033 100644 --- a/bsc/BSC_Tests.cfg +++ b/bsc/BSC_Tests.cfg @@ -19,62 +19,3 @@ BSC_Tests_LCLS.control BSC_Tests_CBSP.control #BSC_Tests_OML.control -#BSC_Tests.TC_chan_act_noreply -#BSC_Tests.TC_chan_act_ack_noest -#BSC_Tests.TC_chan_act_ack_est_ind_noreply -#BSC_Tests.TC_chan_act_ack_est_ind_refused -#BSC_Tests.TC_chan_act_nack -#BSC_Tests.TC_chan_exhaustion -#BSC_Tests.TC_ctrl -#BSC_Tests.TC_chan_rel_rll_rel_ind -#BSC_Tests.TC_chan_rel_conn_fail -#BSC_Tests.TC_chan_rel_hard_clear -#BSC_Tests.TC_chan_rel_hard_rlsd -#BSC_Tests.TC_chan_rel_a_reset - -#BSC_Tests.TC_rll_est_ind_inact_lchan -#BSC_Tests.TC_rll_est_ind_inval_sapi1 -#BSC_Tests.TC_rll_est_ind_inval_sapi3 -#BSC_Tests.TC_rll_est_ind_inval_sacch - -#BSC_Tests.TC_outbound_connect -#BSC_Tests.TC_assignment_cic_only -#BSC_Tests.TC_assignment_csd -#BSC_Tests.TC_assignment_ctm -#BSC_Tests.TC_assignment_sign -#BSC_Tests.TC_assignment_fr_a5_0 -#BSC_Tests.TC_assignment_fr_a5_1_codec_missing -#BSC_Tests.TC_assignment_fr_a5_1 -#BSC_Tests.TC_assignment_fr_a5_3 -#BSC_Tests.TC_assignment_fr_a5_4 - -#BSC_Tests.TC_paging_imsi_nochan -#BSC_Tests.TC_paging_tmsi_nochan -#BSC_Tests.TC_paging_tmsi_any -#BSC_Tests.TC_paging_tmsi_sdcch -#BSC_Tests.TC_paging_tmsi_tch_f -#BSC_Tests.TC_paging_tmsi_tch_hf -#BSC_Tests.TC_paging_imsi_nochan_cgi -#BSC_Tests.TC_paging_imsi_nochan_lac_ci -#BSC_Tests.TC_paging_imsi_nochan_ci -#BSC_Tests.TC_paging_imsi_nochan_lai -#BSC_Tests.TC_paging_imsi_nochan_lac -#BSC_Tests.TC_paging_imsi_nochan_all -#BSC_Tests.TC_paging_imsi_nochan_plmn_lac_rnc -#BSC_Tests.TC_paging_imsi_nochan_rnc -#BSC_Tests.TC_paging_imsi_nochan_lac_rnc -#BSC_Tests.TC_paging_imsi_nochan_lacs -#BSC_Tests.TC_paging_imsi_nochan_lacs_empty -#BSC_Tests.TC_paging_imsi_a_reset -#BSC_Tests.TC_paging_imsi_load -#BSC_Tests.TC_paging_counter -#BSC_Tests.TC_paging_imsi_nochan_cgi_unknown_cid -#BSC_Tests.TC_rsl_drop_counter -#BSC_Tests.TC_classmark -#BSC_Tests.TC_unsol_ass_fail -#BSC_Tests.TC_unsol_ass_compl -#BSC_Tests.TC_unsol_ho_fail -#BSC_Tests.TC_err_82_short_msg -#BSC_Tests.TC_err_84_unknown_msg -#BSC_Tests.TC_ho_int -#BSC_Tests.TC_chopped_ipa_ping -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36877?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibccc0d2072dc496f7f7017772eca8bed274ff1a5 Gerrit-Change-Number: 36877 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

5 hours, 9 minutes

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: execute ASCI tests, add them to expected-results.xml

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36878?usp=email ) Change subject: bsc: execute ASCI tests, add them to expected-results.xml ...................................................................... bsc: execute ASCI tests, add them to expected-results.xml Change-Id: I78a3078df06d7aa77dda983a42ca342ef939c1b6 --- M bsc/BSC_Tests.cfg M bsc/expected-results.xml 2 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/36878/1 diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg index 34b6033..d8ed74a 100644 --- a/bsc/BSC_Tests.cfg +++ b/bsc/BSC_Tests.cfg @@ -18,4 +18,5 @@ BSC_Tests.control BSC_Tests_LCLS.control BSC_Tests_CBSP.control +BSC_Tests_ASCI.control #BSC_Tests_OML.control diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 2d69eee..f042a8c 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -317,4 +317,17 @@ <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_emerg_write_bts_cgi_noreplace' time='MASKED'/> <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_emerg_write_bts_cgi_replace' time='MASKED'/> <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_emerg_write_bts_cgi_kill' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_setup_only' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_assignment' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_assignment_fail' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_talker_req' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_talker_fail' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_talker_fail_late_msc' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_talker_est' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_talker_est_late_msc' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_talker_rel' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_talker_rel_late_msc' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_uplink_reject' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_uplink_seized' time='MASKED'/> + <testcase classname='BSC_Tests_ASCI' name='TC_vgcs_vbs_uplink_release' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36878?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I78a3078df06d7aa77dda983a42ca342ef939c1b6 Gerrit-Change-Number: 36878 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

5 hours, 9 minutes

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email ) Change subject: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI ...................................................................... ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI We do have 13 ASCI (VBS/VGCS) testcases in osmo-ttcn3-hacks.git, but we never executed them on Jenkins so far. Fix this. Change-Id: I03f1ac2ed9ca59b90fead73fee3cf333b6146344 --- M ttcn3-bsc-test/BSC_Tests.cfg 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/76/36876/1 diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 80e06ee..2eefc85 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -73,3 +73,4 @@ BSC_Tests.control BSC_Tests_LCLS.control BSC_Tests_CBSP.control +BSC_Tests_ASCI.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I03f1ac2ed9ca59b90fead73fee3cf333b6146344 Gerrit-Change-Number: 36876 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

5 hours, 29 minutes

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36873?usp=email ) Change subject: bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail ...................................................................... bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail Change-Id: I02aa92f2ddb99b86f5c692319c57dd926c295da1 Related: OS#6167 --- M bts/expected-results.xml 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/36873/1 diff --git a/bts/expected-results.xml b/bts/expected-results.xml index a856fca..9157f37 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -182,7 +182,12 @@ <testcase classname='BTS_Tests' name='TC_speech_rtp_tchh' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_speech_osmux_tchf' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_speech_osmux_tchh' time='MASKED'/> - <testcase classname='BTS_Tests' name='TC_data_rtp_tchf144' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_rtp_tchf144' time='MASKED'> + <failure type='fail-verdict'>Rx unexpected RSL port message: MASKED + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_data_rtp_tchf144 testcase + </failure> + </testcase> <testcase classname='BTS_Tests' name='TC_data_rtp_tchf96' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_data_rtp_tchf48' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_data_rtp_tchh48' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36873?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I02aa92f2ddb99b86f5c692319c57dd926c295da1 Gerrit-Change-Number: 36873 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

5 hours, 46 minutes

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: expect all LAPDm testcases to pass

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36874?usp=email ) Change subject: bts: expected-results.xml: expect all LAPDm testcases to pass ...................................................................... bts: expected-results.xml: expect all LAPDm testcases to pass Change-Id: I2e9dcf6d06cd5aa51294769ac492a968c4f86e7d Related: OS#5971 -- TC_sabm_ua_dcch_sapi0_nopayload Related: OS#5970 -- TC_sabm_retransmit_bts Related: OS#5969 -- TC_ns_seq_error Related: OS#5968 -- TC_nr_seq_error --- M bts/expected-results.xml 1 file changed, 17 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/36874/1 diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 9157f37..0d6dab2 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -225,39 +225,19 @@ <testcase classname='BTS_Tests_SMSCB' name='TC_etws_p1ro_end' time='MASKED'/> <testcase classname='BTS_Tests_SMSCB' name='TC_etws_pcu' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_ua_dcch_sapi0' time='MASKED'/> - <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_ua_dcch_sapi0_nopayload' time='MASKED'> - <failure type='fail-verdict'>Initial SABM/UA must contain L3 payload but BTS accepts without - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_sabm_ua_dcch_sapi0_nopayload testcase - </failure> - </testcase> + <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_ua_dcch_sapi0_nopayload' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_ua_dcch_sapi3' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_ua_dcch_sapi4' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_contention' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_retransmit' time='MASKED'/> - <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_retransmit_bts' time='MASKED'> - <failure type='fail-verdict'>Incorrect number of SABM re-transmissions of observed: 7 - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_sabm_retransmit_bts testcase - </failure> - </testcase> + <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_retransmit_bts' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_invalid_resp' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_dm' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_establish_ign_first_sabm' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_iframe_seq_and_ack' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_iframe_timer_recovery' time='MASKED'/> - <testcase classname='BTS_Tests_LAPDm' name='TC_ns_seq_error' time='MASKED'> - <failure type='fail-verdict'>Missing second REJ - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_ns_seq_error testcase - </failure> - </testcase> - <testcase classname='BTS_Tests_LAPDm' name='TC_nr_seq_error' time='MASKED'> - <failure type='fail-verdict'>Missing DISC from BTS - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_nr_seq_error testcase - </failure> - </testcase> + <testcase classname='BTS_Tests_LAPDm' name='TC_ns_seq_error' time='MASKED'/> + <testcase classname='BTS_Tests_LAPDm' name='TC_nr_seq_error' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_rec_invalid_frame' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_segm_concat_dcch' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_segm_concat_sacch' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36874?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2e9dcf6d06cd5aa51294769ac492a968c4f86e7d Gerrit-Change-Number: 36874 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

5 hours, 46 minutes

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: add missing testcases

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36875?usp=email ) Change subject: bts: expected-results.xml: add missing testcases ...................................................................... bts: expected-results.xml: add missing testcases Change-Id: I10f6b3f2b201338b2839a6f16edd450e4968b0eb --- M bts/expected-results.xml 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/36875/1 diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 0d6dab2..c06f328 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='Titan' tests='220' failures='12' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='Titan' tests='242' failures='5' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='BTS_Tests' name='TC_est_dchan' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_chan_act_stress' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_chan_act_react' time='MASKED'/> @@ -102,6 +102,7 @@ <testcase classname='BTS_Tests' name='TC_pcu_data_req_agch' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_data_req_pch' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_data_req_imm_ass_pch' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_pcu_data_req_imm_ass_agch' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_rach_content' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_ext_rach_content' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_data_ind_lqual_cb' time='MASKED'/> @@ -261,4 +262,9 @@ <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_mode_modify_dyn_osmo_vff' time='MASKED'/> <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_mode_modify_dyn_osmo_vhh' time='MASKED'/> <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_mode_modify_dyn_osmo_hvhh' time='MASKED'/> + <testcase classname='BTS_Tests_ASCI' name='TC_vbs_notification' time='MASKED'/> + <testcase classname='BTS_Tests_ASCI' name='TC_vgcs_uplink_free_and_busy' time='MASKED'/> + <testcase classname='BTS_Tests_ASCI' name='TC_vgcs_talker_fail' time='MASKED'/> + <testcase classname='BTS_Tests_ASCI' name='TC_vgcs_talker_est_rel' time='MASKED'/> + <testcase classname='BTS_Tests_ASCI' name='TC_vgcs_listener_det' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36875?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I10f6b3f2b201338b2839a6f16edd450e4968b0eb Gerrit-Change-Number: 36875 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

5 hours, 46 minutes

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email ) Change subject: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI ...................................................................... ttcn3-bts-test: also execute tests from BTS_Tests_ASCI We do have 5 ASCI (VBS/VGCS) testcases in osmo-ttcn3-hacks.git, but we never executed them on Jenkins so far. Fix this. Change-Id: I1bcdccb6e2c48542d6447d7757fe1d56c1bf8406 Related: osmo-ttcn3-hacks.git I3727c471663b731117a264f60d2f1ba5fd16928e --- M ttcn3-bts-test/generic/BTS_Tests.cfg 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/72/36872/1 diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg index cd1e739..a87c99f 100644 --- a/ttcn3-bts-test/generic/BTS_Tests.cfg +++ b/ttcn3-bts-test/generic/BTS_Tests.cfg @@ -27,3 +27,4 @@ BTS_Tests_SMSCB.control BTS_Tests_LAPDm.control BTS_Tests_VAMOS.control +BTS_Tests_ASCI.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bcdccb6e2c48542d6447d7757fe1d56c1bf8406 Gerrit-Change-Number: 36872 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

5 hours, 53 minutes

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Delay test start until FullyBooted event is received in AMI

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email ) Change subject: asterisk: Delay test start until FullyBooted event is received in AMI ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc Gerrit-Change-Number: 36870 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 18 May 2024 06:12:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 8 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Asterisk_Tests.default: Improve mtc logging

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email ) Change subject: asterisk: Asterisk_Tests.default: Improve mtc logging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id7ad0230b50d301e60f636a3b983a315112e4042 Gerrit-Change-Number: 36869 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 18 May 2024 06:11:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 8 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Compute nonce from rand and autn params

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email ) Change subject: asterisk: Compute nonce from rand and autn params ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2809eec496a1c2c2b5f6e3d5d3bb1c33a788bd58 Gerrit-Change-Number: 36868 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 18 May 2024 06:10:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 8 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Delay test start until FullyBooted event is received in AMI

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email ) Change subject: asterisk: Delay test start until FullyBooted event is received in AMI ...................................................................... asterisk: Delay test start until FullyBooted event is received in AMI Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn 2 files changed, 45 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/36870/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index c05403e..714069f 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -173,6 +173,22 @@ tr_AMI_Field_ActionId(action_id) ); +/* + * EVENTS + */ +template (present) AMI_Msg +tr_AMI_Event(template (present) charstring ev_name := ?) := superset( + tr_AMI_Field_Event(ev_name) +); + +/* Event: FullyBooted + * Privilege: system,all + * Status: Fully Booted + * Uptime: 4 + * LastReload: 4 * + */ +template (present) AMI_Msg +tr_AMI_Event_FullyBooted := tr_AMI_Event("FullyBooted"); /*********************** * Adapter: @@ -420,6 +436,15 @@ } +altstep as_ami_rx_ignore(AMI_Msg_PT pt) +{ + var AMI_Msg msg; + [] pt.receive(AMI_Msg:?) -> value msg { + log("Ignoring AMI message := ", msg); + repeat; + } +} + private altstep as_ami_rx_fail(AMI_Msg_PT pt, template AMI_Msg exp_msg := *) { var AMI_Msg msg; diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 8a124c1..a71bcad 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -100,8 +100,18 @@ }; vc_AMI.start(f_AMI_Adapter_main(ami_pars)); - f_ami_action_login(AMI_CLIENT, mp_ami_user, mp_ami_secret); + + timer tReady; + tReady.start(10.0); + alt { + [] AMI_CLIENT.receive(tr_AMI_Event_FullyBooted); + [] as_ami_rx_ignore(AMI_CLIENT); + [] tReady.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("AMI FullyBooted timeout: ")); + } + } } /* Local SIP UAs */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc Gerrit-Change-Number: 36870 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 day, 21 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Asterisk_Tests.default: Improve mtc logging

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email ) Change subject: asterisk: Asterisk_Tests.default: Improve mtc logging ...................................................................... asterisk: Asterisk_Tests.default: Improve mtc logging Change-Id: Id7ad0230b50d301e60f636a3b983a315112e4042 --- M asterisk/Asterisk_Tests.default 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/36869/1 diff --git a/asterisk/Asterisk_Tests.default b/asterisk/Asterisk_Tests.default index ed4ec44..24c53e3 100644 --- a/asterisk/Asterisk_Tests.default +++ b/asterisk/Asterisk_Tests.default @@ -1,7 +1,6 @@ [LOGGING] FileMask := LOG_ALL | TTCN_MATCHING; - -mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; +mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; [TESTPORT_PARAMETERS] #*.*.DEBUG := "yes" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id7ad0230b50d301e60f636a3b983a315112e4042 Gerrit-Change-Number: 36869 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 day, 21 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Compute nonce from rand and autn params

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email ) Change subject: asterisk: Compute nonce from rand and autn params ...................................................................... asterisk: Compute nonce from rand and autn params Change-Id: I2809eec496a1c2c2b5f6e3d5d3bb1c33a788bd58 --- M asterisk/IMS_ConnectionHandler.ttcn M asterisk/gen_links.sh M asterisk/regen_makefile.sh 3 files changed, 25 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/36868/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index dcf3646..d1e3185 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -10,6 +10,7 @@ */ module IMS_ConnectionHandler { +import from TCCEncoding_Functions all; import from TCCOpenSecurity_Functions all; import from General_Types all; import from Osmocom_Types all; @@ -65,7 +66,8 @@ charstring user, charstring display_name, charstring password, - charstring nonce, + octetstring rand, + octetstring autn, charstring ipsec_auth_key, integer ipsec_local_spi_c, integer ipsec_local_spi_s, @@ -147,7 +149,8 @@ display_name := f_sip_str_quote(display_name), password := password, /* The Nonce field is the Base64 encoded version of the RAND value and concatenated with the AUTN: */ - nonce := "FJh2MfZfjjeIoHmLbrzQjvbhmnzLAoAAoGsZyVRFFuU=", + rand := '14987631f65f8e3788a0798b6ebcd08e'O, + autn := 'f6e19a7ccb028000a06b19c9544516e5'O, ipsec_auth_key := "0x5238297dfcca759bd05d48ff49bc63fa00000000", ipsec_local_spi_c := 4142, ipsec_local_spi_s := 4143, @@ -214,6 +217,13 @@ } } +private function f_nonce_from_rand_autn(octetstring rand, octetstring autn) return charstring { + var octetstring concat := rand & autn; + var charstring nonce := enc_MIME_Base64(concat); + log("rand=", rand, " & autn=",autn, " => nonce=", nonce); + return nonce; +} + /* HTTP Digest Authentication Using AKA (AKAv1-MD5): RFC 3310 */ function f_tr_Authorization_AKAv1MD5(WwwAuthenticate www_authenticate, charstring username, @@ -404,7 +414,7 @@ ts_Param("realm", f_sip_str_quote(g_pars.realm)), ts_Param("qop", f_sip_str_quote("auth")), ts_Param("algorithm", "AKAv1-MD5"), - ts_Param("nonce", f_sip_str_quote(g_pars.nonce)) + ts_Param("nonce", f_sip_str_quote(f_nonce_from_rand_autn(g_pars.rand, g_pars.autn))) /* "opaque not needed in IMS "*/ }; wwwAuthenticate := ts_WwwAuthenticate( { ts_Challenge_digestCln(digestCln) } ) diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh index 3c4495f..e42ffe3 100755 --- a/asterisk/gen_links.sh +++ b/asterisk/gen_links.sh @@ -7,7 +7,8 @@ DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h " FILES+="TCCOpenSecurity_Functions.ttcn TCCOpenSecurity.cc TCCOpenSecurity_Functions.hh " -FILES+="TCCDateTime.cc TCCDateTime_Functions.ttcn" +FILES+="TCCDateTime.cc TCCDateTime_Functions.ttcn " +FILES+="TCCEncoding_Functions.ttcn TCCEncoding.cc " # Base64 gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh index 8f7eae9..f0c9bcb 100755 --- a/asterisk/regen_makefile.sh +++ b/asterisk/regen_makefile.sh @@ -14,6 +14,7 @@ SDP_EncDec.cc SIPmsg_PT.cc TCCConversion.cc + TCCEncoding.cc TCCInterface.cc TCCOpenSecurity.cc TCCDateTime.cc -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2809eec496a1c2c2b5f6e3d5d3bb1c33a788bd58 Gerrit-Change-Number: 36868 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 day, 22 hours

1
0
0 0

[S] Change in osmo-msc[master]: libmsc: reset the LU delay timer (X5) on MO/MT SMS

by pespin

Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email ) Change subject: libmsc: reset the LU delay timer (X5) on MO/MT SMS ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Sounds like this should be part of the initial commit, but fine I guess. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad4ace6038be4b6037e341e7d9d187bef2917d80 Gerrit-Change-Number: 36865 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 16:10:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 22 hours

1
0
0 0

[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU connections

by pespin

Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email ) Change subject: libmsc: add X5 timer for delaying LU connections ...................................................................... Patch Set 4: Code-Review+1 (1 comment) Patchset: PS4: LGTM, but I'd like @nhofmeyr@sysmocom.de to have a look at it, he knows far better this code. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 16:07:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 22 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email ) Change subject: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I74fa174ea649adb2112c8e471c0e339a2197a08d Gerrit-Change-Number: 36772 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 16:02:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 23 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pc...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir ...................................................................... ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir dumpcap seems to be opening the pcap file it writes to *after* dropping privileges, which means even if running it as root, it will fail to create the pcap file inside a directory where that same user (even if root) doesn't have write+execute permissions. This is exactly what happens when one tries to run the ttcn3-tcmpdump-start.sh script inside docker with "--cap-add=NET_ADMIN --cap-add=SYS_RESOURCE" and root user, where it then tells dumpcap to write to a volume mounted inside docker which was created by the user outside user, hence with UID=1000 instead of UID=0 inside docker. Since tcpdump works fine in this setup, simply skip using dumpcap if it would fail to create the pcap file. Related: OS#6455 Change-Id: If8ea5bb62f4866042761d3e08fe83179bf10c75a --- M ttcn3-tcpdump-start.sh 1 file changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/36867/1 diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 5b6c9ea..7c4b78f 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -62,7 +62,12 @@ fi if [ -u $DUMPCAP -o "$CAP_ERR" = "0" ]; then - CMD="$DUMPCAP -q" + # dumpcap, *after dropping permissions*, needs to be able to write to the directory to create the pcap file: + if [ "$(stat -L -c "%u" "$TTCN3_PCAP_PATH")" = "$(id -u)" ] && [ "$(stat -L -c "%A" "$TTCN3_PCAP_PATH" | head -c 4)" = "drwx" ]; then + CMD="$DUMPCAP -q" + else + echo "NOTE: unable to use dumpcap due to missing permissions in $TTCN3_PCAP_PATH" + fi else echo "NOTE: unable to use dumpcap due to missing capabilities or suid bit" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If8ea5bb62f4866042761d3e08fe83179bf10c75a Gerrit-Change-Number: 36867 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 day, 23 hours

1
0
0 0

[S] Change in osmo-sgsn[master]: tests: don't run osmotestconfig.py in distcheck

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email ) Change subject: tests: don't run osmotestconfig.py in distcheck ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: As of now I think it's fine having it run twice when you run make check and make distcheck. That's what they are suppsoed to each tone, run tests... So looks like we should instead try to fix make distcheck. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I68e33a229a1cd035a9acef1210068af0e476bff3 Gerrit-Change-Number: 36864 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 15:54:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 day, 23 hours

1
0
0 0

[M] Change in osmo-sgsn[master]: doc: set state-dir to /var/lib/osmocom/osmo-sgsn

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email ) Change subject: doc: set state-dir to /var/lib/osmocom/osmo-sgsn ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 Gerrit-Change-Number: 36845 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 15:51:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 23 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log command used to record packets

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log command used to record packets ...................................................................... ttcn3-tcpdump-start.sh: Log command used to record packets Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 --- M ttcn3-tcpdump-start.sh 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/36866/1 diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 8564cd5..5b6c9ea 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -85,6 +85,7 @@ # Log stderr to CMD_OUTFILE and a dedicated error log file tee $CMD_OUTFILE < $FIFO > $CMD_OUTFILE_ERR & CMD_STR="$CMD -s 1520 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE 2>$FIFO &" +echo $CMD_STR eval $CMD_STR # $CMD -s 1520 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE & PID=$! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 Gerrit-Change-Number: 36866 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 day, 23 hours

1
0
0 0

[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU connections

by fixeria

Attention is currently required from: laforge, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email ) Change subject: libmsc: add X5 timer for delaying LU connections ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 15:08:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 day, 23 hours

1
0
0 0

[S] Change in osmo-msc[master]: libmsc: reset the LU delay timer (X5) on MO/MT SMS

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email ) Change subject: libmsc: reset the LU delay timer (X5) on MO/MT SMS ...................................................................... libmsc: reset the LU delay timer (X5) on MO/MT SMS We don't want to delay the BSSAP/RANAP connection release any longer than it takes to submit or deliver an SMS. Thus, whenever a new SMS transaction is being allocated, drop the LU token. Change-Id: Iad4ace6038be4b6037e341e7d9d187bef2917d80 Related: osmo-ttcn3-hacks.git I74fa174ea649adb2112c8e471c0e339a2197a08d Related: SYS#6913 --- M src/libmsc/gsm_04_11.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/65/36865/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index aa87a19..cbacb43 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -1081,6 +1081,13 @@ else msc_a_put(msc_a, MSC_A_USE_CM_SERVICE_SMS); } + + /* If we're re-using the existing LU connection, drop the LU token. + * The idea behind this timer is explained in msc_a_put_use_lu(). */ + if (osmo_timer_pending(&msc_a->lu_delay_timer)) { + osmo_timer_del(&msc_a->lu_delay_timer); + msc_a_put(msc_a, MSC_A_USE_LOCATION_UPDATING); + } } /* Init both SMC and SMR state machines */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad4ace6038be4b6037e341e7d9d187bef2917d80 Gerrit-Change-Number: 36865 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 day, 23 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer

by fixeria

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer ...................................................................... msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer Change-Id: I74fa174ea649adb2112c8e471c0e339a2197a08d Related: osmo-msc.git Ic519cab55d65e47b2636124427dab1a1d80fab78 Related: SYS#6913 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml 3 files changed, 79 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/36772/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I74fa174ea649adb2112c8e471c0e339a2197a08d Gerrit-Change-Number: 36772 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 day, 23 hours

1
0
0 0

[S] Change in osmo-sgsn[master]: sgsn/sgsn_vty: create state-dir

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36844?usp=email ) Change subject: sgsn/sgsn_vty: create state-dir ...................................................................... sgsn/sgsn_vty: create state-dir Prepare to change the state-dir in the default config in a follow-up commit. Create the directory if it does not exist. Change-Id: I8db4898cdaa2fcbd6bbf7c543764b9cdf828de83 --- M src/sgsn/sgsn_vty.c 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 6837e71..6ca5a7d 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -24,6 +24,8 @@ #include <arpa/inet.h> #include <time.h> #include <inttypes.h> +#include <sys/stat.h> +#include <sys/types.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> @@ -404,6 +406,11 @@ "Set the directory for the GTP State file\n" "Local Directory\n") { + if (mkdir(argv[0], 0755) == -1 && errno != EEXIST) { + vty_out(vty, "%% Failed to create state-dir: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + osmo_talloc_replace_string(sgsn, &sgsn->cfg.gtp_statedir, argv[0]); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36844?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8db4898cdaa2fcbd6bbf7c543764b9cdf828de83 Gerrit-Change-Number: 36844 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 days

1
0
0 0

[M] Change in osmo-sgsn[master]: doc: set state-dir to /var/lib/osmocom/osmo-sgsn

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email ) Change subject: doc: set state-dir to /var/lib/osmocom/osmo-sgsn ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 Gerrit-Change-Number: 36845 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 14:56:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 days

1
0
0 0

[S] Change in osmo-sgsn[master]: tests: don't run osmotestconfig.py in distcheck

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email ) Change subject: tests: don't run osmotestconfig.py in distcheck ...................................................................... tests: don't run osmotestconfig.py in distcheck Call osmotestconfig.py from contrib/jenkins.sh, instead of running it as part of the vty-tests. Previously it would run twice, once during "make check" and another time during "make distcheck". A follow-up patch sets state-dir to /var/lib/osmocom/osmo-sgsn in the config that will actually be installed, and because the user that runs the VTY tests typically does not have write access, a copy of the config gets created in the tests directory that does not have this option. This works fine with the VTY tests, except for osmotestconfig.py when running as part of distcheck. I've tried to figure out why exactly it does not work, but this isn't trivial because the script doesn't show where the actual error is (OS#6456). It doesn't seem like a good use of time to look into this further for now, instead it should be enough running osmotestconfig.py once in contrib/jenkins.sh, and not have it run as part of the VTY tests anymore. Change-Id: I68e33a229a1cd035a9acef1210068af0e476bff3 --- M contrib/jenkins.sh M tests/Makefile.am 2 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/64/36864/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 321beef..1b7a4d1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -69,6 +69,8 @@ $MAKE $PARALLEL_MAKE distcheck \ || cat-testlogs.sh +(cd tests && osmotestconfig.py -p $(realpath ../) -w $(realpath ../) -v) + if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then make -C "$base/doc/manuals" publish fi diff --git a/tests/Makefile.am b/tests/Makefile.am index 2c07ac9..da94ebd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -52,7 +52,6 @@ vty-python-test: $(top_builddir)/src/sgsn/osmo-sgsn osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v rm -f $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I68e33a229a1cd035a9acef1210068af0e476bff3 Gerrit-Change-Number: 36864 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 days

1
0
0 0

[S] Change in osmo-msc[master]: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email ) Change subject: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED ...................................................................... Patch Set 1: (1 comment) File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/c/osmo-msc/+/36862/comment/ce69cb7d_5b064562 PS1, Line 1276: /* FIXME: MT SMS is not guaranteed to be delivered (e.g. the MS may be detached) */ > Delivered doesn't imply it was received? I think it does, otherwise where (to whom) it was delivered if it was not received by the subscriber? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5380035294d2fca481620638b59eae779670e9f8 Gerrit-Change-Number: 36862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 14:28:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 days

1
0
0 0

[S] Change in osmo-msc[master]: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email ) Change subject: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED ...................................................................... Patch Set 1: (1 comment) File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/c/osmo-msc/+/36862/comment/26f02385_6fcd0584 PS1, Line 1276: /* FIXME: MT SMS is not guaranteed to be delivered (e.g. the MS may be detached) */ But the counter is fine I guess? Delivered doesn't imply it was received? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5380035294d2fca481620638b59eae779670e9f8 Gerrit-Change-Number: 36862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 14:25:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 days

1
0
0 0

[S] Change in osmo-msc[master]: SMS-over-GSUP: set log context in gsm411_gsup_rx()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email ) Change subject: SMS-over-GSUP: set log context in gsm411_gsup_rx() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3414953d2aa7b075fcee1cf6e5e76c527ae7b507 Gerrit-Change-Number: 36861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 14:24:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 days

1
0
0 0

[S] Change in osmo-msc[master]: [WIP] libvlr: proper handling of the MNRF and sending of readyForSM

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36863?usp=email ) Change subject: [WIP] libvlr: proper handling of the MNRF and sending of readyForSM ...................................................................... [WIP] libvlr: proper handling of the MNRF and sending of readyForSM This is an early, non-working attempt to implement proper handing of the MNRF (MS Not Reachable Flag) and sending of the readyForSM primitive (reason=MS_PRESENT) to the SMSC. Change-Id: Idbb3c6e9a33ca0ff3e157dd6250bee600631b4bb --- M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_11_gsup.c M src/libvlr/vlr_lu_fsm.c 3 files changed, 44 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/63/36863/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 11b3a02..3cd4a60 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -182,6 +182,10 @@ sms_free(sms); } + /* Set the MNRF to trigger sending readyForSM */ + if (trans->vsub != NULL) + trans->vsub->ms_not_reachable_flag = true; + /* Destroy this transaction */ trans_free(trans); } diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 328d047..39dd784 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -155,6 +155,18 @@ if (msg_is_err && !gsup_msg->sm_rp_cause) goto msg_error; +#if 0 + /* XXX: maybe include tthe .sm_alert_rsn == OSMO_GSUP_SMS_SM_ALERT_RSN_MS_PRESENT? */ + if (*(gsup_msg->sm_rp_mr) == 0xff) { + if (vsub->sub_pres_vlr_fsm != NULL) { /* XXX: no such field */ + osmo_fsm_inst_dispatch(vsub->sub_pres_vlr_fsm, + msg_is_err ? SUB_PRES_VLR_E_READY_SM_ERR + : SUB_PRES_VLR_E_READY_SM_CNF, NULL); + } + return 0; + } +#endif + /* Attempt to find DTAP-transaction */ trans = trans_find_by_sm_rp_mr(net, vsub, *(gsup_msg->sm_rp_mr)); if (!trans) { diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 5d8f78b..475fdcd 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -215,7 +215,19 @@ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); return; } - /* FIXME: Send READY_FOR_SM via GSUP */ + +#if 0 + /* XXX: assuming SMS-over-GSUP and no built-in SMSC */ + struct osmo_gsup_message gsup_msg = { + .message_class = OSMO_GSUP_MESSAGE_CLASS_SMS, + .message_type = OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST, + .sm_alert_rsn = OSMO_GSUP_SMS_SM_ALERT_RSN_MS_PRESENT, + .sm_rp_mr = 0xff, + }; + OSMO_STRLCPY_ARRAY(gsup_msg->imsi, vsub->imsi); + gsup_client_mux_tx(vsub->vlr->gcm, &gsup_msg); +#endif + osmo_fsm_inst_state_chg(fi, SUB_PRES_VLR_S_WAIT_FOR_HLR, LU_TIMEOUT_LONG, 0); } @@ -272,9 +284,8 @@ return (struct vlr_subscr*)fi->priv; } -/* THIS IS CURRENTLY DEAD CODE, SINCE WE NEVER SET vsub->ms_not_reachable_flag = true. - * - * Note that the start event is dispatched right away, so in case the FSM immediately concludes from that + +/* Note that the start event is dispatched right away, so in case the FSM immediately concludes from that * event, the created FSM struct may no longer be valid as it already deallocated again, and it may * furthermore already have invoked the parent FSM instance's deallocation as well. Hence, instead of * returning, store the created FSM instance address in *fi_p before dispatching the event. It is thus -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36863?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Idbb3c6e9a33ca0ff3e157dd6250bee600631b4bb Gerrit-Change-Number: 36863 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 days

1
0
0 0

[S] Change in osmo-msc[master]: SMS-over-GSUP: set log context in gsm411_gsup_rx()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email ) Change subject: SMS-over-GSUP: set log context in gsm411_gsup_rx() ...................................................................... SMS-over-GSUP: set log context in gsm411_gsup_rx() Change-Id: I3414953d2aa7b075fcee1cf6e5e76c527ae7b507 --- M src/libmsc/gsm_04_11_gsup.c 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/61/36861/1 diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 1afdfab..328d047 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -133,9 +133,6 @@ const char *msg_name; bool msg_is_err; - /* Associate logging messages with this subscriber */ - log_set_context(LOG_CTX_VLR_SUBSCR, vsub); - /* Determine the message type and name */ msg_is_err = OSMO_GSUP_IS_MSGT_ERROR(gsup_msg->message_type); switch (gsup_msg->message_type) { @@ -241,9 +238,6 @@ bool sm_rp_mmts_ind; int rc; - /* Associate logging messages with this subscriber */ - log_set_context(LOG_CTX_VLR_SUBSCR, vsub); - LOGP(DLSMS, LOGL_DEBUG, "RX MT-forwardSM-Req\n"); /** @@ -310,6 +304,9 @@ return -GMM_CAUSE_IMSI_UNKNOWN; } + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, vsub); + switch (gsup_msg->message_type) { /* GSM 04.11 code implementing MO SMS */ case OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR: -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3414953d2aa7b075fcee1cf6e5e76c527ae7b507 Gerrit-Change-Number: 36861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 days

1
0
0 0

[S] Change in osmo-msc[master]: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email ) Change subject: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED ...................................................................... gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED Change-Id: I5380035294d2fca481620638b59eae779670e9f8 --- M src/libmsc/gsm_04_11.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/62/36862/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index aa87a19..11b3a02 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -1273,6 +1273,7 @@ /* Encode RP-UD itself (SM TPDU) */ msgb_lv_put(msg, sm_rp_ud_len, sm_rp_ud); + /* FIXME: MT SMS is not guaranteed to be delivered (e.g. the MS may be detached) */ rate_ctr_inc(rate_ctr_group_get_ctr(net->msc_ctrs, MSC_CTR_SMS_DELIVERED)); return gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5380035294d2fca481620638b59eae779670e9f8 Gerrit-Change-Number: 36862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 days

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Configure docker testsuite to be able to set up ipsec...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36857?usp=email ) Change subject: ttcn3-asterisk: Configure docker testsuite to be able to set up ipsec tunnels ...................................................................... ttcn3-asterisk: Configure docker testsuite to be able to set up ipsec tunnels Depends: osmo-ttcn3-hacks.git Change-Id Ic042422788ee406f5b71ca3878bc5617e5455579 Change-Id: I3379e4991a5c705b5b0a14e5fee2eb165cc8a1e3 --- M debian-bookworm-titan-master/Dockerfile M debian-bookworm-titan/Dockerfile M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg M ttcn3-asterisk-ims-ue-test/jenkins.sh 4 files changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve diff --git a/debian-bookworm-titan-master/Dockerfile b/debian-bookworm-titan-master/Dockerfile index 2b0644a..161c933 100644 --- a/debian-bookworm-titan-master/Dockerfile +++ b/debian-bookworm-titan-master/Dockerfile @@ -20,6 +20,7 @@ build-essential \ ca-certificates \ git \ + iproute2 \ iputils-ping \ netcat-openbsd \ procps \ diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile index fcc00ba..c4af2ef 100644 --- a/debian-bookworm-titan/Dockerfile +++ b/debian-bookworm-titan/Dockerfile @@ -21,6 +21,7 @@ ca-certificates \ ccache \ git \ + iproute2 \ iputils-ping \ netcat-openbsd \ procps \ diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index 40bc86e..d183cad 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -24,6 +24,7 @@ Asterisk_Tests.mp_local_ims_port := 5060 Asterisk_Tests.mp_ims_imsi := "238010000090828" Asterisk_Tests.mp_ami_remote_host := "172.18.11.10" +IMS_ConnectionHandler.mp_ipsec_setup_script_path := "/osmo-ttcn3-hacks/asterisk/IMS_ipsec_setup.sh" [MAIN_CONTROLLER] diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh b/ttcn3-asterisk-ims-ue-test/jenkins.sh index aa5749d..98d27b8 100755 --- a/ttcn3-asterisk-ims-ue-test/jenkins.sh +++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh @@ -37,6 +37,8 @@ echo Starting container with Asterisk testsuite docker run --rm \ + --cap-add=NET_ADMIN \ + --cap-add=SYS_RESOURCE \ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36857?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3379e4991a5c705b5b0a14e5fee2eb165cc8a1e3 Gerrit-Change-Number: 36857 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 days, 2 hours

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Implement support to handle 2nd REGISTER through ipsec

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?usp=email ) Change subject: asterisk: Implement support to handle 2nd REGISTER through ipsec ...................................................................... asterisk: Implement support to handle 2nd REGISTER through ipsec This patch implements the necessary infra to set up ipsec tunnel towards the asterisk IMS client, and receive the 2nd REGISTER through the ipsec tun plus answer it acking the registration successfully. Change-Id: Ic042422788ee406f5b71ca3878bc5617e5455579 --- M asterisk/Asterisk_Tests.cfg M asterisk/IMS_ConnectionHandler.ttcn A asterisk/IMS_ipsec_setup.sh M asterisk/gen_links.sh M asterisk/regen_makefile.sh M library/PIPEasp_Templates.ttcn M library/SIP_Templates.ttcn M sip/SIP_Tests.ttcn 8 files changed, 285 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/asterisk/Asterisk_Tests.cfg b/asterisk/Asterisk_Tests.cfg index bcc8a30..3286aed 100644 --- a/asterisk/Asterisk_Tests.cfg +++ b/asterisk/Asterisk_Tests.cfg @@ -11,6 +11,7 @@ [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] +IMS_ConnectionHandler.mp_ipsec_setup_script_path := "./IMS_ipsec_setup.sh" [MAIN_CONTROLLER] diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 18404f1..dcf3646 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -16,6 +16,11 @@ import from Native_Functions all; import from Misc_Helpers all; +/* the PIPE asp port allows us to interact with ip xfrm via stdin/stdout */ +import from PIPEasp_PortType all; +import from PIPEasp_Types all; +import from PIPEasp_Templates all; + import from SDP_Types all; import from SDP_Templates all; @@ -23,6 +28,11 @@ import from SIPmsg_Types all; import from SIP_Templates all; + +modulepar { + charstring mp_ipsec_setup_script_path := "./IMS_ipsec_setup.sh"; +} + const char c_sip_server_name := "osmo-ttcn3-hacks/0.23"; @@ -41,6 +51,7 @@ var PDU_SIP_Response g_rx_sip_resp; port IMSCoord_PT COORD; + port PIPEasp_PT PIPE; } type record of IMS_ConnHdlr IMS_ConnHdlrList; @@ -54,10 +65,14 @@ charstring user, charstring display_name, charstring password, + charstring nonce, + charstring ipsec_auth_key, integer ipsec_local_spi_c, integer ipsec_local_spi_s, integer ipsec_remote_spi_c optional, integer ipsec_remote_spi_s optional, + uint16_t ipsec_remote_port_c optional, + uint16_t ipsec_remote_port_s optional, SipUrl registrar_sip_req_uri, SipAddr registrar_sip_record, CallidString registrar_sip_call_id, @@ -131,10 +146,15 @@ user := user, display_name := f_sip_str_quote(display_name), password := password, + /* The Nonce field is the Base64 encoded version of the RAND value and concatenated with the AUTN: */ + nonce := "FJh2MfZfjjeIoHmLbrzQjvbhmnzLAoAAoGsZyVRFFuU=", + ipsec_auth_key := "0x5238297dfcca759bd05d48ff49bc63fa00000000", ipsec_local_spi_c := 4142, ipsec_local_spi_s := 4143, ipsec_remote_spi_c := omit, ipsec_remote_spi_s := omit, + ipsec_remote_port_c := omit, + ipsec_remote_port_s := omit, registrar_sip_req_uri := valueof(ts_SipUrlHost(local_sip_host)), registrar_sip_record := ts_SipAddr(ts_HostPort(local_sip_host), ts_UserInfo(user), @@ -194,6 +214,39 @@ } } +/* HTTP Digest Authentication Using AKA (AKAv1-MD5): RFC 3310 */ +function f_tr_Authorization_AKAv1MD5(WwwAuthenticate www_authenticate, + charstring username, + charstring uri, + integer nc_int := 1) +return template (present) Authorization { + var CommaParam_List digestCln; + var template (present) Authorization authorization; + var template (present) Credentials cred; + var template (omit) GenericParam rx_param; + + digestCln := www_authenticate.challenge[0].digestCln; + + var charstring algorithm := f_sip_param_get_value_present_or_fail(digestCln, "algorithm"); + var charstring realm := f_sip_param_get_value_present_or_fail(digestCln, "realm"); + var charstring nonce := f_sip_param_get_value_present_or_fail(digestCln, "nonce"); + + var template (present) CommaParam_List digestResponse := superset( + tr_Param("username", f_sip_str_quote(username)), + tr_Param("realm", f_sip_str_quote(realm)), + tr_Param("nonce", f_sip_str_quote(nonce)), + tr_Param("uri", f_sip_str_quote(uri)), + tr_Param("response", ?), + tr_Param("algorithm", algorithm), + tr_Param("qop", "auth"), + tr_Param("cnonce", ?), + tr_Param("nc", ?) + ); + cred := tr_Credentials_DigestResponse(digestResponse); + authorization := tr_Authorization(cred); + return authorization; +} + private function f_ims_validate_register_contact(Contact rx_contact) { /* IMS contact shows up like this: @@ -229,6 +282,10 @@ g_pars.ipsec_remote_spi_c := str2int(par_val); par_val := f_sip_param_get_value_present_or_fail(sec_pars, "spi-s"); g_pars.ipsec_remote_spi_s := str2int(par_val); + par_val := f_sip_param_get_value_present_or_fail(sec_pars, "port-c"); + g_pars.ipsec_remote_port_c := str2int(par_val); + par_val := f_sip_param_get_value_present_or_fail(sec_pars, "port-s"); + g_pars.ipsec_remote_port_s := str2int(par_val); found := true; break; } @@ -242,10 +299,40 @@ "local_spi_c=", g_pars.ipsec_local_spi_c, " local_spi_s=", g_pars.ipsec_local_spi_s); } -private function f_ims_setup_ipsec(PDU_SIP_Request req_req) runs on IMS_ConnHdlr +private function f_IMS_exec_sync(charstring cmdline, template (present) integer rc := 0) + runs on IMS_ConnHdlr return ASP_PResult { + var ASP_PResult res; + + map(self:PIPE, system:PIPE); + res := f_PIPEasp_exec_sync_PResult(PIPE, cmdline, tr_PResult(?, ?, rc)); + unmap(self:PIPE, system:PIPE); + + return res; +} + +private function f_ims_setup_ipsec() runs on IMS_ConnHdlr { - var Security_client security_client := req_req.msgHeader.security_client; - f_ims_parse_security_client(security_client); + var ASP_PResult res; + + var charstring cmd := mp_ipsec_setup_script_path & " " & + g_pars.local_sip_host & " " & + int2str(g_pars.local_sip_port) & " " & int2str(g_pars.ipsec_local_spi_c) & " " & + int2str(g_pars.local_sip_port) & " " & int2str(g_pars.ipsec_local_spi_s) & " " & + g_pars.remote_sip_host & " " & + int2str(g_pars.ipsec_remote_port_c) & " " & int2str(g_pars.ipsec_remote_spi_c) & " " & + int2str(g_pars.ipsec_remote_port_s) & " " & int2str(g_pars.ipsec_remote_spi_s) & " " & + g_pars.ipsec_auth_key; + + res := f_IMS_exec_sync(cmd); + + /* Debug applied rules: */ + /* + res := f_IMS_exec_sync("ip xfrm state"); + log("ip-xfrm-state Result-Stdout: " & res.stdout); + + res := f_IMS_exec_sync("ip xfrm policy"); + log("ip-xfrm-policy Result-Stdout: " & res.stdout); + */ } /* Peer is calling us, accept it: */ @@ -275,8 +362,9 @@ var template (value) WwwAuthenticate wwwAuthenticate; var template (value) Security_server security_server; var template (value) Server server_name := ts_Server({c_sip_server_name}); + var template (value) Require require := ts_Require({"sec-agree"}); var template (value) Supported supported := ts_Supported({"sec-agree"}); - var Authorization authorization; + var template (present) Authorization authorization; var integer sip_seq_nr; var charstring tx_sdp; @@ -293,9 +381,6 @@ f_ims_validate_register_contact(contact); /* TODO: Validate "Expires" is 600000 */ - /* TODO: validate presence of: - * Security-Client: ipsec-3gpp; alg=hmac-md5-96; ealg=des-ede3-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-md5-96; ealg=aes-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-md5-96; ealg=null; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-sha-1-96; ealg=des-ede3-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-sha-1-96; ealg=aes-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-sha-1-96; ealg=null; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718 - */ /* Tx 100 Tyring */ tx_resp := ts_SIP_Response_Trying(sip_call_id, @@ -309,7 +394,9 @@ userAgent := omit); SIP.send(tx_resp); - f_ims_setup_ipsec(g_rx_sip_req); + g_pars.remote_sip_host := valueof(contact.contactBody.contactAddresses[0].addressField.nameAddr.addrSpec.hostPort.host); + f_ims_parse_security_client(g_rx_sip_req.msgHeader.security_client); + f_ims_setup_ipsec(); to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); @@ -317,7 +404,7 @@ ts_Param("realm", f_sip_str_quote(g_pars.realm)), ts_Param("qop", f_sip_str_quote("auth")), ts_Param("algorithm", "AKAv1-MD5"), - ts_Param("nonce", f_sip_str_quote("FJh2MfZfjjeIoHmLbrzQjvbhmnzLAoAAoGsZyVRFFuU=")) + ts_Param("nonce", f_sip_str_quote(g_pars.nonce)) /* "opaque not needed in IMS "*/ }; wwwAuthenticate := ts_WwwAuthenticate( { ts_Challenge_digestCln(digestCln) } ) @@ -337,8 +424,8 @@ security_server := ts_Security_server({ ts_Security_mechanism("ipsec-3gpp", sec_params) }); - /* Tx 401 Unauthorized - * TODO: with IMS params */ + + /* Tx 401 Unauthorized */ tx_resp := ts_SIP_Response_Unauthorized(sip_call_id, from_addr, to_addr, @@ -352,19 +439,25 @@ userAgent := omit); SIP.send(tx_resp); + /* Now we should receive a new REGISTER over ipsec: */ + /* TODO: Generate expected Authoritzation based on AKAv1-MD5: */ /*authorization := f_sip_digest_gen_Authorization(valueof(wwwAuthenticate), g_pars.user, g_pars.password, "REGISTER", f_sip_SipUrl_to_str(g_pars.registrar_sip_record.addr.nameAddr.addrSpec)) */ + authorization := f_tr_Authorization_AKAv1MD5(valueof(wwwAuthenticate), + g_pars.user & "@" & g_pars.realm, + f_sip_SipUrl_to_str(g_pars.registrar_sip_record.addr.nameAddr.addrSpec)); /* TODO: match Authorization from above: */ exp_req := tr_SIP_REGISTER(g_pars.registrar_sip_req_uri, ?, tr_SipAddr(), tr_SipAddr(), - tr_Via_from(?)); + tr_Via_from(?), + authorization := authorization); SIP.receive(exp_req) -> value g_rx_sip_req; sip_call_id := g_rx_sip_req.msgHeader.callId.callid; @@ -373,21 +466,33 @@ g_rx_sip_req.msgHeader.fromField.fromParams); to_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.toField.addressField, g_rx_sip_req.msgHeader.toField.toParams); - to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); sip_seq_nr := g_rx_sip_req.msgHeader.cSeq.seqNumber; - /* TODO: Add following fields: - * Supported: sec-agree - * Security-Server: ipsec-3gpp;q=0.1;prot=esp;mod=trans;spi-c=4096;spi-s=4097;port-c=5104;port-s=6104;alg=hmac-sha-1-96;ealg=null - * */ + /* Tx 100 Trying */ + tx_resp := ts_SIP_Response_Trying(sip_call_id, + from_addr, + to_addr, + via, + sip_seq_nr, + "REGISTER", + allow := omit, + server := server_name, + userAgent := omit); + SIP.send(tx_resp); + /* Tx 200 OK */ + to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); tx_resp := ts_SIP_Response(sip_call_id, from_addr, to_addr, "REGISTER", 200, sip_seq_nr, "OK", - via); + via, + require := require, + server := server_name, + supported := supported, + userAgent := omit); SIP.send(tx_resp); } [fail_others] as_SIP_fail_resp(sip_expect_str); diff --git a/asterisk/IMS_ipsec_setup.sh b/asterisk/IMS_ipsec_setup.sh new file mode 100755 index 0000000..7c76679 --- /dev/null +++ b/asterisk/IMS_ipsec_setup.sh @@ -0,0 +1,70 @@ +#!/bin/sh + +# use: ipset_setup.sh \ +# $LOC_IP $LOC_PORT_C $LOC_SPI_C $LOC_PORT_S $LOC_SPI_S \ +# $REM_IP $REM_PORT_C $REM_SPI_C $REM_PORT_S $REM_SPI_S \ +# $AUTH_KEY + +LOC_IP="${1}" +LOC_PORT_C="${2}" +LOC_SPI_C="${3}" +LOC_PORT_S="${4}" +LOC_SPI_S="${5}" +REM_IP="${6}" +REM_PORT_C="${7}" +REM_SPI_C="${8}" +REM_PORT_S="${9}" +REM_SPI_S="${10}" +AUTH_KEY="${11}" + +set -x + +# Clean up state from previous tests: +ip xfrm policy flush +ip xfrm state flush + +# use: ip_xfrm <src_ip> <src_port> <dst_ip> <dst_port> <spi> +ip_xfrm_state() { + ip xfrm state add \ + src "${1}" dst "${3}" proto esp spi "${5}" reqid "${5}" mode transport \ + replay-window 32 \ + auth-trunc sha1 "${AUTH_KEY}" 96 \ + enc cipher_null "" \ + sel src "${1}/32" dst "${3}/32" sport "${2}" dport "${4}" +} + +# TTCN3(Srv) -> Asterisk(Cli): REM_SPI_C +ip_xfrm_state "${LOC_IP}" "${LOC_PORT_S}" "${REM_IP}" "${REM_PORT_C}" "${REM_SPI_C}" + +# TTCN3(Cli) -> Asterisk(Srv): REM_SPI_S +ip_xfrm_state "${LOC_IP}" "${LOC_PORT_C}" "${REM_IP}" "${REM_PORT_S}" "${REM_SPI_S}" + +# Asterisk(Cli) -> TTCN3(Srv): LOC_SPI_S +ip_xfrm_state "${REM_IP}" "${REM_PORT_C}" "${LOC_IP}" "${LOC_PORT_S}" "${LOC_SPI_S}" + +# Asterisk(Srv) -> TTCN3(Cli): LOC_SPI_C +ip_xfrm_state "${REM_IP}" "${REM_PORT_S}" "${LOC_IP}" "${LOC_PORT_C}" "${LOC_SPI_C}" + +# use: ip_xfrm <src_ip> <src_port> <dst_ip> <dst_port> <req_id> <dir> +ip_xfrm_policy() { + ip xfrm policy add \ + src "${1}/32" dst "${3}/32" sport "${2}" dport "${4}" \ + dir "${6}" \ + tmpl src "${1}" dst "${3}" \ + proto esp reqid "${5}" mode transport +} + +# TTCN3(Srv) -> Asterisk(Cli): REM_SPI_C out +ip_xfrm_policy "${LOC_IP}" "${LOC_PORT_S}" "${REM_IP}" "${REM_PORT_C}" "${REM_SPI_C}" "out" + +# TTCN3(Cli) -> Asterisk(Srv): REM_SPI_S out +ip_xfrm_policy "${LOC_IP}" "${LOC_PORT_C}" "${REM_IP}" "${REM_PORT_S}" "${REM_SPI_S}" "out" + +# Asterisk(Cli) -> TTCN3(Srv): LOC_SPI_S in +ip_xfrm_policy "${REM_IP}" "${REM_PORT_C}" "${LOC_IP}" "${LOC_PORT_S}" "${LOC_SPI_S}" "in" + +# Asterisk(Srv) -> TTCN3(Cli): LOC_SPI_C in +ip_xfrm_policy "${REM_IP}" "${REM_PORT_S}" "${LOC_IP}" "${LOC_PORT_C}" "${LOC_SPI_C}" "in" + +#ip xfrm state +#ip xfrm policy diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh index c342e51..3c4495f 100755 --- a/asterisk/gen_links.sh +++ b/asterisk/gen_links.sh @@ -14,7 +14,10 @@ FILES="Socket_API_Definitions.ttcn" gen_links $DIR $FILES -# Required by MGCP and IPA +DIR=$BASEDIR/titan.TestPorts.PIPEasp/src +FILES="PIPEasp_PT.cc PIPEasp_PT.hh PIPEasp_Types.ttcn PIPEasp_PortType.ttcn PIPEasp_Templates.ttcn " +gen_links $DIR $FILES + DIR=$BASEDIR/titan.TestPorts.IPL4asp/src FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" gen_links $DIR $FILES @@ -38,6 +41,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="PIPEasp_Templates.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="SDP_Templates.ttcn " FILES+="SIP_Emulation.ttcn SIP_Templates.ttcn " diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh index 5d5538e..8f7eae9 100755 --- a/asterisk/regen_makefile.sh +++ b/asterisk/regen_makefile.sh @@ -5,6 +5,7 @@ FILES=" *.c *.ttcn + PIPEasp_PT.cc IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc @@ -20,3 +21,6 @@ " ../regen-makefile.sh -e $NAME $FILES + +# required for forkpty(3) used by PIPEasp +sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/library/PIPEasp_Templates.ttcn b/library/PIPEasp_Templates.ttcn index af4e434..0775a5e 100644 --- a/library/PIPEasp_Templates.ttcn +++ b/library/PIPEasp_Templates.ttcn @@ -3,6 +3,20 @@ import from PIPEasp_PortType all; import from PIPEasp_Types all; +template (value) ASP_PExecute ts_PExecute(template (value) charstring command, + template (value) charstring stdin) := { + command := command, + stdin := stdin +} + +template (present) ASP_PResult tr_PResult(template (present) charstring stdout, + template (present) charstring stderr, + template (present) integer code) := { + stdout := stdout, + stderr := stderr, + code := code +} + template (value) ASP_PExecuteBackground ts_ExecBg(charstring cmd) := { command := cmd } @@ -24,4 +38,36 @@ [] pt.receive(tr_Stderr(?)) { repeat; } } +/* User should map(component_name:PIPE, system:PIPE) before using this function. */ +function f_PIPEasp_exec_sync_PResult(PIPEasp_PT pt, + charstring cmdline, + template (present) ASP_PResult res_exp := tr_PResult(?,?,0), + float time_out := 10.0) return ASP_PResult { + var ASP_PResult res; + timer t; + + if (time_out > 0.0) { + t.start(time_out); + } + + log ("Executing: ", cmdline); + pt.send(ts_PExecute(cmdline, "")); + + alt { + [] pt.receive(res_exp) -> value res; + [time_out > 0.0] t.timeout { + setverdict(fail, "Timeout: ", cmdline); + mtc.stop; + } + } + log ("Result: ", res); + return res; +} + +function f_PIPEasp_exec_sync(PIPEasp_PT pt, + charstring cmdline, + template (present) integer rc := 0) return ASP_PResult { + return f_PIPEasp_exec_sync_PResult(pt, cmdline, tr_PResult(?, ?, rc)); +} + } diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 37dee4b..7ef49cf 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -76,6 +76,9 @@ methods := methods } +template (present) Credentials tr_Credentials_DigestResponse(template (present) CommaParam_List digestResponse) := { + digestResponse := digestResponse +} template (value) Credentials ts_Credentials_DigestResponse(template (value) CommaParam_List digestResponse) := { digestResponse := digestResponse } @@ -114,6 +117,10 @@ otherResponse := otherResponse } +template (present) Authorization tr_Authorization(template (present) Credentials body) := { + fieldName := AUTHORIZATION_E, + body := body +} template (value) Authorization ts_Authorization(template (value) Credentials body) := { fieldName := AUTHORIZATION_E, body := body @@ -618,6 +625,7 @@ template ContentLength content_length := *, template ContentType content_type := *, template Allow allow := *, + template Authorization authorization := *, template Expires expires := *, template Require require := *, template Security_client security_client := *, @@ -628,6 +636,7 @@ template WwwAuthenticate wwwAuthenticate := * ) modifies t_SIP_msgHeader_any := { allow := allow, + authorization := authorization, callId := { fieldName := CALL_ID_E, callid := call_id @@ -696,6 +705,7 @@ template (present) SipAddr to_addr := ?, template (present) Via via := tr_Via_from(f_tr_HostPort_opt_defport(?)), template integer seq_nr := *, + template Authorization authorization := *, template Contact contact := *, template Expires expires := *, template Require require := *, @@ -705,6 +715,7 @@ requestLine := tr_SIP_ReqLine(REGISTER_E, sip_url_host_port), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, contact, via, "REGISTER", seq_nr, + authorization := authorization, expires := expires, require := require, security_client := security_client, @@ -835,12 +846,22 @@ integer seq_nr, charstring reason, Via via, + template (omit) Allow allow := omit, + template (omit) Require require := omit, + template (omit) Server server := omit, + template (omit) Supported supported := omit, + template (omit) UserAgent userAgent := omit, template (omit) charstring body := omit) := { statusLine := ts_SIP_StatusLine(status_code, reason), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method, seq_nr, via, content_length := f_ContentLength(body), - content_type := f_ContentTypeOrOmit(ts_CT_SDP, body)), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), + allow := allow, + require := require, + server := server, + supported := supported, + userAgent := userAgent), messageBody := body, payload := omit } diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 5899311..84ddcb5 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -464,7 +464,7 @@ /* OSC <- SIP: SIP-terminated user has accepted the call */ SIP.send(ts_SIP_Response(cp.comp.sip_call_id, cp.comp.sip_url_gsm, cp.comp.sip_url_ext, "INVITE", 200, seq_nr, "OK", sip_req.msgHeader.via, - cp.comp.sip_body)); + body := cp.comp.sip_body)); if (cp.mncc_with_sdp) { /* If we expect SDP forwarding, from now on expect MNCC to reflect the SDP that we just sent on SIP. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic042422788ee406f5b71ca3878bc5617e5455579 Gerrit-Change-Number: 36856 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 days, 2 hours

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Implement support to handle 2nd REGISTER through ipsec

by osmith

Attention is currently required from: jolly, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?usp=email ) Change subject: asterisk: Implement support to handle 2nd REGISTER through ipsec ...................................................................... Patch Set 3: Code-Review+2 (2 comments) File asterisk/IMS_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856/comment/350bb8c3_eaff… PS2, Line 471: Tyring > Trying Done File asterisk/IMS_ipsec_setup.sh: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856/comment/a2fc6734_1d8c… PS2, Line 29: src "${1}" dst "${3}" proto esp spi "${5}" reqid "${5}" mode transport \ : replay-window 32 \ : auth-trunc sha1 "${AUTH_KEY}" 96 \ : enc cipher_null "" \ : sel src "${1}/32" dst "${3}/32" sport "${2}" dport "${4}" > indentation: should have 1 more tab, same in ip_xfrm_policy Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic042422788ee406f5b71ca3878bc5617e5455579 Gerrit-Change-Number: 36856 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 12:44:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 days, 2 hours

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Implement support to handle 2nd REGISTER through ipsec

by pespin

Attention is currently required from: jolly, laforge, osmith, pespin. Hello Jenkins Builder, jolly, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: asterisk: Implement support to handle 2nd REGISTER through ipsec ...................................................................... asterisk: Implement support to handle 2nd REGISTER through ipsec This patch implements the necessary infra to set up ipsec tunnel towards the asterisk IMS client, and receive the 2nd REGISTER through the ipsec tun plus answer it acking the registration successfully. Change-Id: Ic042422788ee406f5b71ca3878bc5617e5455579 --- M asterisk/Asterisk_Tests.cfg M asterisk/IMS_ConnectionHandler.ttcn A asterisk/IMS_ipsec_setup.sh M asterisk/gen_links.sh M asterisk/regen_makefile.sh M library/PIPEasp_Templates.ttcn M library/SIP_Templates.ttcn M sip/SIP_Tests.ttcn 8 files changed, 285 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/36856/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic042422788ee406f5b71ca3878bc5617e5455579 Gerrit-Change-Number: 36856 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 days, 2 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Fix missing ':' between URI scheme and host

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36855?usp=email ) Change subject: SIP_Templates: Fix missing ':' between URI scheme and host ...................................................................... SIP_Templates: Fix missing ':' between URI scheme and host Change-Id: I5369db54901d50cf08d7ffc3e0d1cf3f5091e77b --- M library/SIP_Templates.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index ffd6f2b..37dee4b 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -1388,7 +1388,7 @@ } function f_sip_SipUrl_to_str(SipUrl uri) return charstring { - var charstring str := uri.scheme & f_sip_HostPort_to_str(uri.hostPort); + var charstring str := uri.scheme & ":" & f_sip_HostPort_to_str(uri.hostPort); return str; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36855?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5369db54901d50cf08d7ffc3e0d1cf3f5091e77b Gerrit-Change-Number: 36855 Gerrit-PatchSet: 2 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

2 days, 2 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk/expected-results.xml: Add missing TC_ims_registration

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36852?usp=email ) Change subject: asterisk/expected-results.xml: Add missing TC_ims_registration ...................................................................... asterisk/expected-results.xml: Add missing TC_ims_registration Change-Id: Ie4f589a398f93b429a8b4a93da1b80784b4013ea --- M asterisk/expected-results.xml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 745a4d7..49f92bf 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -5,4 +5,5 @@ <testcase classname='Asterisk_Tests' name='TC_internal_call_all_2registered' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_internal_call_all_3registered' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_internal_call_all_4registered' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_registration' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36852?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie4f589a398f93b429a8b4a93da1b80784b4013ea Gerrit-Change-Number: 36852 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 days, 2 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log issue with packet dumper not properly sta...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36853?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log issue with packet dumper not properly started ...................................................................... ttcn3-tcpdump-start.sh: Log issue with packet dumper not properly started Change-Id: I50af5eb16a000c4f3585a3458f9130a349eff097 --- M ttcn3-tcpdump-start.sh 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 36aa320..8564cd5 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -109,6 +109,7 @@ sleep 1 i=$((i+1)) if [ $i -eq 10 ]; then + echo "Packet dumper didn't start filling pcap file after $i seconds!!!" break fi done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36853?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I50af5eb16a000c4f3585a3458f9130a349eff097 Gerrit-Change-Number: 36853 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> Gerrit-MessageType: merged

2 days, 2 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk/AMI_Functions: Add workaround for empty 'Hint: ' field

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36854?usp=email ) Change subject: asterisk/AMI_Functions: Add workaround for empty 'Hint: ' field ...................................................................... asterisk/AMI_Functions: Add workaround for empty 'Hint: ' field It sometimes shows up empty, let's skip it to avoid breaking the decoder for now, similar to what we do with other fields. Change-Id: I50fb51fab3755e4d63f3a0bc06d90b42814231d2 --- M asterisk/AMI_Functions.ttcn 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index 1f3dc5e..c05403e 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -261,6 +261,7 @@ patched_txt := f_str_replace(patched_txt, "DestExten: \r\n", ""); patched_txt := f_str_replace(patched_txt, "Exten: \r\n", ""); patched_txt := f_str_replace(patched_txt, "Extension: \r\n", ""); + patched_txt := f_str_replace(patched_txt, "Hint: \r\n", ""); /* "AppData" field sometimes has a value containing separator ": ", which makes * TEXT dec not happy. Workaround it for now by removing the whole field line: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36854?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I50fb51fab3755e4d63f3a0bc06d90b42814231d2 Gerrit-Change-Number: 36854 Gerrit-PatchSet: 2 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

2 days, 2 hours

1
0
0 0

[S] Change in simtrace2[master]: RFC: card emu config: add feature sim polarity

by lynxis lazus

Attention is currently required from: laforge. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36859?usp=email ) Change subject: RFC: card emu config: add feature sim polarity ...................................................................... Patch Set 1: Verified-1 (1 comment) Patchset: PS1: Only to review the protocol approach. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36859?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I36a8acb74ad7616205af68b1626b45ab79d7cb02 Gerrit-Change-Number: 36859 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 17 May 2024 12:27:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 days, 2 hours

1
0
0 0

[S] Change in docker-playground[master]: debian-*: install pylint from debian repos

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36860?usp=email ) Change subject: debian-*: install pylint from debian repos ...................................................................... debian-*: install pylint from debian repos Get pylint from the debian repositories to be on the same version until we use the next debian version, instead of always installing the latest pylint version from pip. Change-Id: I721db1c18db43cc7a2d38177e9846c43dbdd0ae3 --- M debian-bookworm-build/Dockerfile M debian-bullseye-jenkins/Dockerfile M debian-buster-jenkins/Dockerfile 3 files changed, 16 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Verified Jenkins Builder: Verified lynxis lazus: Looks good to me, but someone else must approve diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index d847bf1..edca2d7 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -142,6 +142,7 @@ patchelf \ picolibc-arm-none-eabi \ pkg-config \ + pylint \ python3 \ python3-gi \ python3-mako \ @@ -179,7 +180,6 @@ 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \ 'git+https://github.com/podshumok/python-smpplib.git' \ 'pydbus' \ - 'pylint' \ 'pysispm' \ 'sphinx' \ 'sphinxcontrib-napoleon' \ diff --git a/debian-bullseye-jenkins/Dockerfile b/debian-bullseye-jenkins/Dockerfile index 3c186cc..5132c0a 100644 --- a/debian-bullseye-jenkins/Dockerfile +++ b/debian-bullseye-jenkins/Dockerfile @@ -107,6 +107,7 @@ patchelf \ picolibc-arm-none-eabi \ pkg-config \ + pylint \ python-setuptools \ python2.7 \ python3 \ @@ -148,7 +149,6 @@ 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \ 'git+https://github.com/podshumok/python-smpplib.git' \ 'pydbus' \ - 'pylint' \ 'pysispm' \ 'sphinx' \ 'sphinxcontrib-napoleon' \ diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index cf443f0..baa5931 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -104,6 +104,7 @@ osc \ patchelf \ pkg-config \ + pylint \ python-pip \ python-setuptools \ python-yaml \ @@ -147,7 +148,6 @@ 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \ 'git+https://github.com/podshumok/python-smpplib.git' \ 'pydbus' \ - 'pylint' \ 'pysispm' \ 'sphinx' \ 'sphinxcontrib-napoleon' \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36860?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I721db1c18db43cc7a2d38177e9846c43dbdd0ae3 Gerrit-Change-Number: 36860 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 days, 4 hours

1
0
0 0

[S] Change in docker-playground[master]: debian-*: install pylint from debian repos

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36860?usp=email ) Change subject: debian-*: install pylint from debian repos ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36860?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I721db1c18db43cc7a2d38177e9846c43dbdd0ae3 Gerrit-Change-Number: 36860 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 10:41:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 days, 4 hours

1
0
0 0

[S] Change in docker-playground[master]: debian-*: install pylint from debian repos

by lynxis lazus

Attention is currently required from: osmith. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36860?usp=email ) Change subject: debian-*: install pylint from debian repos ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36860?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I721db1c18db43cc7a2d38177e9846c43dbdd0ae3 Gerrit-Change-Number: 36860 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 10:02:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 days, 5 hours

1
0
0 0

[S] Change in docker-playground[master]: debian-*: install pylint from debian repos

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36860?usp=email ) Change subject: debian-*: install pylint from debian repos ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: tested that it works -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36860?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I721db1c18db43cc7a2d38177e9846c43dbdd0ae3 Gerrit-Change-Number: 36860 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 May 2024 09:56:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 days, 5 hours

1
0
0 0

[S] Change in docker-playground[master]: debian-*: install pylint from debian repos

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36860?usp=email ) Change subject: debian-*: install pylint from debian repos ...................................................................... debian-*: install pylint from debian repos Get pylint from the debian repositories to be on the same version until we use the next debian version, instead of always installing the latest pylint version from pip. Change-Id: I721db1c18db43cc7a2d38177e9846c43dbdd0ae3 --- M debian-bookworm-build/Dockerfile M debian-bullseye-jenkins/Dockerfile M debian-buster-jenkins/Dockerfile 3 files changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/60/36860/1 diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index d847bf1..edca2d7 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -142,6 +142,7 @@ patchelf \ picolibc-arm-none-eabi \ pkg-config \ + pylint \ python3 \ python3-gi \ python3-mako \ @@ -179,7 +180,6 @@ 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \ 'git+https://github.com/podshumok/python-smpplib.git' \ 'pydbus' \ - 'pylint' \ 'pysispm' \ 'sphinx' \ 'sphinxcontrib-napoleon' \ diff --git a/debian-bullseye-jenkins/Dockerfile b/debian-bullseye-jenkins/Dockerfile index 3c186cc..5132c0a 100644 --- a/debian-bullseye-jenkins/Dockerfile +++ b/debian-bullseye-jenkins/Dockerfile @@ -107,6 +107,7 @@ patchelf \ picolibc-arm-none-eabi \ pkg-config \ + pylint \ python-setuptools \ python2.7 \ python3 \ @@ -148,7 +149,6 @@ 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \ 'git+https://github.com/podshumok/python-smpplib.git' \ 'pydbus' \ - 'pylint' \ 'pysispm' \ 'sphinx' \ 'sphinxcontrib-napoleon' \ diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index cf443f0..baa5931 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -104,6 +104,7 @@ osc \ patchelf \ pkg-config \ + pylint \ python-pip \ python-setuptools \ python-yaml \ @@ -147,7 +148,6 @@ 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \ 'git+https://github.com/podshumok/python-smpplib.git' \ 'pydbus' \ - 'pylint' \ 'pysispm' \ 'sphinx' \ 'sphinxcontrib-napoleon' \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36860?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I721db1c18db43cc7a2d38177e9846c43dbdd0ae3 Gerrit-Change-Number: 36860 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 days, 5 hours

1
0
0 0

[S] Change in simtrace2[master]: RFC: card emu config: add feature sim polarity

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/36859?usp=email ) Change subject: RFC: card emu config: add feature sim polarity ...................................................................... RFC: card emu config: add feature sim polarity Change-Id: I36a8acb74ad7616205af68b1626b45ab79d7cb02 --- M firmware/libcommon/include/simtrace_prot.h 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/59/36859/1 diff --git a/firmware/libcommon/include/simtrace_prot.h b/firmware/libcommon/include/simtrace_prot.h index d1eb89b..209a5d1 100644 --- a/firmware/libcommon/include/simtrace_prot.h +++ b/firmware/libcommon/include/simtrace_prot.h @@ -260,6 +260,7 @@ /* enable/disable the generation of DO_STATUS on IRQ endpoint */ #define CEMU_FEAT_F_STATUS_IRQ 0x00000001 +#define CEMU_FEAT_F_POLARITY 0x00000002 /* SIMTRACE_MSGT_BD_CEMU_CONFIG */ struct cardemu_usb_msg_config { @@ -267,6 +268,11 @@ uint32_t features; /* the selected slot number (if an external mux is present) */ uint8_t slot_mux_nr; + /* sim present. Bit 1 is valid bit. Bit 0 gpio value when sim present + * When sim is present, set sim_present gpio to high -> 0x03 + * When sim is present, set sim_present gpio to low -> 0x02 + */ + uint8_t sim_polarity; } __attribute__ ((packed)); /*********************************************************************** -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36859?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I36a8acb74ad7616205af68b1626b45ab79d7cb02 Gerrit-Change-Number: 36859 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

2 days, 5 hours

1
0
0 0

[S] Change in docker-playground[master]: Revert "ttcn3-docker-run.sh: Fix dumpcap failing to access /data insi...

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36858?usp=email ) Change subject: Revert "ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker" ...................................................................... Revert "ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker" This reverts commit 2b9c8e3db8cf77c5ce5c3f888365f983f3ee8d76, as it causes a lot of testsuites to fail with e.g. + network_replace_subnet_in_configs + set +x Applying SUBNET=161 to: /home/osmocom-build/jenkins/workspace/ttcn3-ggsn-test/logs/ggsn-all/osmo-ggsn.cfg Applying SUBNET=161 to: /home/osmocom-build/jenkins/workspace/ttcn3-ggsn-test/logs/ggsn-tester-all/GGSN_Tests.cfg sed: couldn't open temporary file /home/osmocom-build/jenkins/workspace/ttcn3-ggsn-test/logs/ggsn-tester-all/sedsByWIc: Permission denied Let's discuss how to fix the dumpcap problem instead in OS#6455. Change-Id: Ic98e8206d8251060b777fc7d0b4497ba3e1caf7f --- M common/ttcn3-docker-run.sh 1 file changed, 20 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/common/ttcn3-docker-run.sh b/common/ttcn3-docker-run.sh index 60339c4..c8c871e 100755 --- a/common/ttcn3-docker-run.sh +++ b/common/ttcn3-docker-run.sh @@ -31,9 +31,6 @@ done fi -# Make sure /data is owned to the user running inside docker. -# jenkins-commons.sh fix_perms() will fix back the permissions once done. -chown -R "$(id -u):$(id -g)" /data cd /data # Use TEST_NAME to only run one test instead of all. Set it like this: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36858?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic98e8206d8251060b777fc7d0b4497ba3e1caf7f Gerrit-Change-Number: 36858 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 days, 5 hours

1
0
0 0

[S] Change in docker-playground[master]: Revert "ttcn3-docker-run.sh: Fix dumpcap failing to access /data insi...

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36858?usp=email ) Change subject: Revert "ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker" ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: merging now, so the ttcn3 jobs stop failing -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36858?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic98e8206d8251060b777fc7d0b4497ba3e1caf7f Gerrit-Change-Number: 36858 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 May 2024 09:40:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 days, 5 hours

1
0
0 0

[S] Change in docker-playground[master]: Revert "ttcn3-docker-run.sh: Fix dumpcap failing to access /data insi...

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36858?usp=email ) Change subject: Revert "ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker" ...................................................................... Revert "ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker" This reverts commit 2b9c8e3db8cf77c5ce5c3f888365f983f3ee8d76, as it causes a lot of testsuites to fail with e.g. + network_replace_subnet_in_configs + set +x Applying SUBNET=161 to: /home/osmocom-build/jenkins/workspace/ttcn3-ggsn-test/logs/ggsn-all/osmo-ggsn.cfg Applying SUBNET=161 to: /home/osmocom-build/jenkins/workspace/ttcn3-ggsn-test/logs/ggsn-tester-all/GGSN_Tests.cfg sed: couldn't open temporary file /home/osmocom-build/jenkins/workspace/ttcn3-ggsn-test/logs/ggsn-tester-all/sedsByWIc: Permission denied Let's discuss how to fix the dumpcap problem instead in OS#6455. Change-Id: Ic98e8206d8251060b777fc7d0b4497ba3e1caf7f --- M common/ttcn3-docker-run.sh 1 file changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/58/36858/1 diff --git a/common/ttcn3-docker-run.sh b/common/ttcn3-docker-run.sh index 60339c4..c8c871e 100755 --- a/common/ttcn3-docker-run.sh +++ b/common/ttcn3-docker-run.sh @@ -31,9 +31,6 @@ done fi -# Make sure /data is owned to the user running inside docker. -# jenkins-commons.sh fix_perms() will fix back the permissions once done. -chown -R "$(id -u):$(id -g)" /data cd /data # Use TEST_NAME to only run one test instead of all. Set it like this: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36858?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic98e8206d8251060b777fc7d0b4497ba3e1caf7f Gerrit-Change-Number: 36858 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 days, 5 hours

1
0
0 0

2024

2023

2022

gerrit-log